Index: web/src/main/java/com/xpn/xwiki/watch/client/Watch.java
===================================================================
--- web/src/main/java/com/xpn/xwiki/watch/client/Watch.java	(revision 5567)
+++ web/src/main/java/com/xpn/xwiki/watch/client/Watch.java	(working copy)
@@ -250,6 +250,8 @@
      */
     public void refreshArticleList() {
         userInterface.refreshData("articlelist");
+        //refresh article number which will refresh the feedtree as well.
+        config.refreshArticleNumber();
         newArticlesMonitoring.stopBlinking();
     }
 
Index: web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/FeedTreeWidget.java
===================================================================
--- web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/FeedTreeWidget.java	(revision 5567)
+++ web/src/main/java/com/xpn/xwiki/watch/client/ui/menu/FeedTreeWidget.java	(working copy)
@@ -85,6 +85,18 @@
     }
 
     private void  makeFeedTree() {
+        //get the state of the tree items on first level -> the groups tree items
+        HashMap itemsState = new HashMap();
+        for (int i = 0; i < this.groupTree.getItemCount(); i++) {
+            TreeItem currentTreeItem = this.groupTree.getItem(i);
+            itemsState.put(currentTreeItem.getUserObject(), new Boolean(currentTreeItem.getState()));
+        }
+        //get the selected item to set it back when the tree is refreshed 
+        TreeItem selectedTreeItem = this.groupTree.getSelectedItem();
+        Object selectedItemObject = null;
+        if (selectedTreeItem != null) {
+            selectedItemObject = selectedTreeItem.getUserObject();
+        }
         // clear all trees
         groupTree.clear();
 
@@ -103,6 +115,13 @@
             if ((groupname!=null)&&(!groupname.trim().equals(""))) {
                 Map group = (Map) feedsbygroup.get(groupname);
                 TreeItem groupItemTree = new TreeItem();
+                //set a key to the tree item, to test its state afterwards
+                groupItemTree.setUserObject(groupname);
+                //check if selected
+                if (selectedItemObject != null && groupname.equals(selectedItemObject)) {
+                    //set this as the selected item
+                    selectedTreeItem = groupItemTree;
+                }
                 Hyperlink link = new Hyperlink(groupTitle, "");
                 link.setStyleName(watch.getStyleName("feedtree","link"));
                 link.addClickListener(new ClickListener() {
@@ -118,11 +137,25 @@
                 while (feedgroupit.hasNext()) {
                     String feedname = (String) feedgroupit.next();
                     Feed feed = (Feed) group.get(feedname);
-                    addFeedToTree(groupItemTree, feed);
+                    TreeItem feedItem = addFeedToTree(groupItemTree, feed);
+                    //set it's userObject to the name of the group + name of the feed since a 
+                    //feed can be part of multiple groups and we need to identify it uniquely.
+                    String itemTreeKey = groupname + "." + feedname;
+                    feedItem.setUserObject(itemTreeKey);
+                    if (selectedItemObject != null && itemTreeKey.equals(selectedItemObject)) {
+                        selectedTreeItem = feedItem;                        
+                    }
                 }
+                //expand it if necessary
+                Boolean state = (Boolean)itemsState.get(groupname);
+                if (state != null) {
+                    groupItemTree.setState(state.booleanValue());
+                }
                 groupTree.addItem(groupItemTree);
             }
         }
+        //set the selected tree item
+        this.groupTree.setSelectedItem(selectedTreeItem);
     }
 
     /*
@@ -145,7 +178,7 @@
         return watch.getFavIcon(feed);
     }
 
-    private void addFeedToTree(TreeItem treeItem, final Feed feed) {
+    private TreeItem addFeedToTree(TreeItem treeItem, final Feed feed) {
 
         String feedtitle =  feed.getName() + "(" + feed.getNb() + ")";
         String imgurl = getFavIcon(feed);     
@@ -153,7 +186,7 @@
          feedtitle = "<img src=\"" + imgurl + "\" class=\"" + watch.getStyleName("feedtree","logo-icon") + "\" alt=\"\" />" + feedtitle;
         Hyperlink link = new DoubleClickHyperlink(feed, feedtitle, true, "");
         link.setStyleName(watch.getStyleName("feedtree","link"));
-        treeItem.addItem(link);
+        return treeItem.addItem(link);
     }
 
 
