Pre-change to conversations

Committing before I try to work out the change to conversation vs.
message view