diff --git a/src/java/davmail/ldap/LdapConnection.java b/src/java/davmail/ldap/LdapConnection.java
index e1150c8f..eb829124 100644
--- a/src/java/davmail/ldap/LdapConnection.java
+++ b/src/java/davmail/ldap/LdapConnection.java
@@ -14,6 +14,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.net.Socket;
 import java.net.SocketTimeoutException;
+import java.net.SocketException;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.List;
@@ -228,6 +229,9 @@ public class LdapConnection extends AbstractConnection {
 
                 handleRequest(new BerDecoder(inbuf, 0, offset));
             }
+
+        } catch (SocketException e) {
+            DavGatewayTray.debug("Connection closed");
         } catch (SocketTimeoutException e) {
             DavGatewayTray.debug("Closing connection on timeout");
         } catch (IOException e) {
diff --git a/src/java/davmail/pop/PopConnection.java b/src/java/davmail/pop/PopConnection.java
index 3fb30609..80729894 100644
--- a/src/java/davmail/pop/PopConnection.java
+++ b/src/java/davmail/pop/PopConnection.java
@@ -134,12 +134,12 @@ public class PopConnection extends AbstractConnection {
                                 String token = tokens.nextToken();
                                 try {
                                     int messageNumber = Integer.valueOf(token);
-                                    ExchangeSession.Message message = messages.get(messageNumber-1);
-                                    sendOK(""+messageNumber+" "+message.size);
+                                    ExchangeSession.Message message = messages.get(messageNumber - 1);
+                                    sendOK("" + messageNumber + " " + message.size);
                                 } catch (NumberFormatException e) {
-                                    sendERR("Invalid message index: "+token);
+                                    sendERR("Invalid message index: " + token);
                                 } catch (IndexOutOfBoundsException e) {
-                                    sendERR("Invalid message index: "+token);
+                                    sendERR("Invalid message index: " + token);
                                 }
                             } else {
                                 sendOK(messages.size() +
@@ -193,7 +193,7 @@ public class PopConnection extends AbstractConnection {
                             try {
                                 message = Integer.valueOf(tokens.nextToken());
                                 int lines = Integer.valueOf(tokens.nextToken());
-                                ExchangeSession.Message m = messages.get(message-1);
+                                ExchangeSession.Message m = messages.get(message - 1);
                                 sendOK("");
                                 m.write(new TopOutputStream(os, lines));
                                 sendClient("");
@@ -202,7 +202,7 @@ public class PopConnection extends AbstractConnection {
                                 // can not send error to client after a socket exception
                                 DavGatewayTray.warn("Client closed connection ", e);
                             } catch (IndexOutOfBoundsException e) {
-                                sendERR("Invalid message index: "+message);
+                                sendERR("Invalid message index: " + message);
                             } catch (Exception e) {
                                 sendERR("error retreiving top of messages");
                                 DavGatewayTray.error(e.getMessage(), e);
@@ -287,13 +287,13 @@ public class PopConnection extends AbstractConnection {
                     STATE = START;
                 }
             } else if (STATE == CRLF) {
-                 if (b == '\r') {
+                if (b == '\r') {
                     STATE = CRLFCR;
                 } else {
                     STATE = START;
                 }
             } else if (STATE == CRLFCR) {
-                 if (b == '\n') {
+                if (b == '\n') {
                     STATE = BODY;
                 } else {
                     STATE = START;
diff --git a/src/java/davmail/smtp/SmtpConnection.java b/src/java/davmail/smtp/SmtpConnection.java
index b675d291..3d745a94 100644
--- a/src/java/davmail/smtp/SmtpConnection.java
+++ b/src/java/davmail/smtp/SmtpConnection.java
@@ -6,6 +6,7 @@ import davmail.tray.DavGatewayTray;
 
 import java.io.IOException;
 import java.net.Socket;
+import java.net.SocketException;
 import java.util.Date;
 import java.util.StringTokenizer;
 
@@ -122,6 +123,9 @@ public class SmtpConnection extends AbstractConnection {
 
                 os.flush();
             }
+
+        } catch (SocketException e) {
+            DavGatewayTray.debug("Connection closed");
         } catch (IOException e) {
             DavGatewayTray.error(e.getMessage());
             try {
@@ -137,6 +141,7 @@ public class SmtpConnection extends AbstractConnection {
 
     /**
      * Create authenticated session with Exchange server
+     *
      * @throws IOException on error
      */
     protected void authenticate() throws IOException {