Tokens that have special characters show HTML Entities instead of the character

We are using a token for "company name" in the subject line of the email, and when the company has an ampersand in it, the subject renders & instead of just &.

This was particularly a problem when we included it in the "From" address -- the ; in the string split the From address into two addresses, the first of which was not a valid email address, leading to a complete whitescreen. We did work around this by adding explicit quotes around the entire "From" name.