Improved chat detection and also moved b3 messages to the chat tab