changes due to method name change in EmailMessage class