Patch

fix for #16 and message mailer falling over