rerolled pull request 393, tokenize suject line in email wrappers