--- a/ipsservices/ipssosaoplugin/inc/IpsSosAOPluginEComInterface.h	Tue Aug 31 15:04:17 2010 +0300
+++ b/ipsservices/ipssosaoplugin/inc/IpsSosAOPluginEComInterface.h	Wed Sep 01 12:28:57 2010 +0100
@@ -16,8 +16,8 @@
 *
 */
 
-#ifndef IPSSOSAOPLUGINECOMINTERFACE_H
-#define IPSSOSAOPLUGINECOMINTERFACE_H
+#ifndef IPSSOSAOPLUGINECOMINTERFACE_H_
+#define IPSSOSAOPLUGINECOMINTERFACE_H_
 
 #include <e32base.h>    // CBase
 #include <AlwaysOnlineEComInterface.h>
@@ -36,9 +36,7 @@
 *
 * @lib ipssosaoplugin.lib
 */
-//<Qmail>
-NONSHARABLE_CLASS (CIpsSosAOPluginEComInterface) : 
-//</Qmail>
+class CIpsSosAOPluginEComInterface : 
     public CAlwaysOnlineEComInterface,
     public MMsvSessionObserver
     {
@@ -95,13 +93,13 @@
         void CompleteConstructL();
         
     private: // data
-        //<Qmail>
-        CIpsSosAOSmtpSendWatcher*   iSendWatcher;//owned
-        CIpsSosAOImapPopLogic*  iImapPopLogic;//owned
-        CMsvSession*            iSession;//owned
-        RArray<TInt>            iBufferedAOCommands;//owned
-		//</Qmail>
+        
+        CIpsSosAOSmtpSendWatcher*   iSendWatcher;
+        CIpsSosAOImapPopLogic*  iImapPopLogic;
+        CMsvSession*            iSession;
+        RArray<TInt>            iBufferedAOCommands;
+
 
     };
 
-#endif //IPSSOSAOPLUGINECOMINTERFACE_H
+#endif /*IPSSOSAOPLUGINECOMINTERFACE_H_*/