--- a/ipsservices/ipssosplugin/src/ipsplgsosbaseplugin.cpp	Wed Sep 15 17:47:19 2010 +0300
+++ b/ipsservices/ipssosplugin/src/ipsplgsosbaseplugin.cpp	Thu Sep 30 11:43:07 2010 +0300
@@ -556,7 +556,8 @@
 // ---------------------------------------------------------------------------
 void CIpsPlgSosBasePlugin::GoOnlineL( const TFSMailMsgId& aMailBoxId )
     {
-    if ( !ConnOpRunning( aMailBoxId) )
+    if ( iSyncStateHandler->GetCurrentSyncState(
+            aMailBoxId) == Idle)
         {
         // append mailbox id go online mailbox array
         RefreshNowL( aMailBoxId, *this, 0 );
@@ -2498,4 +2499,11 @@
             }
         }
     }
+// <qmail>
+// ---------------------------------------------------------------------------
+// ---------------------------------------------------------------------------
+TUid CIpsPlgSosBasePlugin::Id( ) const
+    {
+    return TUid::Uid( PluginId() );
+    }
 // </qmail>