#369: Valerie & Brandon: Mailer fixes