Fix #1540 by allowing HTML in Message and HTML encoding it before sending

Fixes #1540