diff -r 8b2d6d0384b0 -r dbec5787fa68 camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamPhotoSettingsList.cpp
--- a/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamPhotoSettingsList.cpp	Tue Feb 02 00:01:39 2010 +0200
+++ b/camerauis/cameraapp/generic/GsCamcorderPlugin/src/GSCamPhotoSettingsList.cpp	Fri Feb 19 22:36:31 2010 +0200
@@ -88,16 +88,13 @@
     if ( iModel.UiConfigManagerPtr() &&
          iModel.UiConfigManagerPtr()->IsLocationSupported() )
         {
-        resId =  R_CAM_PHOTO_SETTINGS_WITH_LOCATION_ITEM_LIST_CAMCORDER;
+        resId =  iLaunchedFromGS?R_CAM_PHOTO_GSSETTINGS_WITH_LOCATION_ITEM_LIST_CAMCORDER:
+                                 R_CAM_PHOTO_SETTINGS_WITH_LOCATION_ITEM_LIST_CAMCORDER;
         }
     else
         {
-        resId =  R_CAM_PHOTO_SETTINGS_ITEM_LIST_CAMCORDER;
-        }
-
-    if ( iSecondaryCameraSettings )
-        {
-        resId =  R_CAM_VIDEO_SETTINGS_ITEM_LIST_PORTRAIT;
+        resId =  iLaunchedFromGS?R_CAM_PHOTO_GSSETTINGS_ITEM_LIST_CAMCORDER:
+                                 R_CAM_PHOTO_SETTINGS_ITEM_LIST_CAMCORDER;
         }
     
     if ( iSecondaryCameraSettings )