--- a/messagingapp/msgappfw/server/src/ccssession.cpp	Fri Jun 04 10:25:39 2010 +0100
+++ b/messagingapp/msgappfw/server/src/ccssession.cpp	Fri Jun 11 13:35:48 2010 +0300
@@ -1043,8 +1043,11 @@
     if (!iConversationChangeObserver)
         return;
 
-    if (aClientConversation->GetConversationEntryId()
+    if ((aClientConversation->GetContactId()
+            != iMonitoredConversation->GetContactId()) &&
+            (aClientConversation->GetConversationEntryId()
             != iMonitoredConversation->GetConversationEntryId())
+              )
         return;
 
     if (! (iNotifyHandling))
@@ -1103,8 +1106,11 @@
     if (!iConversationChangeObserver)
         return;
 
-    if (aClientConversation->GetConversationEntryId()
-            != iMonitoredConversation->GetConversationEntryId())
+    if ((aClientConversation->GetContactId()
+               != iMonitoredConversation->GetContactId()) &&
+               (aClientConversation->GetConversationEntryId()
+               != iMonitoredConversation->GetConversationEntryId())
+                 )
         return;
 
     if (! (iNotifyHandling))
@@ -1163,8 +1169,11 @@
     if (!iConversationChangeObserver)
         return;
 
-    if (aClientConversation->GetConversationEntryId()
-            != iMonitoredConversation->GetConversationEntryId())
+    if ((aClientConversation->GetContactId()
+                != iMonitoredConversation->GetContactId()) &&
+                (aClientConversation->GetConversationEntryId()
+                != iMonitoredConversation->GetConversationEntryId())
+                  )
         return;
 
     if (! (iNotifyHandling))