Bug 814441 - Email text has no formatting applied. a=BerlinWW, r=asuth.
Merge pull request #7360 from steveck-chung/bug-814441-fixing

Bug 814441 - Email text has no formatting applied. r=asuth, a=approval-gaia-master
Auto-merge from branch 'master'