Mail module porting

Then we are both on at the same page.