--- a/emailservices/psmruadapter/inc/CPsMruAdapter.h	Mon Jun 21 15:20:54 2010 +0300
+++ b/emailservices/psmruadapter/inc/CPsMruAdapter.h	Thu Jul 15 18:19:25 2010 +0300
@@ -111,7 +111,7 @@
          */
         void DeleayMailboxCreationEventL( TFSMailMsgId &aMailbox );
         
-	private:
+    private:
 
         /**
          * Constructor
@@ -126,18 +126,18 @@
         
         /**
          * Updates given data store
-         */  	    
+         */         
         TBool FillDataStoreL( TDesC& aDataStoreURI );
         
         /**
          * Updates given data store
-         */  	    	    
+         */                 
         TBool FillDataStoreL( TFSMailMsgId& aId );
         
         /**
          * Updates a list of supported data stores
-         */  	    
-        void UpdateSupportedDataStoresList();	    
+         */         
+        void UpdateSupportedDataStoresList();       
         
         /**
          * Starts observing mailbox
@@ -166,12 +166,12 @@
         
         /**
         * Updates given data store
-        */  	    	    
-        TBool FillDataStoreL( TFSMailMsgId& aId, TDesC& aDataStoreURI );	    
+        */                  
+        TBool FillDataStoreL( TFSMailMsgId& aId, TDesC& aDataStoreURI );        
         
         /**
         * Calls MDataStoreObserver::AddData for every mru email - used for trapping 
-        */  	    	    
+        */                  
         void AddMruEmailsL( MDesCArray* aMruList, TDesC& aDataStoreURI );
 
     private: // data
@@ -185,12 +185,12 @@
         /**
         * An observer instance used to send the datastore to the adapter
         */
-        MStoreListObserver* iStoreListObserver;		
-        	
+        MStoreListObserver* iStoreListObserver;     
+            
         /**
         * Supported Uris(data stores)
         */
-        RPointerArray<HBufC> iSupportedUris;	
+        RPointerArray<HBufC> iSupportedUris;    
         
         /**
          * List of mailboxes currently being observed
@@ -212,6 +212,10 @@
         */
         RArray<TFSMailMsgId> iDelayedCreatedMailboxes;
 
+        TFSMailMsgId  iPreviousMailboxId; 
+        TFSMailMsgId  iPreviousParentFolderId; // not owned
+        /* folder type for a mailbox referenced by iPreviousMailbox and iPreviousParentFolderId */
+        TFSFolderType iPreviousParentFolderType; 
     }; // class CPsMruAdapter
 
 //-----------------------------------------------------------------------------
@@ -236,7 +240,7 @@
         // d-tor
         virtual ~CDelayMailboxCreationHelper();
         // Start timer to call CPsMruAdapter::DeleayedMailboxCreationEventL by RunL 
-        void StartDelayedCall();	
+        void StartDelayedCall();    
     protected:
         // on timer event - calls CPsMruAdapter::DeleayedMailboxCreationEventL
         virtual void RunL();