--- a/ipsservices/ipssosplugin/inc/ipsplgsosbaseplugin.hrh	Tue Aug 31 15:04:17 2010 +0300
+++ b/ipsservices/ipssosplugin/inc/ipsplgsosbaseplugin.hrh	Wed Sep 01 12:28:57 2010 +0100
@@ -15,13 +15,9 @@
 *
 */
 
-
 #ifndef IPSSOSPLUGIN_HRH_
 #define IPSSOSPLUGIN_HRH_
 
-#define RD_101_EMAIL
-
-
 #define IPSSOSPLUGIN_DLL_UID                 0x2000E53D
 #define IPSSOSIMAP4PLUGIN_IMPLEMENTATION_UID 0x2000E53F
 #define IPSSOSPOP3PLUGIN_IMPLEMENTATION_UID  0x2000E53E
@@ -34,10 +30,9 @@
 #undef RD_IPS_AO_PLUGIN
 // </cmail>
 
-// <qmail>
-//this needs to be the same as application id (nmailui)
-#define IPS_PROPERTY_CAT_UID                 0x200255BA
-// </qmail>
+// <cmail> S60 UID update
+#define IPS_PROPERTY_CAT_UID                 0x2001E277
+// </cmail> S60 UID update
 
 #define IPS_EXTENDED_SETTINGS_UID            0x102071F1
 // <cmail> S60 UID update
@@ -60,8 +55,8 @@
     EIPSSosSettingsChanged,
     KIPSSosSmtpSendStartedSignal,
     KIPSSosSmtpSendEndedSignal,
-    KIPSSosSmtpEmptyOutboxNow
-// <qmail> EIPSSosSmtpPswErr removed
+    KIPSSosSmtpEmptyOutboxNow,
+    EIPSSosSmtpPswErr
     };
 
 enum TIpsOpType
@@ -71,19 +66,6 @@
     EIpsOpTypePop3SyncOp,
     EIpsOpTypeOnlineOp,
     EIpsOpTypeImap4PopulateOp,
-    EIpsOpTypeSmtp,
-// <qmail> new op types
-    EIpsOpTypeImap4Disconnect,
-    EIpsOpTypePop3Disconnect,
-    EIpsOpTypeFetchAttachmentOp,
-    EIpsOpTypeMoveRemoteOp,
-    EIpsOpTypePop3FetchOp,
-    EIpsOpTypeConnectAndRefreshFolderListOp,
-    EIpsOpTypeCreateMessageOp,
-    EIpsOpTypeMailStorerOp,
-    EIpsOpTypeMessagePartStorerOp,
-    EIpsOpTypeNewChildPartFromFile,
-    EIpsOpTypeRemoveChildPart
-// </qmail>
+    EIpsOpTypePop3PopulateOp
     };
 #endif /*IPSSOSPLUGIN_HRH_*/