diff --git a/mozilla/mail/base/content/mailWindowOverlay.js b/mozilla/mail/base/content/mailWindowOverlay.js
index 9786d09b120..ee8f7c24c2f 100644
--- a/mozilla/mail/base/content/mailWindowOverlay.js
+++ b/mozilla/mail/base/content/mailWindowOverlay.js
@@ -2003,14 +2003,13 @@ function HandleJunkStatusChanged(folder)
   var loadedMessage = GetLoadedMessage();
   if (loadedMessage && (!(/type=x-message-display/.test(loadedMessage))) && IsCurrentLoadedFolder(folder))
   {
-    var messageURI = GetLoadedMessage();
     // if multiple message are selected
     // and we change the junk status
     // we don't want to show the junk bar
     // (since the message pane is blank)
-    if (messageURI && (GetNumSelectedMessages() == 1))
+    if (GetNumSelectedMessages() == 1)
     {
-      var msgHdr = messenger.messageServiceFromURI(messageURI).messageURIToMsgHdr(messageURI);
+      var msgHdr = messenger.messageServiceFromURI(loadedMessage).messageURIToMsgHdr(loadedMessage);
 
       if (msgHdr)
       {
@@ -2065,8 +2064,7 @@ function SetUpJunkBar(aMsgHdr)
  
   goUpdateCommand('button_junk');
 
-  // simulate XOR
-  return (isJunk && isAlreadyCollapsed) || (!isJunk && !junkBar);
+  return (isJunk && isAlreadyCollapsed) || (!isJunk && !isAlreadyCollapsed);
 }
 
 function MarkCurrentMessageAsRead()