Made the messages wrap and prevented the horizontal scroll bar from being used
Merge remote-tracking branch 'origin/master'