--- a/calendarui/views/src/calenmissedalarmsview.cpp	Tue Apr 27 16:36:22 2010 +0300
+++ b/calendarui/views/src/calenmissedalarmsview.cpp	Tue May 11 16:12:24 2010 +0300
@@ -133,11 +133,15 @@
                 
                 RedrawStatusPaneL();
                 UpdateCbaL();
+                
+                //no tool bar in missed alarms view
+                MCalenToolbar* toolbar = iServices.ToolbarOrNull();
+	       	    if(toolbar && toolbar->IsVisible())
+	       	        {
+                    toolbar->SetToolbarVisibilityL(EFalse);  
+	       	        } 
+	       	    nextStep = CCalenView::EDone;
 	       	    }
-       	    
-       	 
-
-        	nextStep = CCalenView::EDone;
         	}
         	break;	
         }
@@ -241,34 +245,20 @@
             break;
         case ECalenCmdGotoCalendar:            
             {
-            MCalenToolbar* toolbar = iServices.ToolbarOrNull(); 
-            if(toolbar)
-             {
-             toolbar->SetToolbarVisibilityL(ETrue);  
-             } 
             iHighlightedRowNumber = 0;
-            iServices.IssueCommandL(aCommand);
+			iServices.IssueCommandL(aCommand);
             }
             break;
         case EAknSoftkeyBack:
         case EAknSoftkeyClose:
             {
-            MCalenToolbar* toolbar = iServices.ToolbarOrNull(); 
-            if(toolbar)
-             {
-             toolbar->SetToolbarVisibilityL(ETrue);  
-             } 
             iHighlightedRowNumber = 0;
-            iServices.IssueNotificationL(ECalenNotifyMissedAlarmViewClosed);
-            }
+			iServices.IssueNotificationL(ECalenNotifyMissedAlarmViewClosed);
+			}
             break;
         case EAknSoftkeyExit:
             {
-            MCalenToolbar* toolbar = iServices.ToolbarOrNull(); 
-            if(toolbar)
-             {
-             toolbar->SetToolbarVisibilityL(ETrue);  
-             } 
+         
             CCalenNativeView::HandleCommandL(aCommand);
             }
             break;
@@ -315,13 +305,7 @@
     
     UpdateCbaL();
     
-    // Hide the toolbar.
-    MCalenToolbar* toolbar = iServices.ToolbarOrNull();
-    if(toolbar)
-        {
-        toolbar->SetToolbarVisibilityL(EFalse);  
-        }  
-    
+   
     TRACE_EXIT_POINT;
     }
 
@@ -333,6 +317,11 @@
 void CCalenMissedAlarmsView::DoDeactivateImpl()
     {
     TRACE_ENTRY_POINT;
+    MCalenToolbar* toolbar = iServices.ToolbarOrNull();
+    if(toolbar)
+        {
+        toolbar->SetToolbarVisibilityL(ETrue);  
+        } 
     
     TRACE_EXIT_POINT;
     }