diff -r ace62b58f4b2 -r 9e077f9a342c idlefw/plugins/mcsplugin/settings/src/mcspluginsettings.cpp
--- a/idlefw/plugins/mcsplugin/settings/src/mcspluginsettings.cpp	Wed Jun 09 10:01:25 2010 +0300
+++ b/idlefw/plugins/mcsplugin/settings/src/mcspluginsettings.cpp	Mon Jun 21 16:00:38 2010 +0300
@@ -37,11 +37,6 @@
     AI_UID_ECOM_IMPLEMENTATION_SETTINGS_MCSPLUGIN
 };
 
-const TUid KUidAiFwCommon =
-{
-        AI_UID3_AIFW_COMMON
-};
-
 _LIT(KMCSSettingsResourceFileName, "mcspluginsettingsres.rsc");
 
 /** Implementation table for MCS settings plug-in */
@@ -148,17 +143,6 @@
         break;
 
     case EAknSoftkeyBack:
-        if (iAppUi->View(KGSMainViewUid))
-        {
-        // if we are in GS activate parent plugin view (standby view)...
-        iAppUi->ActivateLocalViewL(KGSPrslnPluginUid);
-        }
-        else
-        {
-            iAppUi->ActivateLocalViewL(iPrevViewId.iViewUid);
-        }
-        break;
-
     case EAknSoftkeyExit:
         iAppUi->HandleCommandL(EAknCmdExit);
         break;
@@ -176,21 +160,6 @@
 //
 void CMCSPluginSettings::DoActivateL(const TVwsViewId& aPrevViewId, TUid aCustomMessageId, const TDesC8& aCustomMessage)
     {
-    CEikButtonGroupContainer* cba = Cba();
-
-    if (cba)
-    {
-        if (aCustomMessageId == KUidAiFwCommon)
-        {
-            cba->SetCommandSetL(R_SCUT_SOFTKEYS_OPTIONS_EXIT_CHANGE);
-        }
-        else
-        {
-            cba->SetCommandSetL(R_SCUT_SOFTKEYS_OPTIONS_BACK_CHANGE);
-        }
-        cba->DrawDeferred();
-    }
-
     iModel->SetPluginIdL( aCustomMessage );
     iModel->UpdateAppListL( EFalse );
     iModel->UpdateBkmListL( EFalse );