diff --git a/src/etc/davmail.properties b/src/etc/davmail.properties
index 14c38008..fb1a61cc 100644
--- a/src/etc/davmail.properties
+++ b/src/etc/davmail.properties
@@ -4,120 +4,122 @@
 # Basic settings
 
 # Server or workstation mode
-davmail.server=true
-# connection mode auto, EWS or WebDav
+davmail.server=true
+# connection mode auto, EWS or WebDav
 davmail.enableEws=auto
 # base Exchange OWA or EWS url
 davmail.url=https://owa.example.com/owa/
 
 # Listener ports
-davmail.caldavPort=1080
-davmail.imapPort=1143
-davmail.ldapPort=1389
-davmail.popPort=1110
-davmail.smtpPort=1025
+davmail.caldavPort=1080
+davmail.imapPort=1143
+davmail.ldapPort=1389
+davmail.popPort=1110
+davmail.smtpPort=1025
 
 #############################################################
 # Network settings
 
 # Network proxy settings
-davmail.enableProxy=false
+davmail.enableProxy=false
 davmail.useSystemProxies=false
-davmail.proxyHost=
-davmail.proxyPort=
-davmail.proxyUser=
-davmail.proxyPassword=
+davmail.proxyHost=
+davmail.proxyPort=
+davmail.proxyUser=
+davmail.proxyPassword=
 
 # proxy exclude list
-davmail.noProxyFor=
+davmail.noProxyFor=
 
-# allow remote connection to DavMail
+# allow remote connection to DavMail
 davmail.allowRemote=false
-# bind server sockets to a specific address
+# bind server sockets to a specific address
 davmail.bindAddress=
 # client connections SO timeout in seconds
-davmail.clientSoTimeout=
+davmail.clientSoTimeout=
 
 # DavMail listeners SSL configuration
-davmail.ssl.keystoreType=
-davmail.ssl.keystoreFile=
-davmail.ssl.keystorePass=
-davmail.ssl.keyPass=
+davmail.ssl.keystoreType=
+davmail.ssl.keystoreFile=
+davmail.ssl.keystorePass=
+davmail.ssl.keyPass=
 
 # Accept specified certificate even if invalid according to trust store
-davmail.server.certificate.hash=
+davmail.server.certificate.hash=
 
 # disable SSL for specified listeners
-davmail.ssl.nosecurecaldav=false
-davmail.ssl.nosecureimap=false
-davmail.ssl.nosecureldap=false
-davmail.ssl.nosecurepop=false
+davmail.ssl.nosecurecaldav=false
+davmail.ssl.nosecureimap=false
+davmail.ssl.nosecureldap=false
+davmail.ssl.nosecurepop=false
 davmail.ssl.nosecuresmtp=false
 
 # disable update check
-davmail.disableUpdateCheck=true
+davmail.disableUpdateCheck=true
 
 #############################################################
 # Caldav settings
 
 # override default alarm sound
 davmail.caldavAlarmSound=
-# retrieve calendar events not older than 90 days
-davmail.caldavPastDelay=90
+# retrieve calendar events not older than 90 days
+davmail.caldavPastDelay=90
 # WebDav only: force event update to trigger ActiveSync clients update
-davmail.forceActiveSyncUpdate=false
+davmail.forceActiveSyncUpdate=false
 
 #############################################################
 # IMAP settings
 
 # Delete messages immediately on IMAP STORE \Deleted flag
 davmail.imapAutoExpunge=true
-# Enable IDLE support, set polling delay in minutes
+# Enable IDLE support, set polling delay in minutes
 davmail.imapIdleDelay=
-
+
 #############################################################
 # POP settings
 
 # Delete messages on server after 30 days
 davmail.keepDelay=30
 # Delete messages in server sent folder after 90 days
-davmail.sentKeepDelay=90
-# Mark retrieved messages read on server
-davmail.popMarkReadOnRetr=false
+davmail.sentKeepDelay=90
+# Mark retrieved messages read on server
+davmail.popMarkReadOnRetr=false
 
 #############################################################
 # SMTP settings
 
 # let Exchange save a copy of sent messages in Sent folder
-davmail.smtpSaveInSent=true
+davmail.smtpSaveInSent=true
 
 #############################################################
 # Loggings settings
 
-# log file path, leave empty for default path
-davmail.logFilePath=
-# log levels
-log4j.logger.davmail=WARN
-log4j.logger.httpclient.wire=WARN
-log4j.logger.org.apache.commons.httpclient=WARN
-log4j.rootLogger=WARN
+# log file path, leave empty for default path
+davmail.logFilePath=
+# maximum log file size, use Log4J syntax, set to 0 to use an external rotation mechanism, e.g. logrotate
+davmail.logFileSize=1MB
+# log levels
+log4j.logger.davmail=WARN
+log4j.logger.httpclient.wire=WARN
+log4j.logger.org.apache.commons.httpclient=WARN
+log4j.rootLogger=WARN
 
 #############################################################
 # Workstation only settings
 
 # smartcard access settings
-davmail.ssl.pkcs11Config=
-davmail.ssl.pkcs11Library=
+davmail.ssl.pkcs11Config=
+davmail.ssl.pkcs11Library=
 
 # SSL settings for mutual authentication
-davmail.ssl.clientKeystoreType=
-davmail.ssl.clientKeystoreFile=
-davmail.ssl.clientKeystorePass=
+davmail.ssl.clientKeystoreType=
+davmail.ssl.clientKeystoreFile=
+davmail.ssl.clientKeystorePass=
 
 # disable all balloon notifications
-davmail.disableGuiNotifications=false
+davmail.disableGuiNotifications=false
 # disable startup balloon notifications
-davmail.showStartupBanner=true
+davmail.showStartupBanner=true
 
 # enable transparent client Kerberos authentication
-davmail.enableKerberos=false
+davmail.enableKerberos=false