@delta I understand there is a sunken cost situation now: You invested a lot of time and resources to build on top of a sub-optimal protocol. So it would be a wasted effort to migrate everything to XMPP and thus I'm not expecting you to admit XMPP would've been the wiser choice over IMAP+Submission (for C2S) and SMTP (for S2S).