--- a/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp	Wed Mar 31 21:35:49 2010 +0300
+++ b/browserui/browser/FeedsSrc/FeedsFolderContainer.cpp	Wed Apr 14 16:00:33 2010 +0300
@@ -2043,7 +2043,11 @@
 
     if (iMoveActive)
         {
+#ifndef BRDO_SINGLE_CLICK_ENABLED_FF
         commandSet = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
+#else        
+        commandSet = R_AVKON_SOFTKEYS_CANCEL;
+#endif        
         }
 
     iView->UpdateCbaL(commandSet);
@@ -2182,7 +2186,9 @@
 //
 void CFeedsFolderContainer::DimToolbar(TBool aDim)
 {
-    iView->Toolbar()->SetDimmed(aDim);
+    iView->Toolbar()->SetItemDimmed(EFeedsNewFeed, aDim, ETrue);
+    iView->Toolbar()->SetItemDimmed(EFeedsUpdateAll, aDim, ETrue);
+    iView->Toolbar()->SetItemDimmed(EWmlCmdPreferences, aDim, ETrue);
     iView->Toolbar()->DrawNow();
 }
 
@@ -2274,3 +2280,4 @@
     naviPane->PushL(*iNaviDecorator);
     }
 
+