fixing the email message context a little bit