--- a/messagingapp/msgui/msgapp/src/msgviewmanager.cpp	Wed Sep 01 14:19:13 2010 +0530
+++ b/messagingapp/msgui/msgapp/src/msgviewmanager.cpp	Tue Sep 07 13:28:39 2010 +0530
@@ -683,11 +683,6 @@
 	    mUniViewer = NULL;
 	}
 
-    if (mConversationView)
-    {
-        //clearing content of cv.
-        mConversationView->clearContent();
-    }
 
     // reset conversation id published
     if(mPreviousView == MsgBaseView::CV && mConversationView)
@@ -766,7 +761,7 @@
             connect(mUniViewer, SIGNAL(switchView(const QVariantList&)), this,
                 SLOT(switchView(const QVariantList&)));
         }
-        mUniViewer->populateContent(messageId, true, msgCount);
+        mUniViewer->populateContent(messageId, true, msgCount, mConversationId);
     }
 
     if(mPreviousView==MsgBaseView::CV && mConversationView)
@@ -926,7 +921,7 @@
         connect(mUniViewer, SIGNAL(switchView(const QVariantList&)), this,
             SLOT(switchView(const QVariantList&)));
     }
-    mUniViewer->populateContent(msgId, true, -1);
+    mUniViewer->populateContent(msgId, true, -1, mConversationId);
 
     mMainWindow->setCurrentView(mUniViewer,true,Hb::ViewSwitchSequential);
 }
@@ -1100,6 +1095,20 @@
     }
 
 // ----------------------------------------------------------------------------
+// MsgViewManager::handleKeyEvent
+// @see header
+// ----------------------------------------------------------------------------
+bool MsgViewManager::handleKeyEvent(int key)
+{
+    MsgBaseView *baseView = static_cast<MsgBaseView *>(mMainWindow->currentView());
+    bool eventHandled = false;
+    if (baseView) {
+        eventHandled = baseView->handleKeyEvent(key);
+    }
+    return eventHandled;
+}
+
+// ----------------------------------------------------------------------------
 // MsgViewManager::saveContentToDraft
 // @see header
 // ----------------------------------------------------------------------------