Mail

Fix issues #359 and #358