Fix for new chat layout.

This will eventually make certain logic easier to deal with. Once I can
be sure it is rolled out across the majority of users (a few weeks?) I
will remove the legacy layout stuff.

Ref #30