Update rest of code base to use the new MessageViewModel.