Export: dovecot compatibility fixes