--- a/emailuis/emailui/src/freestyleemailuimailboxdeleter.cpp	Thu Jul 15 18:19:25 2010 +0300
+++ b/emailuis/emailui/src/freestyleemailuimailboxdeleter.cpp	Thu Aug 19 09:38:05 2010 +0300
@@ -300,7 +300,7 @@
     
     // Start wait note.
     iWaitDialog = new ( ELeave ) CAknWaitDialog(
-        ( REINTERPRET_CAST( CEikDialog**, &iWaitDialog ) ), EFalse );
+        ( REINTERPRET_CAST( CEikDialog**, &iWaitDialog ) ), ETrue );
     iWaitDialog->PrepareLC( R_FS_WAIT_NOTE_REMOVING_MAILBOX );
     iWaitDialog->SetCallback( this );
     iWaitDialog->RunLD();
@@ -463,24 +463,21 @@
         case TFSProgress::EFSStatus_RequestComplete:
         case TFSProgress::EFSStatus_RequestCancelled:
             {
-            if( aRequestId == iMailboxDeleteOperationId )
-                {
-                if( iMailboxesToDelete.Count() > 0 )
+            if( iMailboxesToDelete.Count() > 0 )
+            	{
+                // Delete next mailbox in queue.
+                iIdle->Cancel();
+                iIdle->Start(TCallBack(IdleCallbackL,this));
+            	}
+            else
+            	{
+                if( iWaitDialog )
                     {
-                    // Delete next mailbox in queue.
-            	    iIdle->Cancel();
-            		iIdle->Start(TCallBack(IdleCallbackL,this));
+                    iWaitDialog->ProcessFinishedL();
                     }
-                else
-                    {
-                    if( iWaitDialog )
-                        {
-                        iWaitDialog->ProcessFinishedL();
-                        }
-                    // Notify observer that the deletion is complete. 
-                    iObserver.MailboxDeletionComplete();
-                    }
-                }            
+                // Notify observer that the deletion is complete. 
+                iObserver.MailboxDeletionComplete();
+            	}          
             break;
             }
         default: