Refactoring RTMessageViewer and so allowing source display