I tend to agree, but let's do this in another PR, this is quite important functionality and I'm fine with it as it is here. Also, I think the whole "Mailer" thing could be a component, reused by multiple bundles. Hm?