Merge pull request #896 from mexon/mat/mailstream-new-img-format