diff --git a/ChangeLog b/ChangeLog
index 00f6aed10..bfb762f19 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-08-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/MailerUIdTree.js:
+	(MailerUIdTreeExtension._addFolderNode): no longer set a SPAN
+	arroung the unseen count.
+	(MailerUIdTreeExtension.getMailboxNode): new method returning the
+	DIV.dTreeNode corresponding to the mailbox name passed as
+	parameter.
+
 	* UI/WebServerResources/UIxPreferences.js: (_setupEvents): no
 	longer take any parameter, which simplifies the method, as
 	removing the "change" observers on input field is not useful.
diff --git a/UI/WebServerResources/MailerUIdTree.js b/UI/WebServerResources/MailerUIdTree.js
index 77e50f3bb..3cfcfc9f4 100644
--- a/UI/WebServerResources/MailerUIdTree.js
+++ b/UI/WebServerResources/MailerUIdTree.js
@@ -21,7 +21,7 @@ var MailerUIdTreeExtension = {
             displayName = name;
         if (typeof unseen != "undefined") {
             hasUnseen = true;
-            displayName += "<span id=\"unseenCount\"> (<span>" + parseInt(unseen) + "</span>)</span>";
+            displayName += " <span class=\"unseenCount\">(" + parseInt(unseen) + ")</span>";
         }
         this.add(this.elementCounter, parent, displayName, 1, '#', fullName,
                  type, '', '', icon, icon, hasUnseen);
@@ -58,6 +58,17 @@ var MailerUIdTreeExtension = {
     },
     autoSync: function() {
         this.config.useCookies = true;
+    },
+    getMailboxNode: function(mailbox) {
+        var childNode = null;
+        for (var i = 0; !childNode &&  i < this.aNodes.length; i++) {
+            var aNode = this.aNodes[i];
+            if (aNode.dataname == mailbox) {
+                childNode = $("tgmailboxTree" + aNode.id);
+            }
+        }
+
+        return ((childNode) ? childNode.parentNode : null);
     }
 };