diff -r 238255e8b033 -r 84d9eb65b26f messagingapp/msgappfw/plugin/inc/ccsmsghandler.h
--- a/messagingapp/msgappfw/plugin/inc/ccsmsghandler.h	Fri Apr 16 14:56:15 2010 +0300
+++ b/messagingapp/msgappfw/plugin/inc/ccsmsghandler.h	Mon May 03 12:29:07 2010 +0300
@@ -55,13 +55,11 @@
 enum TMsgHandlerState
     {
     EReadInbox,
-    EProcessInbox,
     EReadSent,
-    EProcessSent,
-    EReadDraft,
     EProcessDraft,
     EReadOutbox,
-    EProcessOutbox,
+    ESortEntries,
+    EProcessEntries,
     EComplete
     };
 
@@ -186,6 +184,7 @@
      * @param aEntry, TMsvEntry
      */
     TCsType ExtractCsType( const TMsvEntry& aEntry);
+
 	
 private: //Data
 
@@ -249,6 +248,11 @@
     CMsvEntrySelection* iMessages;
 
     /**
+     * Master array for holding all the messages 
+     */
+   RArray<TMsvId>* iMessageArray;
+
+    /**
      * State
      */
     TMsgHandlerState iState;