Fixed failing mails