Move to single EmailContent file; fix bug #1998157
17 files changed