--- a/calendarui/controller/src/calentoolbarimpl.cpp	Sun Jun 20 22:50:42 2010 +0200
+++ b/calendarui/controller/src/calentoolbarimpl.cpp	Sun Jun 20 22:55:39 2010 +0200
@@ -390,7 +390,7 @@
     
     ResetToolbarExtensionCommandsL();
     // add toolbar items for native views
-    for(TInt index = viewPositionArray.Count()-1;index >= KPositionZero ;index--)
+    for(TInt index = KPositionZero ;index < viewPositionArray.Count()  ;index++)
         {
         viewPosition = viewInfoArray.Find( viewPositionArray[index],
                                 CCalenViewInfo::ViewInfoIdentifier );
@@ -449,12 +449,13 @@
     TInt currViewInfoPos = aViewInfoArray.Find( aCurrentViewUid , 
                                          CCalenViewInfo::ViewInfoIdentifier );
     
-    TInt index = currViewInfoPos + 1;
-    while( index!= currViewInfoPos )
+    TInt index = aViewInfoArray.Find( KUidCalenMonthView ,  CCalenViewInfo::ViewInfoIdentifier );
+    
+    while( index!= aViewInfoArray.Count() )
         {
-        if( index == aViewInfoArray.Count()) // If last item,
+        if( index == currViewInfoPos) // If last item,
             {
-            index = 0;
+            index ++;
             continue;
             }
         if(( aViewInfoArray[index]->CyclePosition() != CCalenView::ENoCyclePosition ) )