Merge "Split OutgoingEmail into 2 classes"