Merge pull request #3520 from spicyj/validate-message

Tweak validation message, add html support