Chat handling improvements