Ensure message subject, body, html return unicode

I don't actually want to merge this yet, I'm just submitting a pull so it's visible on your repo, Wil. There's more unicode changes to make still...