--- a/camerauis/cameraapp/generic/common/src/CamCaptureSetupListBoxModel.cpp	Wed Sep 15 11:51:19 2010 +0300
+++ b/camerauis/cameraapp/generic/common/src/CamCaptureSetupListBoxModel.cpp	Wed Oct 13 14:09:54 2010 +0300
@@ -225,10 +225,6 @@
         	{
         	iItemArray.AppendL( listItem );
         	}
-        else
-            {
-            delete listItem;
-            }
         
         CleanupStack::Pop( listItem );
         }    
@@ -242,7 +238,7 @@
 //
 void CCamCaptureSetupListBoxModel::ReadLayoutData( TRect aListBoxRect )
     {
-    if ( AknLayoutUtils::PenEnabled() )
+    if ( CamUtility::IsNhdDevice() )
         { 
         iIconLayoutData.LayoutRect( aListBoxRect, 
                           AknLayoutScalable_Apps::cset_list_set_pane_g3( 0 ) );