--- a/ipsservices/ipssosaoplugin/src/IpsSosAOPopAgent.cpp	Tue Jul 06 14:04:34 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOPopAgent.cpp	Wed Aug 18 09:37:47 2010 +0300
@@ -16,18 +16,7 @@
 *
 */
 
-
-
-#include "emailtrace.h"
-#include <cemailaccounts.h>
-#include <pop3cmds.h>
-#include <miutset.h>
-#include <popcmtm.h>
-#include <AlwaysOnlineManagerCommon.h>
-
-#include "IpsSosAOPopAgent.h"
-#include "IpsSosAOImapPopLogic.h"
-
+#include "ipssosaopluginheaders.h"
 
 // from settings
 //<QMail>
@@ -147,6 +136,7 @@
          case EStateFetchOnHold:
              break;
          case EStateDisconnect:
+             NM_COMMENT("CIpsSosAOPopAgent: disconnecting");
              if ( !iDoNotDisconnect )
                  {
                  CancelAllAndDisconnectL();
@@ -158,6 +148,7 @@
                  }
              break;
          case EStateCompleted:
+             NM_COMMENT("CIpsSosAOImapAgent: completed");
              TRAP_IGNORE( iOpResponse.OperationCompletedL( iError ) );
              SignalSyncCompleted( iServiceId, iError );
              ClearSignaledFlags();
@@ -270,6 +261,7 @@
     LoadSettingsL( );
     if ( !IsConnected() )
         {
+        NM_COMMENT("CIpsSosAOPopAgent: starting sync");
         TBuf8<1> dummy;
         // connect and synchronise starts background sync or idle
         iSelection->ResizeL(0);
@@ -282,6 +274,7 @@
         }
     else
         {
+        NM_COMMENT("CIpsSosAOPopAgent: already connected do not sync");
         iState = EStateCompleted;
         iError = KErrCancel;
         SetActiveAndCompleteThis();