diff --git a/src/java/davmail/DavGateway.java b/src/java/davmail/DavGateway.java
index 22789645..2bc02302 100644
--- a/src/java/davmail/DavGateway.java
+++ b/src/java/davmail/DavGateway.java
@@ -137,7 +137,6 @@ public class DavGateway {
         HttpClient httpClient = DavGatewayHttpClientFacade.getInstance();
         GetMethod getMethod = new GetMethod("http://davmail.sourceforge.net/version.txt");
         try {
-            httpClient.setConnectionTimeout(1000);
             int status = httpClient.executeMethod(getMethod);
             if (status == HttpStatus.SC_OK) {
                 versionReader = new BufferedReader(new InputStreamReader(getMethod.getResponseBodyAsStream()));
diff --git a/src/java/davmail/caldav/CaldavConnection.java b/src/java/davmail/caldav/CaldavConnection.java
index 0f6caea6..a9546801 100644
--- a/src/java/davmail/caldav/CaldavConnection.java
+++ b/src/java/davmail/caldav/CaldavConnection.java
@@ -148,8 +148,8 @@ public class CaldavConnection extends AbstractConnection {
         } catch (SocketException e) {
             DavGatewayTray.debug("Connection closed");
         } catch (IOException e) {
-            if (e instanceof HttpException) {
-                DavGatewayTray.error(((HttpException) e).getReasonCode() + " " + ((HttpException) e).getReason(), e);
+            if (e.getMessage() != null) {
+                DavGatewayTray.error(e.getMessage(), e);
             } else {
                 DavGatewayTray.error(e);
             }
diff --git a/src/java/davmail/exchange/ExchangeSession.java b/src/java/davmail/exchange/ExchangeSession.java
index a63c3abb..da245aab 100644
--- a/src/java/davmail/exchange/ExchangeSession.java
+++ b/src/java/davmail/exchange/ExchangeSession.java
@@ -181,13 +181,6 @@ public class ExchangeSession {
             message.append("DavMail login exception: ");
             if (exc.getMessage() != null) {
                 message.append(exc.getMessage());
-            } else if (exc instanceof HttpException) {
-                message.append(((HttpException) exc).getReasonCode());
-                String httpReason = ((HttpException) exc).getReason();
-                if (httpReason != null) {
-                    message.append(" ");
-                    message.append(httpReason);
-                }
             } else {
                 message.append(exc);
             }
diff --git a/src/java/davmail/imap/ImapConnection.java b/src/java/davmail/imap/ImapConnection.java
index f676f370..5ef4f32b 100644
--- a/src/java/davmail/imap/ImapConnection.java
+++ b/src/java/davmail/imap/ImapConnection.java
@@ -172,7 +172,7 @@ public class ImapConnection extends AbstractConnection {
                                         session.moveFolder(folderName, targetName);
                                         sendClient(commandId + " OK rename completed");
                                     } catch (HttpException e) {
-                                        sendClient(commandId + " NO " + e.getReason());
+                                        sendClient(commandId + " NO " + e.getMessage());
                                     }
                                 } else if ("delete".equalsIgnoreCase(command)) {
                                     String folderName = BASE64MailboxDecoder.decode(tokens.nextToken());
@@ -180,7 +180,7 @@ public class ImapConnection extends AbstractConnection {
                                         session.deleteFolder(folderName);
                                         sendClient(commandId + " OK delete completed");
                                     } catch (HttpException e) {
-                                        sendClient(commandId + " NO " + e.getReason());
+                                        sendClient(commandId + " NO " + e.getMessage());
                                     }
                                 } else if ("uid".equalsIgnoreCase(command)) {
                                     if (tokens.hasMoreTokens()) {
@@ -269,7 +269,7 @@ public class ImapConnection extends AbstractConnection {
                                                 }
                                                 sendClient(commandId + " OK copy completed");
                                             } catch (HttpException e) {
-                                                sendClient(commandId + " NO " + e.getReason());
+                                                sendClient(commandId + " NO " + e.getMessage());
                                             }
                                         }
                                     } else {
@@ -439,8 +439,8 @@ public class ImapConnection extends AbstractConnection {
             DavGatewayTray.debug("Connection closed");
         } catch (Exception e) {
             StringBuilder buffer = new StringBuilder();
-            if (e instanceof HttpException) {
-                buffer.append(((HttpException) e).getReasonCode()).append(" ").append(((HttpException) e).getReason());
+            if (e.getMessage() != null) {
+                buffer.append(e.getMessage());
             } else {
                 buffer.append(e);
             }