Tidied up the forwarding of chat messages.