--- a/calendarui/controller/src/caleneditui.cpp	Tue Apr 27 16:36:22 2010 +0300
+++ b/calendarui/controller/src/caleneditui.cpp	Tue May 11 16:12:24 2010 +0300
@@ -521,7 +521,8 @@
     isEditorActive = EFalse;
     
     // Unhide the toolbar when settings is closed
-    if(toolbar)
+    TUid activeViewUid = iController.ViewManager().CurrentView();
+    if(toolbar && (activeViewUid != KUidCalenMissedAlarmsView ) &&(activeViewUid != KUidCalenMissedEventView ) )
         {
         toolbar->SetToolbarVisibilityL(ETrue); 
         }
@@ -556,7 +557,7 @@
                 {
                 // Show saved note for new entries
                 TInt res;
-                if( aEntry->EntryTypeL() == CCalEntry::ETodo )
+                if( context.InstanceId().iType == CCalEntry::ETodo )
                     {
                     res = R_QTN_CALE_NOTE_TODO_SAVED;
                     }