Revert "Fixed chat messages"

This reverts commit d3ebea3fd64e2521d5d18155f726cdce28d630c7.