Improve selection of chat messages