Add mailer service fixes #5