DO NOT MERGE: Fix bug 852214: Add support for multipart text and html emails.

DO NOT MERGE YET! Since this changes a few strings, we want to wait until after the upcoming release to merge.