some mail stuff
Merge origin/master