#2 - markup message view
revert
#2 - markup message view
Merge branch '1104-ms-2-markupMessageView' into dev