use less html-mails
Merge branch 'master' into jupis