[Mailer] Fix and specs for mailer