--- a/calendarui/controller/src/calenviewmanager.cpp	Tue May 25 12:41:10 2010 +0300
+++ b/calendarui/controller/src/calenviewmanager.cpp	Wed Jun 09 09:40:23 2010 +0300
@@ -578,6 +578,14 @@
             RequestActivationL( KUidCalenDayView, KUidCalenShowBackCba );
             }
             break;
+        case ECalenForwardsToWeekView:
+            {
+            // set the view iPreviousToWeekView to handle the week view's cba
+            // From month view -> week view 
+            iPreviousToWeekView = iCurrentViewId;
+            RequestActivationL( KUidCalenWeekView, KUidCalenShowBackCba );
+            }
+            break;
         case ECalenNextView:
             {
             CycleNextViewL();
@@ -1102,6 +1110,10 @@
 			    
 			    ReloadAllPluginsL();
 			    }
+            else
+                {
+                iAvoidRepopulation = EFalse;
+                }
         	}
         	break;
         case ECalenNotifyDayViewClosed:
@@ -1114,6 +1126,16 @@
                 }
             }
             break;
+        case ECalenNotifyWeekViewClosed:
+            {
+            if(iPreviousToWeekView.iViewUid!= KNullUid)
+                {
+                // activate the previous view from where day view is launched
+                // From month/week view -> day view
+                RequestActivationL(iPreviousToWeekView.iViewUid);
+                }
+            }
+            break;
         case ECalenNotifyAppBackgrounded:
             {
             // set the flag iAvoidRepopulation to prevent repopulation