E-mail module clean up

E-mail clean up