[WO-286] change data model to support html and signed msgs