--- a/pimappservices/calendar/server/src/agsfilemanager.cpp	Wed Sep 15 12:11:35 2010 +0300
+++ b/pimappservices/calendar/server/src/agsfilemanager.cpp	Wed Oct 13 14:30:35 2010 +0300
@@ -1239,11 +1239,14 @@
     fileName.Append(parser.NameAndExt());
     if(iIsFileDisabled)
         {
-        iAgnServer.AlarmServer().SetAlarmStatusForCalendarFile(fileName, EAlarmStatusDisabled); 
+        iAgnServer.AlarmServer().AlarmDeleteByCalendarFile(fileName, EAllAlarms);
         }
     else
         {
-        QueueAlarmsImmediately();
+    	if (iStore && iModel)
+    		{
+    		TRAP_IGNORE(iModel->QueueNextAlarmImmediatelyL());	
+    		}
         }
     
     User::LeaveIfError(iStore->Commit());