--- a/ipsservices/ipssosplugin/src/ipsplgsosbaseplugin.cpp	Thu Sep 30 11:43:07 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgsosbaseplugin.cpp	Thu Oct 14 17:33:43 2010 +0300
@@ -816,7 +816,7 @@
         aOperationObserver,
         aRequestId );
     //</qmail>
-    watcher->SetOperation( op );
+    watcher->SetOperation( op ); // takes ownership of op
 
     iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );
@@ -861,7 +861,7 @@
         }
 
     if ( ( orgMsg.Parent() == KMsvSentEntryIdValue ) &&
-         ( orgMsg.iMtm == KSenduiMtmSmtpUid ) )
+         ( orgMsg.iMtm == KUidMsgTypeSMTP ) )
         {
         iSmtpService->ChangeServiceIdL( orgMsg );
         }
@@ -881,7 +881,7 @@
         aOperationObserver,
         aRequestId );
     //</qmail>
-    watcher->SetOperation( op );
+    watcher->SetOperation( op ); // takes ownership of op
 
     iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );
@@ -927,7 +927,7 @@
         }
 
     if ( ( orgMsg.Parent() == KMsvSentEntryIdValue ) &&
-         ( orgMsg.iMtm == KSenduiMtmSmtpUid ) )
+         ( orgMsg.iMtm == KUidMsgTypeSMTP ) )
         {
         iSmtpService->ChangeServiceIdL( orgMsg );
         }
@@ -953,7 +953,7 @@
         aOperationObserver,
         aRequestId );
     //</qmail>
-    watcher->SetOperation( op );
+    watcher->SetOperation( op ); // takes ownership of op
 
     iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );
@@ -981,8 +981,8 @@
 
         if ( status == KErrNone )
             {
-            incoming = ( tEntry.iMtm == KSenduiMtmImap4Uid ) ||
-                ( tEntry.iMtm == KSenduiMtmPop3Uid );
+            incoming = ( tEntry.iMtm == KUidMsgTypeIMAP4 ) ||
+                ( tEntry.iMtm == KUidMsgTypePOP3 );
             }
         }
 
@@ -1036,7 +1036,7 @@
                     aOperationObserver,
                     aRequestId );
 
-    watcher->SetOperation(op);
+    watcher->SetOperation(op); // takes ownership of op
     iOperations.AppendL(watcher);
     CleanupStack::Pop( 2, watcher );
     }
@@ -1138,7 +1138,7 @@
         aOperationObserver,
         aRequestId,
         iMsgMapper);
-    watcher->SetOperation( op );
+    watcher->SetOperation( op ); // takes ownership of op
 
     iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );
@@ -1214,7 +1214,7 @@
         aPartId,
         aOperationObserver,
         aRequestId);
-    watcher->SetOperation( op );
+    watcher->SetOperation( op ); // takes ownership of op
 
     iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );
@@ -1487,7 +1487,7 @@
                     watcher->iStatus, *this, aMessageParts,
                     aOperationObserver, aRequestId);
 
-    watcher->SetOperation(op);
+    watcher->SetOperation(op); // takes ownership of op
     iOperations.AppendL(watcher);
     CleanupStack::Pop( 2, watcher );
     }
@@ -1688,7 +1688,7 @@
     CMsvOperation* op = CIpsPlgDeleteOperation::NewL( *iSession,
         watcher->iStatus, sel );
     //</qmail>
-    watcher->SetOperation( op );
+    watcher->SetOperation( op ); // takes ownership of op
     iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );
     //<qmail>
@@ -1728,7 +1728,7 @@
     CleanupStack::PushL( watcher );
     CMsvOperation* op = CIpsPlgDeleteOperation::NewL( *iSession,
         watcher->iStatus, sel, aOperationObserver, aRequestId );
-    watcher->SetOperation( op );
+    watcher->SetOperation( op ); // takes ownership of op
     iOperations.AppendL( watcher );
     CleanupStack::Pop( watcher );
     CleanupStack::Pop( sel );
@@ -1953,7 +1953,7 @@
         {
         folderType = EFSInbox;
         }
-	else if( ( aEntry->Entry().iMtm == KSenduiMtmPop3Uid ) &&
+	else if( ( aEntry->Entry().iMtm == KUidMsgTypePOP3 ) &&
 	         ( aEntry->Entry().iType == KUidMsvServiceEntry ) &&
 	         ( aEntry->Entry().iServiceId == aFolderId.Id() ) )
 	    {
@@ -2156,7 +2156,7 @@
             &aObserver,
             aRequestId );
 
-        watcher->SetOperation( op );
+        watcher->SetOperation( op ); // takes ownership of op
         CleanupStack::PopAndDestroy( sel );
         iOperations.AppendL( watcher );
         CleanupStack::Pop( watcher );
@@ -2199,7 +2199,7 @@
     CIpsPlgSmtpOperation* op = CIpsPlgSmtpOperation::NewLC( *iSession, watcher->iStatus );
 // </qmail>
     op->SetEventHandler(iEventHandler);
-    watcher->SetOperation(op);
+    watcher->SetOperation(op); // takes ownership of op
     op->EmptyOutboxFromPendingMessagesL( aMailBoxId.Id() );
     iOperations.AppendL(watcher);
     CleanupStack::Pop( 2, watcher );
@@ -2399,10 +2399,10 @@
 TUid CIpsPlgSosBasePlugin::MtmId() const
     {
     FUNC_LOG;
-    TUid ret = KSenduiMtmImap4Uid;
+    TUid ret = KUidMsgTypeIMAP4;
     if ( iFSPluginId == KIpsPlgPop3PluginUidValue )
         {
-        ret = KSenduiMtmPop3Uid;
+        ret = KUidMsgTypePOP3;
         }
     return ret;
     }
@@ -2468,7 +2468,7 @@
     //currently, no actions unless this is inbox
     //also, if id is '0', it means inbox before first sync...it doesn't really exist yet
     if( folder.iDetails.CompareF( KIpsPlgInbox ) == 0 || folder.Id() == 0 ||
-            ( folder.iMtm == KSenduiMtmPop3Uid ) &&
+            ( folder.iMtm == KUidMsgTypePOP3 ) &&
             ( folder.iType == KUidMsvServiceEntry ) &&
             ( folder.iServiceId == aActiveFolderId.Id() ) )
         {