--- a/ipsservices/ipssosaoplugin/src/IpsSosAOMboxLogic.cpp	Mon Aug 23 23:32:31 2010 +0300
+++ b/ipsservices/ipssosaoplugin/src/IpsSosAOMboxLogic.cpp	Fri Sep 03 14:07:42 2010 +0300
@@ -146,7 +146,7 @@
             CalculateToNextIntervalL();
             break;
         case ECommandCancelDoNotDiconnect:
-            if ( iAgent->GetState() != CIpsSosAOBaseAgent::EStateCompleted ||
+            if ( iAgent->GetState() != CIpsSosAOBaseAgent::EStateCompleted &&
                     iAgent->GetState() != CIpsSosAOBaseAgent::EStateIdle  )
                 {
                 iAgent->CancelAllAndDoNotDisconnect();
@@ -452,15 +452,6 @@
 // ----------------------------------------------------------------------------
 // ----------------------------------------------------------------------------
 // 
-TInt CIpsSosAOMBoxLogic::GetCurrentError() const
-    {
-    FUNC_LOG;
-    return iError;
-    }
-
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
-// 
 TInt CIpsSosAOMBoxLogic::HandleTimerFiredL()
     {
     FUNC_LOG;
@@ -928,7 +919,7 @@
 	//<QMail>
     CIpsSosAOSettingsHandler* settings = NULL;
     TBool ret = EFalse;
-    TRAP_IGNORE(CIpsSosAOSettingsHandler::NewL(iSession, iMailboxId));
+    TRAP_IGNORE(settings = CIpsSosAOSettingsHandler::NewL(iSession, iMailboxId));
     if(settings){
         ret = settings->FirstEmnReceived();
         delete settings;