Fixed Mailer bugs