--- a/messagingapp/msgappfw/server/inc/ccsconversationdeletehandler.h	Mon May 03 12:29:07 2010 +0300
+++ b/messagingapp/msgappfw/server/inc/ccsconversationdeletehandler.h	Fri Jun 25 15:47:40 2010 +0530
@@ -25,7 +25,6 @@
 class MMsvSessionObserver;
 class CConversationCache;
 class CCsConversationEntry;
-class MCsConversationDeleteObserver;
 
 /**
  * Delete handler states
@@ -48,8 +47,7 @@
     /**
      * Two phase construction
      */
-    static CCsConversationDeleteHandler* NewL(CCsConversationCache* aCache,
-            MCsConversationDeleteObserver* aObserver);
+    static CCsConversationDeleteHandler* NewL(CCsConversationCache* aCache);
 
     /**
      * Destructor
@@ -74,8 +72,7 @@
 		
 private:    
     CCsConversationDeleteHandler();
-    void ConstructL(CCsConversationCache* aCache,
-            MCsConversationDeleteObserver* aObserver);
+    void ConstructL(CCsConversationCache* aCache);
     void IssueRequest();
     void DeleteOneMessage();
     
@@ -86,13 +83,6 @@
     CMsvSession* iSession;
     
     /**
-     * iObserverList
-     * List of observers
-     * Own.
-    */
-    MCsConversationDeleteObserver* iObserver;
-    
-    /**
      * State
      */
     TDeleteHandlerState iState;
@@ -116,6 +106,13 @@
      * Conversation Id currently being deleted.
      */
     TInt iConversationId;
+    
+    /**
+     *  Number of Messages in Sending state that are not deleted
+     */
+    TInt iSendStateMsgs;
+    
+    
     };
 
 #endif // __C_CS_CONVERSATION_DELETE_HANDLER_H__