Little changes in Mailer