Refactored Mailer