diff --git a/src/java/davmail/DavGateway.java b/src/java/davmail/DavGateway.java
index cfd1d95e..2e5248e8 100644
--- a/src/java/davmail/DavGateway.java
+++ b/src/java/davmail/DavGateway.java
@@ -55,7 +55,7 @@ public class DavGateway {
         DavGatewayHttpClientFacade.start();
 
         serverList.clear();
-        
+
         int smtpPort = Settings.getIntProperty("davmail.smtpPort");
         if (smtpPort != 0) {
             serverList.add(new SmtpServer(smtpPort));
@@ -85,15 +85,15 @@ public class DavGateway {
                 server.start();
                 messages.add(new BundleMessage("LOG_PROTOCOL_PORT", server.getProtocolName(), server.getPort()));
             } catch (BindException e) {
-                errorMessages.add(new BundleMessage("LOG_PROTOCOL_PORT", server.getProtocolName(), server.getPort()));
+                errorMessages.add(new BundleMessage("LOG_SOCKET_BIND_FAILED", server.getProtocolName(), server.getPort()));
             } catch (IOException e) {
-                errorMessages.add(new BundleMessage("LOG_PROTOCOL_PORT", server.getProtocolName(), server.getPort()));
+                errorMessages.add(new BundleMessage("LOG_SOCKET_BIND_FAILED", server.getProtocolName(), server.getPort()));
             }
         }
 
         DavGatewayTray.info(new BundleMessage("LOG_DAVMAIL_GATEWAY_LISTENING", messages));
         if (!errorMessages.isEmpty()) {
-            DavGatewayTray.error(new BundleMessage("LOG_SOCKET_BIND_FAILED", errorMessages));
+            DavGatewayTray.error(new BundleMessage("LOG_MESSAGE", errorMessages));
         }
 
         // check for new version
@@ -106,7 +106,7 @@ public class DavGateway {
     }
 
     public static void stop() {
-        for (AbstractServer server:serverList) {
+        for (AbstractServer server : serverList) {
             server.close();
             try {
                 server.join();
diff --git a/src/java/davmailmessages.properties b/src/java/davmailmessages.properties
index c6fa9252..f10b2696 100644
--- a/src/java/davmailmessages.properties
+++ b/src/java/davmailmessages.properties
@@ -69,7 +69,7 @@ LOG_SEARCH_QUERY=Search: {0}
 LOG_SEND_CLIENT_MESSAGE=> {0}
 LOG_SEND_CLIENT_PREFIX_MESSAGE=> {0}{1}
 LOG_SET_SOCKET_TIMEOUT=Set socket timeout to {0} seconds
-LOG_SOCKET_BIND_FAILED=Unable to bind server socket to {0}: port not allowed or in use by another process
+LOG_SOCKET_BIND_FAILED=Unable to bind server socket for {0} on port {1}: port not allowed or in use by another process\n
 LOG_STOPPING_DAVMAIL=Stopping DavMail Gateway...
 LOG_SWT_NOT_AVAILABLE=SWT not available, fallback to JDK 1.6 system tray support
 LOG_SYSTEM_TRAY_NOT_AVAILABLE=JDK 1.6 needed for system tray support
diff --git a/src/java/davmailmessages_fr.properties b/src/java/davmailmessages_fr.properties
index 4e262079..50b41a81 100644
--- a/src/java/davmailmessages_fr.properties
+++ b/src/java/davmailmessages_fr.properties
@@ -69,7 +69,7 @@ LOG_SEARCH_QUERY=Recherche : {0}
 LOG_SEND_CLIENT_MESSAGE=> {0}
 LOG_SEND_CLIENT_PREFIX_MESSAGE=> {0}{1}
 LOG_SET_SOCKET_TIMEOUT=Expiration de lecture de la connection positionnée à {0} secondes
-LOG_SOCKET_BIND_FAILED=Impossible d''ouvrir le port d''écoute {0} : port non autorisé ou utilisé par un autre processus
+LOG_SOCKET_BIND_FAILED=Impossible d''ouvrir le port d''écoute {1} pour {0} : port non autorisé ou utilisé par un autre processus\n
 LOG_STOPPING_DAVMAIL=Arrêt de la passerelle DavMail...
 LOG_SWT_NOT_AVAILABLE=SWT non disponible, bascule vers le support icône de notification de Java 1.6
 LOG_SYSTEM_TRAY_NOT_AVAILABLE=JDK 1.6 nécessaire pour le support de l''icône de notification