diff --git a/ChangeLog b/ChangeLog
index 38dce4100..de84c7bb7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-08  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/MailerUI.js (onMenuEmptyTrashCallback):
+	refresh the folders tree if there're folders in the trash.
+
 2010-12-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreContext.m
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 7a659084e..d03c78519 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2236,8 +2236,18 @@ function onMenuEmptyTrash(event) {
 
 function onMenuEmptyTrashCallback(http) {
     if (http.readyState == 4
-        && isHttpStatus204(http.status))
+        && isHttpStatus204(http.status)) {
         deleteCachedMailboxByType('trash');
+        // Reload the folder tree if there was folders in the trash
+        var nodes = $("mailboxTree").select("DIV[datatype=trash]");
+        for (var i = 0; i < nodes.length; i++) {
+            var sibling = nodes[i].next();
+            if (sibling && sibling.hasClassName("clip")) {
+                initMailboxTree();
+                break;
+            }
+        }
+    }
     else
         showAlertDialog(http.callbackData);
 }