Tweaks to the dovecot policy