Fixed message display bug

messageData wrong, content is what is returned in the JSON payload
Added id to message html
Merge fixes for display of message content.