Mail module porting

I correct it.