diff --git a/UI/WebServerResources/js/Mailer/MailboxesController.js b/UI/WebServerResources/js/Mailer/MailboxesController.js
index e417be4bf..6093a7b12 100644
--- a/UI/WebServerResources/js/Mailer/MailboxesController.js
+++ b/UI/WebServerResources/js/Mailer/MailboxesController.js
@@ -138,7 +138,10 @@
 
     function emptyTrashFolder(folder) {
       folder.$emptyTrash().then(function() {
-        // Success
+        // Success - remove all messages from the mailbox
+        folder.$messages = [];
+        folder.uidsMap = {};
+        folder.unseenCount = 0;
       }, function(error) {
         Dialog.alert(l('Warning'), error);
       });