Merge pull request #2137 from reaperhulk/encode-rfc822name

Encode rfc822name