diff --git a/ChangeLog b/ChangeLog
index 1d20a5434..b2724257c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,8 @@
 2011-06-20  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/MailerUI.js (onMenuEmptyTrashCallback):
-	reset the unseen count when emptying the trash folder.
+	when emptying the trash folder, reset the unseen count and reset
+	the reference to the last selected message.
 
 2011-06-17  Francis Lachapelle  <flachapelle@inverse.ca>
 
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 8d843915b..75b811e20 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -912,9 +912,8 @@ function unseenCountCallback(http) {
         document.unseenCountAjaxRequest = null;
         var data = http.responseText.evalJSON(true);
         var node = mailboxTree.getMailboxNode(http.callbackData);
-        if (node) {
+        if (node)
             updateUnseenCount(node, data.unseen, false);
-        }
     }
 }
 
@@ -2343,8 +2342,10 @@ function onMenuEmptyTrash(event) {
         $('messageContent').innerHTML = '';
     }
     var msgID = Mailer.currentMessages[folderID];
-    if (msgID)
+    if (msgID) {
+        delete Mailer.currentMessages[folderID];
         deleteCachedMessage(folderID + "/" + msgID);
+    }
 }
 
 function onMenuEmptyTrashCallback(http) {