--- a/ipsservices/ipssosplugin/src/ipsplgpop3plugin.cpp	Mon May 03 12:23:15 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgpop3plugin.cpp	Fri May 14 15:41:10 2010 +0300
@@ -92,8 +92,10 @@
         case EFSMBoxCapaCanBeDeleted:
         case EFSMBoxCapaSupportsSaveToDrafts:
         case EFSMBoxCapaMeetingRequestRespond:
+        case EFSMboxCapaSupportsAttahmentsInMR:
         case EFSMBoxCapaMeetingRequestCreate:
         case EFSMBoxCapaCanUpdateMeetingRequest:
+        case EFSMBoxCapaRemoveFromCalendar:    
             {
             result = ETrue;
             break;
@@ -161,11 +163,13 @@
     TInt populationLimit( settings->PopulationLimit() );
     CleanupStack::PopAndDestroy( 2, settings );   // >>> settings, accounts
     TBool forcePopulate( EFalse );
+// <qmail>
     /*
     if( populationLimit != KIpsSetDataHeadersOnly )
         {
         forcePopulate = ETrue;
         }*/
+// </qmail>
     
     CIpsPlgBaseOperation* op = CIpsPlgPop3ConnectOp::NewL( 
         *iSession, 
@@ -184,10 +188,10 @@
     iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );   // >> watcher
     	
-   	//<qmail>
+//<qmail>
     // send part of refresh
     //EmptyOutboxL( aMailBoxId ); // not used in qmail yet
-	  //</qmail>
+//</qmail>
     }
 
 // ---------------------------------------------------------------------------
@@ -334,22 +338,22 @@
     TImPop3GetMailInfo info;
     info.iMaxEmailSize = KMaxTInt32;
     info.iDestinationFolder = aMailBoxId.Id();
-    
+    // <qmail> ownership of selection is moved to the operation
     CIpsPlgBaseOperation* op = CIpsPlgPop3FetchOperation::NewL( 
         *iSession, 
         watcher->iStatus,
-        KPOP3MTMCopyMailSelectionWhenAlreadyConnected,
         aMailBoxId.Id(), 
         ActivityTimerL( aMailBoxId ), 
         info, 
-        *sel, 
+        sel, 
         aMailBoxId, 
         &aObserver, 
         aRequestId,
         iEventHandler );
     
     watcher->SetOperation( op );
-    CleanupStack::PopAndDestroy( sel );
+	// <qmail> change PopAndDestroy to Pop
+    CleanupStack::Pop( sel );
     CleanupStack::Pop( watcher );
     
     iOperations.AppendL( watcher );