Fixed issue with messages being duplicated in messageviewer