--- a/calendarui/controller/src/calencontroller.cpp	Thu May 27 12:51:15 2010 +0300
+++ b/calendarui/controller/src/calencontroller.cpp	Fri Jun 11 13:37:54 2010 +0300
@@ -57,9 +57,9 @@
     checkMultipleCreation();
     
     // Get an instance of AgendaUtil interface class
-    // This will take care of 
-    mAgendaUtil = new AgendaUtil();
-    
+    // This will take care of
+    mAgendaUtil = new AgendaUtil(this);
+
     iStateMachine = CCalenStateMachine::NewL( *this );
     
     // Create the notifier.
@@ -222,7 +222,12 @@
 CCalenController::~CCalenController()
     {
     TRACE_ENTRY_POINT;
-    
+
+    if(iStateMachine) {
+    	delete iStateMachine;
+    	iStateMachine = NULL;
+    }
+
     if ( iServices )
         {
         iServices->Release();
@@ -233,7 +238,12 @@
     	delete iNotifier;
     	iNotifier = NULL;
 		}
-    
+
+    if(mContext) {
+    	delete mContext;
+    	mContext = NULL;
+    }
+	
    if( iActionUi )
 	   {
 	   delete iActionUi;