fixes on mails