Update to fix and enhance message view.