CE-63 Adding escaping for messages directly passed to html