[website] [message.html template] fixes
Merge branch 'master' into edge