--- a/camerauis/cameraapp/generic/src/CamCaptureSetupViewBase.cpp	Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/src/CamCaptureSetupViewBase.cpp	Tue Sep 14 20:46:07 2010 +0300
@@ -68,6 +68,12 @@
       delete iInfoListBoxContainer;
       }        
     }
+
+  
+  if( iCaptureSetupControlHandler )
+      {
+      delete iCaptureSetupControlHandler;
+      }
   PRINT( _L("Camera <= ~CCamCaptureSetupViewBase") );
   }
 
@@ -553,7 +559,7 @@
     CCamAppUiBase* appUi = static_cast<CCamAppUiBase*>( AppUi() );
 
     TRect rect = appUi->ApplicationRect();
-    if ( !CamUtility::IsNhdDevice() ) 
+    if ( !AknLayoutUtils::PenEnabled() ) 
         {
         // Space for visible statuspane for non-touch device
         AknLayoutUtils::LayoutMetricsRect( AknLayoutUtils::EMainPane, rect );