Added support for EML messages