Additional Mailer changes