Fixed the mailer issue