added support for html messages