The mighty Message => Conversation refactor