Now that we no longer use tables for our message list, we can more logically group messages together. (imported from commit 9923a092f91a45fe3ef06f2f00e23e4e3fb62a37)