--- a/camerauis/cameraapp/generic/common/src/CamCaptureSetupListBoxModel.cpp	Wed Sep 01 12:30:54 2010 +0100
+++ b/camerauis/cameraapp/generic/common/src/CamCaptureSetupListBoxModel.cpp	Tue Sep 14 20:46:07 2010 +0300
@@ -225,6 +225,10 @@
         	{
         	iItemArray.AppendL( listItem );
         	}
+        else
+            {
+            delete listItem;
+            }
         
         CleanupStack::Pop( listItem );
         }    
@@ -238,7 +242,7 @@
 //
 void CCamCaptureSetupListBoxModel::ReadLayoutData( TRect aListBoxRect )
     {
-    if ( CamUtility::IsNhdDevice() )
+    if ( AknLayoutUtils::PenEnabled() )
         { 
         iIconLayoutData.LayoutRect( aListBoxRect, 
                           AknLayoutScalable_Apps::cset_list_set_pane_g3( 0 ) );