Improve chat messages