--- a/ipsservices/ipssosaoplugin/src/IpsSosAOSmtpAgent.cpp	Tue Feb 02 00:02:40 2010 +0200
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOSmtpAgent.cpp	Fri Apr 16 14:51:52 2010 +0300
@@ -19,9 +19,14 @@
 #include "emailtrace.h"
 #include <e32base.h>
 
+//<QMail>
+#include "CFSMailCommon.h"
+//</QMail>
 #include "IpsSosAOSmtpAgent.h"
 #include "ipsplgsmtpoperation.h"
-#include "ipssetdataapi.h"
+//<QMail>
+
+//</QMail>
 
 
 #ifdef _DEBUG
@@ -133,14 +138,17 @@
     FUNC_LOG;
     if ( !iOperation )
         {
+		//<QMail>
         iOperation = CIpsPlgSmtpOperation::NewL(
-            iSession, EPriorityStandard, iStatus , EFalse );
+            iSession, EPriorityStandard, iStatus  );
         }
-        
+    /*
     if ( !iSettingsApi )
         {
         iSettingsApi = CIpsSetDataApi::NewL( iSession );
         }
+    */
+	//</QMail>
     }
 
 // ----------------------------------------------------------------------------
@@ -158,9 +166,9 @@
         delete iOperation;
         iOperation = NULL;
         }
-    
-    delete iSettingsApi;
-    iSettingsApi = NULL;
+	//<QMail>
+
+    //</QMail>
     }