Bug 870317: email: fix unicode entity escaping
Merge pull request #9657 from jrburke/bug870317-unicode-escape

Bug 870317: email: fix unicode entity escaping r=asuth