Fixes: #2496 merging the dovecot plugin
Fixes: #2497 merging the sogo plugin