develop finished fix MailMessages (hopefully)