Okay, I still have a good bit of testing to do on this, so please, in no way consider it useful yet. I even need to re-format the code to JBG's likings. If you don't put it in the tree yet, that's fine, I just wanted to give someone (if they cared) an idea of what I'm doing.
Mail Services has a slightly different formating from the "standard". There is a good reason for that, but I don't care to explain it. So match mail services. BTW, there is no more JBG. Long live JBI ;-)