diff -r efd4f1afd43e -r d620048b4810 emailservices/emailserver/inc/fsnotificationhandlermgrimpl.h
--- a/emailservices/emailserver/inc/fsnotificationhandlermgrimpl.h	Mon Jun 21 15:20:54 2010 +0300
+++ b/emailservices/emailserver/inc/fsnotificationhandlermgrimpl.h	Thu Jul 15 18:19:25 2010 +0300
@@ -99,7 +99,11 @@
     virtual TInt AuthenticateL( TDes& aPassword,
                                 TDesC& aMailboxName,
                                 TRequestStatus& aStatus  );
-    //</cmail>
+
+    /**
+     * @see MFSNotificationHandlerMgr::GetFolderType
+     */
+    virtual TFSFolderType GetFolderTypeL( TFSMailMsgId& aMailbox, TFSMailMsgId* parentFolderId );
 
     /**
      * @see MFSNotificationHandlerMgr::IncreaseDialogCount
@@ -171,7 +175,7 @@
     */
     void CreateAndStoreHandlerL( TInt aImplementationUid );
 
-	void CleanTempFilesIfNeededL();
+    void CleanTempFilesIfNeededL();
 
 private: // data
 
@@ -209,6 +213,10 @@
      */
     TInt iDialogCount;
 
+    // for caching of parent folder type
+    TFSMailMsgId  iPreviousMailbox;
+    TFSMailMsgId  iPreviousParentFolderId;
+    TFSFolderType iPreviousParentFolderType;
     };
 
 #endif // C_FSNOTIFICATIONHANDLERMGRIMPL_H