General mail control

Lets try this one more time. You had slipped a few changes in while I was working on this. If this fails, I'll refork..