diff --git a/ChangeLog b/ChangeLog
index 394aa68cf..1d20a5434 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-20  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/MailerUI.js (onMenuEmptyTrashCallback):
+	reset the unseen count when emptying the trash folder.
+
 2011-06-17  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/SOGoTimePicker.js (onChange): the
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index b549557c8..8d843915b 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2355,18 +2355,22 @@ function onMenuEmptyTrashCallback(http) {
         var reloaded = false;
         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();
-                reloaded = true;
-                break;
+            if (http.callbackData.mailbox == nodes[i].readAttribute('dataname')) {
+                // Reset the unread message count
+                updateUnseenCount(nodes[i], 0);
+                var sibling = nodes[i].next();
+                if (sibling && sibling.hasClassName("clip")) {
+                    initMailboxTree();
+                    reloaded = true;
+                    break;
+                }
             }
         }
         if (!reloaded) {
             var data = http.responseText.evalJSON(true);
             // We currently only show the quota for the first account (0).
             if (data.quotas && http.callbackData.mailbox.startsWith('/0/'))
-                updateQuotas(data.quotas);
+                updateQuotas(data.quotas);            
         }
     }
     else