Bug 851124 - [E-Mail] uplift all email to v1-train and v1.0.1

follow-up to remove unwanted files