--- a/browserui/browser/FeedsSrc/FeedsFolderView.cpp	Thu Aug 27 07:42:55 2009 +0300
+++ b/browserui/browser/FeedsSrc/FeedsFolderView.cpp	Thu Sep 24 12:40:29 2009 +0300
@@ -470,7 +470,11 @@
             }
         
         // Mark All
-        iApiProvider.FeedsClientUtilities().AddItemL(*aMenuPane, EAknMarkAll, R_OPTIONS_LIST_MARK_ALL);        
+        if (  iContainer && iContainer->iCurrentFolder &&
+                        iContainer->iCurrentFolder->GetChildren().Count() != iContainer->MarkedItems()->Count() )
+            {
+            iApiProvider.FeedsClientUtilities().AddItemL(*aMenuPane, EAknMarkAll, R_OPTIONS_LIST_MARK_ALL);
+            }
         
         // Unmark ALL
         if (AnyMarkedItems())
@@ -484,7 +488,14 @@
         
         }
     else if(aResourceId == R_FEEDS_FOLDER_MENU_PANE_CONTEXT_MENU) 
-        {
+            {
+            // move
+            if ( iContainer &&
+                    iContainer->iCurrentFolder &&
+                       iContainer->iCurrentFolder->GetChildren().Count() < 2 )
+                 {
+                    aMenuPane->SetItemDimmed(EFeedsMove,ETrue);
+                 }
             aMenuPane->SetItemDimmed(EFeedsMoveToFolder,ETrue);
 
             if (!(item->GetType() == EFolder))
@@ -497,7 +508,11 @@
                     aMenuPane->SetItemDimmed(EFeedsMoveToFolder,EFalse);
                     }            
                 }
-        }
+            else
+            	{
+            	aMenuPane->SetItemDimmed(EFeedsUpdate, ETrue);
+            	}
+            }
     iApiProvider.FeedsClientUtilities().DynInitMenuPaneL(aResourceId, aMenuPane );
     }