--- a/ipsservices/ipssosplugin/inc/ipsplgpop3fetchoperation.h	Tue Aug 31 15:04:17 2010 +0300
+++ b/ipsservices/ipssosplugin/inc/ipsplgpop3fetchoperation.h	Wed Sep 01 12:28:57 2010 +0100
@@ -20,41 +20,32 @@
 
 #include "ipsplgonlineoperation.h"
 
+//class CMsvEmailConnectionProgressProvider;
+
 /**
 * CIpsPlgPop3FetchOperation
 * Fetch message(s) operation, using client MTM Get Mail API.
 */
-NONSHARABLE_CLASS ( CIpsPlgPop3FetchOperation ) :
+class CIpsPlgPop3FetchOperation :
     public CIpsPlgOnlineOperation
     {
     public:
 
-	    /**
-	    * NewL
-	    * @param aMsvSession client/server session to MsvServer
-	    * @param aObserverRequestStatus client status
-	    * @param aService serviceId of mailbox
-	    * @param aActivityTimer mailbox specific activity timer
-	    * @param aGetMailInfo parameters set for actual MsvServer command
-	    * @param aSelection selection of entries to fetch
-	    * @param aFSMailBoxId mailbox identifier
-	    * @param aFSOperationObserver observer of this operation
-	    * @param aFSRequestId client assigned identifier for this operation instance
-	    * @param aEventHandler event handler for sending sync status events
-	    * @return operation instance
-	    */
-		// <qmail> MFSMailRequestObserver& changed to pointer
-	    static CIpsPlgPop3FetchOperation* NewL(
-	        CMsvSession& aMsvSession,
-	        TRequestStatus& aObserverRequestStatus,
-	        TMsvId aService,
-	        CIpsPlgTimerOperation& aActivityTimer,
-	        const TImPop3GetMailInfo& aGetMailInfo,
-	        CMsvEntrySelection* aSelection,
-	        TFSMailMsgId aFSMailBoxId,
-	        MFSMailRequestObserver* aFSOperationObserver,
-	        TInt aFSRequestId,
-	        CIpsPlgEventHandler* aEventHandler );
+        /**
+        *
+        */
+        static CIpsPlgPop3FetchOperation* NewL(
+            CMsvSession& aMsvSession,
+            TRequestStatus& aObserverRequestStatus,
+            TInt aFunctionId,
+            TMsvId aService,
+            CIpsPlgTimerOperation& aActivityTimer,
+            const TImPop3GetMailInfo& aGetMailInfo,
+            const CMsvEntrySelection& aSel,
+            TFSMailMsgId aFSMailBoxId,
+            MFSMailRequestObserver& aFSOperationObserver,
+            TInt aFSRequestId,
+            CIpsPlgEventHandler* aEventHandler );
 
        
         /**
@@ -63,16 +54,13 @@
         virtual ~CIpsPlgPop3FetchOperation();
 
         /**
-	    * From MsvOperation
-	    * Gets information on the progress of the operation
-	    * (see MsvOperation header)
+        *
         */
         virtual const TDesC8& ProgressL();
 
         /**
-	    * From CIpsPlgBaseOperation
-	    * For reporting if DoRunL leaves
-	    */
+        *
+        */
         virtual const TDesC8& GetErrorProgressL( TInt aError );
         
         /**
@@ -80,36 +68,33 @@
         */
         virtual TFSProgress GetFSProgressL() const;
         
-// <qmail> new func to this op
         /**
-         * Returns operation type
-         */
-        TIpsOpType IpsOpType() const;
-// </qmail>
+        *
+        */
+        virtual TInt IpsOpType() const;
         
     protected:
 
         /**
         *
         */
-		// <qmail> MFSMailRequestObserver& changed to pointer
-	    CIpsPlgPop3FetchOperation(
-	        CMsvSession& aMsvSession,
-	        TRequestStatus& aObserverRequestStatus,
-	        TMsvId aService,
-	        CIpsPlgTimerOperation& aActivityTimer,
-	        const TImPop3GetMailInfo& aGetMailInfo,
-	        CMsvEntrySelection* aSelection,
-	        TFSMailMsgId aFSMailBoxId,
-	        MFSMailRequestObserver* aFSOperationObserver,
-	        TInt aFSRequestId,
-	        CIpsPlgEventHandler* aEventHandler);
+        CIpsPlgPop3FetchOperation(
+            CMsvSession& aMsvSession,
+            TRequestStatus& aObserverRequestStatus,
+            TInt aFunctionId,
+            TMsvId aService,
+            CIpsPlgTimerOperation& aActivityTimer,
+            const TImPop3GetMailInfo& aGetMailInfo,
+            TFSMailMsgId aFSMailBoxId,
+            MFSMailRequestObserver& aFSOperationObserver,
+            TInt aFSRequestId,
+            CIpsPlgEventHandler* aEventHandler);
 
             
         /**
         *
         */
-        void ConstructL();
+        void ConstructL( const CMsvEntrySelection& aSel );
 
         /**
         * From CActive
@@ -141,8 +126,7 @@
         */
         void DoDisconnectL();
 
-	// <qmail> protected to private
-	private:
+    protected:
 
         enum TFetchState {
             EStateIdle,
@@ -150,11 +134,12 @@
             EStateClearCompleteFlag,
             EStateFetching,
             EStateDisconnecting };
-    	// internal state of the operation
         TFetchState iState;
-        // <qmail> protected to private
+
+    protected:
+        
         TDesC8* iFetchErrorProgress;
-    	// <qmail> removed iFunctionId;
+        TInt iFunctionId;
         TImPop3GetMailInfo iGetMailInfo;
         TPckgBuf<TPop3Progress> iProgressBuf;
         CMsvEntrySelection* iSelection;