Added EmailMessage and test