diff --git a/davmail/.config/davmail/davmail.properties b/davmail/.config/davmail/davmail.properties
index abbd1552..a0c48a9a 100644
--- a/davmail/.config/davmail/davmail.properties
+++ b/davmail/.config/davmail/davmail.properties
@@ -1,21 +1,38 @@
-davmail.enableKerberos=false
-davmail.smtpPort=1025
-davmail.imapAutoExpunge=true
-davmail.useSystemProxies=false
-davmail.server=true
-davmail.mode=Auto
-davmail.smtpSaveInSent=false
-davmail.imapPort=1143
-davmail.url=*****
-davmail.ldapPort=1389
+######################
+#  Davmail Settings  #
+######################
+
+# Don't alow remote connections
 davmail.allowRemote=false
-davmail.caldavPort=1080
-davmail.enableKeepAlive=false
-davmail.carddavReadPhoto=true
-davmail.keepDelay=30
-davmail.caldavAlarmSound=
-davmail.defaultDomain=*****
+# Don't require SSL when connecting
+# since we are connecting on localhost
 davmail.ssl.nosecuresmtp=false
 davmail.ssl.nosecureimap=false
 davmail.ssl.nosecureldap=false
 davmail.ssl.nosecurecaldav=false
+# Ports to list on
+# > 1000 don't require sudo to run
+davmail.smtpPort=1025
+davmail.imapPort=1143
+davmail.ldapPort=1389
+davmail.caldavPort=1080
+# Don't start GUI
+davmail.server=true
+# Delete messages immediately on IMAP STORE \Deleted flag
+davmail.imapAutoExpunge=true
+# When a message is sent, put it in the sent folder
+davmail.smtpSaveInSent=false
+# Send keepalive character during large folder and messages download
+davmail.enableKeepAlive=true
+
+#######################
+#  Exchange Settings  #
+#######################
+
+# Can be auto, EWS or WebDav
+davmail.mode=Auto
+# Can be an OWA or EWS url
+davmail.url=*****
+davmail.defaultDomain=*****
+
+
diff --git a/davmail/.config/davmail/davmail.properties.secret b/davmail/.config/davmail/davmail.properties.secret
index 527342af..6e1a546c 100644
Binary files a/davmail/.config/davmail/davmail.properties.secret and b/davmail/.config/davmail/davmail.properties.secret differ