diff --git a/ChangeLog b/ChangeLog
index 2fc56fa93..5cf2b767f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-08-19  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/MailerUI.js (onMenuEmptyTrash): delete the
+	cache of the trash mailbox when called.
+
 2010-08-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Mailer/SOGoMailFolder.m (-deleteUIDs:inContext:): make
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 2590e87a1..ed8177e58 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -401,6 +401,7 @@ function deleteSelectedMessagesCallback(http) {
                     }
                     Mailer.dataTable.remove(data["id"][i]);
                     Mailer.dataTable.render();
+                    deleteCachedMailboxByType("trash");
                 }
                 else {
                     Mailer.dataTable.remove(data["id"][i]);
@@ -662,8 +663,8 @@ function openMailbox(mailbox, reload) {
             Mailer.dataSources.set(key, dataSource);
             getUnseenCountForFolder(mailbox);
         }
-        Mailer.dataTable.setSource(dataSource);
         messageList.deselectAll();
+        Mailer.dataTable.setSource(dataSource);
         Mailer.dataTable.render();
         configureDraggables();
         Mailer.currentMailbox = mailbox;
@@ -2062,13 +2063,13 @@ function onMenuEmptyTrash(event) {
     var folderID = document.menuTarget.getAttribute("dataname");
     var urlstr = URLForFolderID(folderID) + "/emptyTrash";
     var errorLabel = _("The trash could not be emptied.");
+    deleteCachedMailboxByType("trash");
     triggerAjaxRequest(urlstr, folderOperationCallback, errorLabel);
 
     if (folderID == Mailer.currentMailbox) {
         var div = $('messageContent');
         for (var i = div.childNodes.length - 1; i > -1; i--)
             div.removeChild(div.childNodes[i]);
-        refreshCurrentFolder();
     }
     var msgID = Mailer.currentMessages[folderID];
     if (msgID)