Mail

Fiw issues #359 and #358