Fix Issue #582 - Chat wrapping feels inefficient
Merge pull request #940 from Joshua-S/issue-582

Fix Issue #582 - Chat wrapping feels inefficient