Update to EmailMessage