r6:

diff --git a/debian/postinst b/debian/postinst
index b974be9..bf3300e 100755 (executable)
--- a/debian/postinst
+++ b/debian/postinst
@@ -19,12 +19,20 @@ cp_check_and_sed 'disable_plaintext_auth.*yes' \
                  's/disable_plaintext_auth.*$/disable_plaintext_auth = no/g' \
                 /etc/dovecot/dovecot.conf || true
 
-cp_check_and_sed '#client_workarounds' \
-                 's/#client_workarounds/client_workarounds/g' \
+cp_check_and_sed '#imap_client_workarounds' \
+                 's/#imap_client_workarounds/client_workarounds/g' \
                 /etc/dovecot/dovecot.conf || true
 
-cp_check_and_sed 'client_workarounds' \
-                 's/client_workarounds.*$/client_workarounds = outlook-idle/g' \
+cp_check_and_sed '#pop3_client_workarounds' \
+                 's/#pop3_client_workarounds/client_workarounds/g' \
+                /etc/dovecot/dovecot.conf || true
+
+cp_check_and_sed 'imap_client_workarounds' \
+                 's/imap_client_workarounds.*$/client_workarounds = outlook-idle tb-extra-mailbox-sep netscape-eoh delay -newmail/g' \
+                /etc/dovecot/dovecot.conf || true
+
+cp_check_and_sed 'pop3_client_workarounds' \
+                 's/pop3_client_workarounds.*$/client_workarounds = outlook-no-nuls oe-ns-eoh/g' \
                 /etc/dovecot/dovecot.conf || true