Fixed bugs with mailer - still bugs