Removed HTML from text emails
Merge branch 'isoda' into isoda-final