Fixed chat message handling