MailHelper was added