diff -r d189ee25cf9d -r 3533d4323edc ipsservices/ipssosaoplugin/inc/IpsSosAOSmtpAgent.h
--- a/ipsservices/ipssosaoplugin/inc/IpsSosAOSmtpAgent.h	Tue Aug 31 15:04:17 2010 +0300
+++ b/ipsservices/ipssosaoplugin/inc/IpsSosAOSmtpAgent.h	Wed Sep 01 12:28:57 2010 +0100
@@ -16,25 +16,21 @@
 *
 */
 
-#ifndef __IPSSOSAOSMTPAGENT_H
-#define __IPSSOSAOSMTPAGENT_H
+#ifndef __IPSSOSAOSMTPAGENT_H__
+#define __IPSSOSAOSMTPAGENT_H__
 
 
 #include <e32base.h>    // CBase
 #include <msvapi.h>
 
 class CIpsPlgSmtpOperation;
-//<QMail>
-
-//</QMail>
+class CIpsSetDataApi;
 
 /**
 * class CIpsSosAOSmtpAgent;
 *
 */
-//<Qmail>
-NONSHARABLE_CLASS (CIpsSosAOSmtpAgent) : 
-//</Qmail>
+class CIpsSosAOSmtpAgent : 
     public CActive
     {
     public:
@@ -57,25 +53,16 @@
         */
         virtual ~CIpsSosAOSmtpAgent();
         
-        
         virtual void DoCancel();
-        
         virtual void RunL();
-        //<Qmail>
-        /**
-         * CMsvSession event callback 
-         */
+        
         void HandleSessionEventL(    
             MMsvSessionObserver::TMsvSessionEvent aEvent,
             TAny* aArg1, 
             TAny* aArg2, 
             TAny* aArg3 );
             
-        /**
-         * Tries to send messages from outbox
-         */
         void EmptyOutboxNowL( TMsvId aMessage );
-		//</Qmail>
         
     private:
         /**
@@ -89,17 +76,10 @@
         * Second phase constructor
         */
         void ConstructL();    
-		//<Qmail>
-        /**
-         * Creates needed internal data
-         */
+
         void CreateInternalDataL( );
         
-        /**
-         * Releases internal resources
-         */
         void ReleaseInternalData( );
-		//</Qmail>
         
         
     private:
@@ -109,14 +89,14 @@
     private:
 
        CMsvSession& iSession;
-		//<Qmail>
-       CIpsPlgSmtpOperation* iOperation;//owned
-	  
+	
+       CIpsPlgSmtpOperation* iOperation;
 
-       //</QMail>
+       CIpsSetDataApi* iSettingsApi;
+       
        TInt iError;
        
     };
 
-#endif /* __IPSSOSAOSMTPAGENT_H*/
+#endif /* __IPSSOSAOSMTPAGENT_H__ */
 //EOF