Making mailer inline with new style