Better mails handling #103