--- a/activityfw/storage/server/src/afsession.cpp	Fri Aug 06 13:40:46 2010 +0300
+++ b/activityfw/storage/server/src/afsession.cpp	Wed Aug 18 10:39:24 2010 +0300
@@ -97,14 +97,22 @@
     case SaveActivity:
     case RemoveActivity:
     case RemoveApplicationActivities:
+        {
+        mStorage.InterruptCleanup();
         AfStorageSyncTask::ExecuteL(mTasksStorage, mStorage, message);
+        mStorage.RequestCleanup();
         break;
+        }
     
     case ApplicationActivity:
     case Activities:
     case ApplicationActivities:
+        {
+        TBool cleanupInterrupted = mStorage.InterruptCleanup();
         CAfStorageAsyncTask::ExecuteLD(*this, mStorage, message);
+        if (cleanupInterrupted) mStorage.RequestCleanup();
         break;
+        }
     
     case WaitActivity:
     case NotifyChange: