More Mailer refactoring.