--- a/ipsservices/ipssosplugin/src/ipsplgeventhandler.cpp	Tue Apr 27 16:20:14 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgeventhandler.cpp	Tue May 11 15:57:15 2010 +0300
@@ -1196,12 +1196,7 @@
 // ---------------------------------------------------------------------------
 TUid CIpsPlgEventHandler::MtmId() const
     {
-    TUid ret = KSenduiMtmImap4Uid;
-    if ( iBasePlugin.MtmId().iUid == KIpsPlgPop3PluginUidValue )
-        {
-        ret = KSenduiMtmPop3Uid;
-        }
-    return ret;
+    return iBasePlugin.MtmId();
     }
 //</cmail>
 // ----------------------------------------------------------------------------
@@ -1329,6 +1324,7 @@
         }
 
     RPointerArray<MFSMailEventObserver> observers;
+    CleanupClosePushL( observers );  // not owning classes
     MailboxObserversL( aAccount, observers );
 
     if ( find != KErrNotFound )
@@ -1342,7 +1338,7 @@
         obs->SetKeyAndActivateL( aSettingKey, observers );
         iIPSSettingsObservers.AppendL( obs );
         }
-    observers.Close();
+    CleanupStack::PopAndDestroy( &observers );
     }
 
 // ----------------------------------------------------------------------------