|#951| getting rid of EmailMessage wrapper class