--- a/ipsservices/ipssosaoplugin/src/IpsSosAOImapPopLogic.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOImapPopLogic.cpp	Fri Apr 16 14:51:52 2010 +0300
@@ -30,7 +30,9 @@
 #include "IpsSosAOImapPopLogic.h"
 #include "IpsSosAOMboxLogic.h"
 #include "IpsSosAOEMNResolver.h"
-#include "ipssetdataapi.h"
+//<QMail>
+
+//</QMail>
 
 
 
@@ -60,7 +62,9 @@
     iMailboxLogics.ResetAndDestroy();
    // iActiveEvents.ResetAndDestroy();
     delete iEmnResolver;
-    delete iDataApi;
+	//<QMail>
+
+	//</QMail>
     }
 
 // ----------------------------------------------------------------------------
@@ -84,7 +88,9 @@
     {
     FUNC_LOG;
     iEmnResolver = CIpsSosAOEMNResolver::NewL();
-    iDataApi = CIpsSetDataApi::NewL( iSession );
+	//<QMail>
+
+	//</QMail>
     }
 
 // ----------------------------------------------------------------------------
@@ -405,7 +411,8 @@
                 found = ETrue;
                 }
             }
-        
+		//<QMail>
+        /*
         CIpsSetDataExtension* extSet = CIpsSetDataExtension::NewLC();
         TRAPD( error, iDataApi->LoadExtendedSettingsL( 
                 mboxId, *extSet ) );
@@ -430,6 +437,8 @@
                 }
             }
         CleanupStack::PopAndDestroy( extSet );
+        */
+		//</QMail>
         }
     }