Fixed the message viewing