Fix email rendering
Merge branch 'hotfix/1.0.5'