--- a/messagingapp/msgappfw/msghistory/src/msghistoryprivate.cpp	Thu Jun 17 09:57:06 2010 +0100
+++ b/messagingapp/msgappfw/msghistory/src/msghistoryprivate.cpp	Thu Jul 22 16:32:06 2010 +0100
@@ -19,7 +19,7 @@
 #include <ccsrequesthandler.h>
 #include <ccsconversationentry.h>
 #include <ccsclientconversation.h>
-#include <s60qconversions.h>
+#include <xqconversions.h>
 
 //USER INCLUDES
 #include "msghistoryprivate.h"
@@ -101,6 +101,9 @@
             conversationId = handler->GetConversationIdL(aContactId));
     CCsClientConversation* clientConversation = CCsClientConversation::NewL();
     clientConversation->SetConversationEntryId(conversationId);
+    // set the contact id, which will be used in case when the 
+    // conversation entry id is -1.
+    clientConversation->SetContactId(aContactId);
     //set dummy entry
     CCsConversationEntry *entry = CCsConversationEntry::NewL();
     clientConversation->SetConversationEntryL(entry);
@@ -125,6 +128,9 @@
             conversationId = handler->GetConversationIdL(aContactId));
     CCsClientConversation* clientConversation = CCsClientConversation::NewL();
     clientConversation->SetConversationEntryId(conversationId);
+    // set the contact id, which will be used in case when the 
+    // conversation entry id is -1.
+    clientConversation->SetContactId(aContactId);
     //set dummy entry
     CCsConversationEntry *entry = CCsConversationEntry::NewL();
     clientConversation->SetConversationEntryL(entry);
@@ -230,7 +236,7 @@
     HBufC* description = entry.Description();    
     if( description && description->Length())
         {
-        item.setBody(S60QConversions::s60DescToQString(*description)); 
+        item.setBody(XQConversions::s60DescToQString(*description)); 
         }
 
     // time stamp 
@@ -244,7 +250,7 @@
     HBufC* contact = entry.Contact();
     if( contact && contact->Length())
         {
-        item.setPhoneNumber(S60QConversions::s60DescToQString(*contact));      
+        item.setPhoneNumber(XQConversions::s60DescToQString(*contact));      
         }
 
     //sending state