More tweeks to the mailer