Allow team switch for narrow margins

Refactored overrides of pending chat messages