Note that Stalwart-mail developper Mauro de Gennaro would be interested in Discourse ↔ Stalwart integration. Maybe the existing code can be used as a starting point? Placing the code you want to remove, @martin, in a plugin would be useful in that case.