Corrected mailer logic