--- a/emailservices/emailstore/message_store/server/inc/MessageStoreServer.h	Fri Feb 19 22:37:30 2010 +0200
+++ b/emailservices/emailstore/message_store/server/inc/MessageStoreServer.h	Fri Mar 12 15:41:14 2010 +0200
@@ -115,7 +115,6 @@
 							private MCustomBehaviorProvider, 
 							private MBackupRestoreObserver,
                             private MImsPointsecObserver,
-                            private MStoreDriveStateObserver,
                             public  MPSPropertyWatcherObserver
     {
     public:
@@ -187,17 +186,11 @@
         virtual void PointSecLockStarted();
         virtual void PointSecLockEnded();
         
-            
-        //from MStoreDriveStateObserver
-        virtual void DriveStateChangedL( TBool aState );
         
         void LockSystem();
         void UnlockSystemL();
         
-        void FindBiggestCapacityDriveL( TDriveNumber& aDrive );
-        TInt GetDriveL( TDriveNumber& aDrive );
-        void SetDriveL( const TDriveNumber aDrive );
-        
+    
         void SendSystemLockMessage( TInt aEvent );
         void TPtrC8ToRBuf16L( const TPtrC8& aPtr8, RBuf& aBuf ) const;
                 
@@ -212,10 +205,7 @@
         CImsPointsecMonitor*                iPointsecMonitor;
         TBool                               iWipeAfterBackupRestore;
         
-        //monitor the message store drive for mount/unmount
-        CStoreDriveMonitor*                 iStoreDriveMonitor;
-        //True if the message store is locked because drive is unmount 
-        TBool                               iLockedByDriveMonitor;
+
 
         TBool                               iLockedByBackupRestore;
         TBool                               iLockedByPointSec;