Messaging updates for getting clearchat to work with shim

This still needs additional work to get the timeouts and connection
lost handles correctly