More mailbox client manager preliminaries

akwizgranrequested to merge
2228-more-mailbox-client-manager-preliminaries into master

Various bugs and missing pieces for #2228 (closed).

Merge request reports