Force email format to html in Mail transport
Merge branch 'refs/heads/1.2.3'