Better mailer handling