#112 - More cleanup up of the chat window messages