Fix rendering of main chat messages

Authored by SamanthaNguyen on Jun 6 2017, 10:39 PM.

Description

Fix rendering of main chat messages

HT to MatmaRex, Kitsufox, Kyndzee, and Hawke :)

Bug: T166421
Change-Id: I90984c81cf04b2c19b5353a8f6d75e853dd89e44