Merge "[Email] Review messaging API cs files"