--- a/calendarui/controller/src/calenactionui.cpp	Tue Apr 27 16:36:22 2010 +0300
+++ b/calendarui/controller/src/calenactionui.cpp	Tue May 11 16:12:24 2010 +0300
@@ -37,6 +37,8 @@
 #include "calennotifier.h"
 #include "calenmultipledbui.h"
 #include "calenattachmentui.h"
+#include "CalenUid.h"
+#include "calenviewmanager.h"
 
 // ----------------------------------------------------------------------------
 // CCalenActionUi::NewL
@@ -304,8 +306,9 @@
         PIM_TRAPD_HANDLE( retValue = dlg->ExecuteLD( R_CALEN_MULTIPLEDB_DIALOG ) );
         notifier.ResumeSettingsNotifications();
         
-        // Unhide the toolbar when settings is closed
-        if(toolbar)
+        // Unhide the toolbar when manage calendar view is closed
+        TUid activeViewUid = iController.ViewManager().CurrentView();
+        if(toolbar && (activeViewUid != KUidCalenMissedAlarmsView ) &&(activeViewUid != KUidCalenMissedEventView ) )
             {
             toolbar->SetToolbarVisibilityL(ETrue); 
             }
@@ -414,7 +417,8 @@
     notifier.ResumeSettingsNotifications();
     
     // Unhide the toolbar when settings is closed
-    if(toolbar)
+    TUid activeViewUid = iController.ViewManager().CurrentView();
+    if(toolbar && (activeViewUid != KUidCalenMissedAlarmsView ) &&(activeViewUid != KUidCalenMissedEventView ) )
         {
         toolbar->SetToolbarVisibilityL(ETrue); 
         }