Edited the mailer code again