Martin/28 mar fixes daily mailer