diff --git a/src/java/davmail/ui/SettingsFrame.java b/src/java/davmail/ui/SettingsFrame.java
index 7cb9e20e..44e13312 100644
--- a/src/java/davmail/ui/SettingsFrame.java
+++ b/src/java/davmail/ui/SettingsFrame.java
@@ -89,6 +89,7 @@ public class SettingsFrame extends JFrame {
     JComboBox httpclientLoggingLevelField;
     JComboBox wireLoggingLevelField;
     JTextField logFilePathField;
+    JTextField logFileSizeField;
 
     JCheckBox caldavEditNotificationsField;
     JTextField caldavAlarmSoundField;
@@ -444,6 +445,7 @@ public class SettingsFrame extends JFrame {
         httpclientLoggingLevelField = new JComboBox(LOG_LEVELS);
         wireLoggingLevelField = new JComboBox(LOG_LEVELS);
         logFilePathField = new JTextField(Settings.getProperty("davmail.logFilePath"), 15);
+        logFileSizeField = new JTextField(Settings.getProperty("davmail.logFileSize"), 15);
 
         rootLoggingLevelField.setSelectedItem(Settings.getLoggingLevel("rootLogger"));
         davmailLoggingLevelField.setSelectedItem(Settings.getLoggingLevel("davmail"));
@@ -455,8 +457,9 @@ public class SettingsFrame extends JFrame {
         addSettingComponent(rightLoggingPanel, BundleMessage.format("UI_LOG_HTTPCLIENT"), httpclientLoggingLevelField);
         addSettingComponent(rightLoggingPanel, BundleMessage.format("UI_LOG_WIRE"), wireLoggingLevelField);
 
-        JPanel logFilePathPanel = new JPanel();
+        JPanel logFilePathPanel = new JPanel(new GridLayout(2, 2));
         addSettingComponent(logFilePathPanel, BundleMessage.format("UI_LOG_FILE_PATH"), logFilePathField);
+        addSettingComponent(logFilePathPanel, BundleMessage.format("UI_LOG_FILE_SIZE"), logFileSizeField);
 
         JPanel loggingPanel = new JPanel();
         loggingPanel.setLayout(new BoxLayout(loggingPanel, BoxLayout.Y_AXIS));
@@ -540,6 +543,7 @@ public class SettingsFrame extends JFrame {
         httpclientLoggingLevelField.setSelectedItem(Settings.getLoggingLevel("org.apache.commons.httpclient"));
         wireLoggingLevelField.setSelectedItem(Settings.getLoggingLevel("httpclient.wire"));
         logFilePathField.setText(Settings.getProperty("davmail.logFilePath"));
+        logFileSizeField.setText(Settings.getProperty("davmail.logFileSize"));
     }
 
     protected boolean isSslEnabled() {
@@ -680,6 +684,7 @@ public class SettingsFrame extends JFrame {
                 Settings.setLoggingLevel("org.apache.commons.httpclient", (Level) httpclientLoggingLevelField.getSelectedItem());
                 Settings.setLoggingLevel("httpclient.wire", (Level) wireLoggingLevelField.getSelectedItem());
                 Settings.setProperty("davmail.logFilePath", logFilePathField.getText());
+                Settings.setProperty("davmail.logFileSize", logFileSizeField.getText());
 
                 setVisible(false);
                 Settings.save();
diff --git a/src/java/davmailmessages.properties b/src/java/davmailmessages.properties
index 04b59285..7dba6920 100644
--- a/src/java/davmailmessages.properties
+++ b/src/java/davmailmessages.properties
@@ -1,6 +1,6 @@
 EXCEPTION_AUTHENTICATION_FAILED=Authentication failed: invalid user or password
 EXCEPTION_AUTHENTICATION_FAILED_PASSWORD_EXPIRED=Authentication failed: password expired ?
-EXCEPTION_AUTHENTICATION_FAILED_RETRY=Authentication failed: invalid user or password, retry with domain\\user
+EXCEPTION_AUTHENTICATION_FAILED_RETRY=Authentication failed: invalid user or password, retry with domain\\user or use default domain setting
 EXCEPTION_CONNECTION_FAILED=Unable to connect to OWA at {0}, status code {1}, check configuration
 EXCEPTION_DAVMAIL_CONFIGURATION=DavMail configuration exception:\n{0}
 EXCEPTION_END_OF_STREAM=End of stream reached reading content
@@ -273,4 +273,5 @@ UI_SUBJECT_HELP=Caldav notification subject
 UI_NOTIFICATION_BODY=Caldav notification comment
 UI_CALDAV_EDIT_NOTIFICATIONS=Edit Caldav notifications:
 UI_CALDAV_EDIT_NOTIFICATIONS_HELP=Enable interactive Caldav edit notification window
-LOG_SEARCH_RESULT=Found {0} item(s)
\ No newline at end of file
+LOG_SEARCH_RESULT=Found {0} item(s)
+UI_LOG_FILE_SIZE=Log file size:
\ No newline at end of file
diff --git a/src/java/davmailmessages_fr.properties b/src/java/davmailmessages_fr.properties
index 0c60034e..38fc385c 100644
--- a/src/java/davmailmessages_fr.properties
+++ b/src/java/davmailmessages_fr.properties
@@ -1,6 +1,6 @@
 EXCEPTION_AUTHENTICATION_FAILED=Echec d''authentification : identifiant ou mot de passe invalide
 EXCEPTION_AUTHENTICATION_FAILED_PASSWORD_EXPIRED=Echec d''authentification : mot de passe expiré ?
-EXCEPTION_AUTHENTICATION_FAILED_RETRY=Echec d''authentification : identifiant ou mot de passe invalide, réessayer avec domaine\\utilisateur
+EXCEPTION_AUTHENTICATION_FAILED_RETRY=Echec d''authentification : identifiant ou mot de passe invalide, réessayer avec domaine\\utilisateur ou utiliser le paramètre domaine par défaut
 EXCEPTION_CONNECTION_FAILED=Connection OWA à {0} impossible, code retour {1}, vérifier la configuration
 EXCEPTION_DAVMAIL_CONFIGURATION=Erreur de configuration DavMail :\n{0}
 EXCEPTION_END_OF_STREAM=Fin de flux âtteint pendant la lecture du contenu
@@ -215,6 +215,7 @@ UI_PKCS11_CONFIG_HELP=Configuration PKCS11 compl
 UI_PKCS11_CONFIG=Configuration PKCS11 :
 UI_CLIENT_CERTIFICATE=Certificat client (DavMail vers Exchange)
 UI_LOG_FILE_PATH=Chemin du fichier de traces :
+UI_LOG_FILE_SIZE=Taille du fichier de traces :
 LOG_GATEWAY_INTERRUPTED=Arrêt de la passerelle DavMail en cours
 LOG_GATEWAY_STOP=Passerelle DavMail arrêtée
 LOG_INVALID_TIMEZONE=Fuseau horaire invalide : {0}
@@ -259,7 +260,7 @@ UNKNOWN_ATTRIBUTE=Attribut inconnu: {0}
 ACCEPTED=Accepté : 
 TENTATIVE=Provisoire : 
 DECLINED=Refusé : 
-UI_ENABLE_EWS=Activer EWS
+UI_ENABLE_EWS=Activer EWS :
 UI_ENABLE_EWS_HELP=Activer le mode EWS sur Exchange 2010 ou Exchange 2007 sans support Webdav
 UI_CALDAV_NOTIFICATION=DavMail : Notification Caldav
 UI_BUTTON_SEND=Envoyer