-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/pop3_client_workarounds/g' \
+ /etc/dovecot/dovecot.conf || true
+
+cp_check_and_sed 'imap_client_workarounds' \
+ 's/imap_client_workarounds.*$/imap_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.*$/pop3_client_workarounds = outlook-no-nuls oe-ns-eoh/g' \
+ /etc/dovecot/dovecot.conf || true
+
+cp_check_and_sed 'pop3_uidl_format' \
+ 's/pop3_uidl_format.*$/pop3_uidl_format = %v.%u/g' \
+ /etc/dovecot/dovecot.conf || true
+
+cp_check_and_sed '#quota = maildir' \
+ 's/#quota = maildir/quota = fs/g' \
+ /etc/dovecot/dovecot.conf || true
+
+# dodano zbog backward compatibility (etch->lenny)
+cp_check_and_sed 'mail_extra_groups' \
+ 's/mail_extra_groups/mail_privileged_group/g' \