[Bug 225708] Merge Review: dovecot