Better to text implementation for messageviewer
Resolved merge conflicts
Resolved merge conflicts