--- a/calendarui/views/src/calentodoview.cpp	Wed Sep 15 12:11:35 2010 +0300
+++ b/calendarui/views/src/calentodoview.cpp	Wed Oct 13 14:30:35 2010 +0300
@@ -584,7 +584,7 @@
                 {
                 if( Container()->MarkedCount() )
                     {
-                    aMenuPane->SetItemSpecific( ECalenDeleteCurrentEntry, EFalse );
+                    aMenuPane->SetItemSpecific( ECalenDeleteCurrentEntry, ETrue );
                     if(Container()->IsCurrentItemSelected()) // If focused list item is marked
                         {
                         aMenuPane->DeleteMenuItem( ECalenViewCurrentEntry );
@@ -593,30 +593,24 @@
                     aMenuPane->DeleteMenuItem( ECalenCompleteTodo );
                     aMenuPane->DeleteMenuItem( ECalenRestoreTodo );
                     aMenuPane->DeleteMenuItem( ECalenSend );
-
+                    aMenuPane->DeleteMenuItem(ECalenCopyToCalendars);
+                    
+                    TBool crossout( EFalse );
+                    //When mark as done, crossout is ETrue.
+                    crossout = CheckMarkedItemCompletedL();
+                    if( crossout )
+                        {
+                        aMenuPane->SetItemSpecific(ECalenMarkUnDone, ETrue);
+                        }
+                    else
+                        {
+                        aMenuPane->SetItemSpecific(ECalenMarkDone, ETrue);
+                        }
+                    
                     if(Container()->MarkedCount() == 1)
                         {
                         aMenuPane->DeleteMenuItem( ECalenCmdComplete );
-                        TBool crossout( EFalse );
-                        crossout = CheckMarkedItemCompletedL();
-                        if( crossout )
-                            {
-                            aMenuPane->DeleteMenuItem( ECalenMarkDone );
-                            }
-                        else
-                            {
-                            aMenuPane->DeleteMenuItem( ECalenMarkUnDone );
-                            }
                         }
-                    else
-                        {
-                        aMenuPane->DeleteMenuItem( ECalenMarkDone );
-                        aMenuPane->DeleteMenuItem( ECalenMarkUnDone );
-                        }
- 					if(Container()->MarkedCount() > 1)
- 					    {
-                        aMenuPane->DeleteMenuItem( ECalenCopyToCalendars );
- 					    }
                     }
                 else
                     {
@@ -735,14 +729,14 @@
 
     RedrawStatusPaneL(); // Set a text to title pane.
     
-    /*MCalenToolbar* toolbarImpl = iServices.ToolbarOrNull();
+    MCalenToolbar* toolbarImpl = iServices.ToolbarOrNull();
     if(toolbarImpl) 
         {
         CAknToolbar& toolbar = toolbarImpl->Toolbar();
 
         // dim clear and clear all toolbar buttons
         toolbar.SetItemDimmed(ECalenGotoToday,ETrue,ETrue);
-        }*/
+        }
     iEventViewCommandHandled = EFalse;
     
     TRACE_EXIT_POINT;
@@ -757,7 +751,7 @@
     {
     TRACE_ENTRY_POINT;
     
-    /*MCalenToolbar* toolbarImpl = iServices.ToolbarOrNull();
+    MCalenToolbar* toolbarImpl = iServices.ToolbarOrNull();
     if(toolbarImpl) 
         {
         CAknToolbar& toolbar = toolbarImpl->Toolbar();
@@ -767,7 +761,7 @@
             // dim clear and clear all toolbar buttons
             toolbar.SetItemDimmed(ECalenGotoToday,EFalse,ETrue);
             }
-        }*/
+        }
     
     // Remove all markings when the view is deactivated.
     static_cast< CCalenTodoContainer* > ( iContainer )->MarkAllL(