Postfix + Intermediate Dovecot changes