diff -r 6c2c2d3ab788 -r 857bebeecec0 fep/aknfep/src/AknFepManager.cpp
--- a/fep/aknfep/src/AknFepManager.cpp	Wed Jun 09 10:03:19 2010 +0300
+++ b/fep/aknfep/src/AknFepManager.cpp	Mon Jun 21 16:02:35 2010 +0300
@@ -132,6 +132,8 @@
 #include <aknCharMap.h>
 
 #include <AknFepInternalPSKeys.h>
+#include <e32property.h>
+#include <AknDef.h>
 
 const TInt KSelectItemSize(10);
 _LIT(KAknFepResourceFileName, "z:\\resource\\fep\\aknfep.rsc");
@@ -249,6 +251,9 @@
 
 LOCAL_C TInt RemapVietnameseAccentedCharacter(TUint16 aChr);
 
+static _LIT_SECURITY_POLICY_PASS( KAllowAllPolicy );
+static _LIT_SECURITY_POLICY_C1( KPowerMgmtPolicy, ECapabilityPowerMgmt );
+
 //
 // Class TTextDirectionalInfo
 //
@@ -442,6 +447,13 @@
     iHybridAplphaChangedToAlphanumeric = EFalse;
     iLastFocusedEditor = NULL;
     iFepAwareDialogParentEditor = NULL;
+	
+	RProperty::Define(
+            KPSUidAknFep, 
+            KAknFepSettingDialogState, 
+            RProperty::EInt, 
+            KAllowAllPolicy,  // None
+            KPowerMgmtPolicy ); 
     }
 
 void CAknFepManager::ConstructFullyL()
@@ -8858,7 +8870,7 @@
     TInt textQueryEditorFlag = 0;
     if ((aResourceId == R_AVKON_INSERT_WORD_QUERY ||
          aResourceId == R_AVKON_EDIT_WORD_QUERY ) &&
-        IsChineseInputLanguage())
+         FeatureManager::FeatureSupported( KFeatureIdChinese ))
     	{
 	    textQueryEditorFlag = EAknEditorFlagLatinInputModesOnly;
     	}