Merge pull request #893 from mexon/mat/mailstream-plaintext