[c12570] Improve chat channel code