--- a/camerauis/cameraapp/generic/src/CamSceneSettingContainer.cpp	Tue May 25 12:22:04 2010 +0300
+++ b/camerauis/cameraapp/generic/src/CamSceneSettingContainer.cpp	Wed Jun 09 09:21:41 2010 +0300
@@ -703,10 +703,10 @@
 //
 TInt CCamSceneSettingContainer::CountComponentControls() const
   {
-  TInt count = 0; // Return the number of controls inside this container    
+  TInt count = CCamContainerBase::CountComponentControls(); // Return the number of controls inside this container    
   if ( iScrollFrame )
     {
-    count = iScrollFrame->CountComponentControls();
+    count += iScrollFrame->CountComponentControls();
     }
   return count;
   }
@@ -718,14 +718,17 @@
 //
 CCoeControl* CCamSceneSettingContainer::ComponentControl( TInt aIndex ) const
   {
-  if ( iScrollFrame )
-    {
-    return iScrollFrame->ComponentControl( aIndex );
-    }
+  CCoeControl* control = NULL;
+  if( aIndex == 0 )
+      control = CCamContainerBase::ComponentControl( aIndex );
   else
-    {
-    return NULL;
-    }    
+      {
+      if ( iScrollFrame )
+          {
+          return iScrollFrame->ComponentControl( aIndex - 1 );
+          }
+      }
+  return control;
   }
 
 // ---------------------------------------------------------