diff -r 6b8f3b30d0ec -r efd4f1afd43e emailservices/emailserver/cmailhandlerplugin/inc/cmailcpssettings.h
--- a/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpssettings.h	Wed Jun 09 09:22:57 2010 +0300
+++ b/emailservices/emailserver/cmailhandlerplugin/inc/cmailcpssettings.h	Mon Jun 21 15:20:54 2010 +0300
@@ -19,6 +19,9 @@
 #ifndef CMAILCPSSETTINGS_H_
 #define CMAILCPSSETTINGS_H_
 
+#include "PSSubscriber.h"
+#include "PSSubscribeHandler.h"
+
 class CRepository;
 class CMailExternalAccount;
 
@@ -47,7 +50,8 @@
  *  @lib fsmailserver.exe
  *  @since S60 v5.1
  */
-NONSHARABLE_CLASS( CMailCpsSettings ) : public CActive
+NONSHARABLE_CLASS( CMailCpsSettings ) : public CActive,
+                                        public MPSSubscribeHandler
     {
 public:
     /**
@@ -195,6 +199,18 @@
      */    
     TBool Associated( const TDesC& aContentId );
     
+    /**
+     * Callback from PSSubscriber about a PS key event
+     * @param aCategory defines the key category
+     * @param aKey defines the changed key
+     */
+    void HandlePropertyChangedL( const TUid& aCategory, TInt aKey );
+
+    /**
+     *
+     */
+    TBool BackupOrRestoreMode();
+    
 protected:
     /**
      * From CActive
@@ -296,6 +312,12 @@
     TInt32                    iConfigData;
     // large buffer for reading cenrep data
     TBuf<KMaxFileName>        iCenrepText;
+    // PubSub subsriber for notifying restore operation
+    CPSSubscriber*            iBackupRestoreSubscriber;
+    // Indicates if restore operation is started
+    TBool                     iRestoreStarted;
+    // Indicates if backup operation is ongoing
+    TBool                     iBackupOngoing;
     };
 
 #endif /*CMAILCPSSETTINGS_H_*/