Adding HTML back into mime-mail template
Merge branch 'develop'