diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
index 918516b0c0b..48e1730dc83 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
@@ -588,21 +588,8 @@ function InitMessageMark()
 
 function UpdateJunkToolbarButton()
 {
-  try 
-  {
-    var junkButton = document.getElementById("button-junk");
-    if (SelectedMessagesAreJunk())
-    {
-      junkButton.label = junkButton.getAttribute('notjunk_label');
-      junkButton.setAttribute('tooltiptext', junkButton.getAttribute('notjunk_tooltiptext'));
-    }
-    else
-    {
-      junkButton.label = junkButton.getAttribute('junk_label');
-      junkButton.setAttribute('tooltiptext', junkButton.getAttribute('junk_tooltiptext'));
-    }
-  } 
-  catch(e) {}
+  var junkButtonDeck = document.getElementById("deck-junk");
+  junkButtonDeck.selectedIndex = SelectedMessagesAreJunk() ? 1 : 0;
 }
 
 function UpdateDeleteCommand()
diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
index 7aa13f2a5e7..51cbad2edc3 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.xul
@@ -1747,16 +1747,18 @@
         <menupopup/>
       </toolbarbutton>
       <toolbarbutton class="toolbarbutton-1" id="button-next" label="&nextButton.label;" oncommand="goDoCommand('button_next')" tooltiptext="&nextButton.tooltip;" observes="button_next"/>
+      
+      <deck id="deck-junk" oncommand="goDoCommand('button_junk')">
+        <toolbarbutton id="button-junk" class="toolbarbutton-1"
+                 label="&junkButton.label;"
+                 tooltiptext="&junkButton.tooltip;" 
+                 observes="button_junk"/>
 
-      <toolbarbutton class="toolbarbutton-1"
-               id="button-junk" label="&junkButton.label;"
-               tooltiptext="&junkButton.tooltip;" 
-               observes="button_junk"
-               oncommand="goDoCommand('button_junk')"
-               junk_label="&junkButton.label;"
-               junk_tooltiptext="&junkButton.tooltip;"
-               notjunk_label="&notJunkButton.label;"
-               notjunk_tooltiptext="&notJunkButton.tooltip;"/>
+        <toolbarbutton id="button-junk" class="toolbarbutton-1"
+                 label="&notJunkButton.label;"
+                 tooltiptext="&notJunkButton.tooltip;" 
+                 observes="button_junk"/>
+      </deck>
 
       <toolbarbutton class="toolbarbutton-1" id="button-delete" label="&deleteButton.label;" tooltiptext="&deleteButton.tooltip;" observes="button_delete" oncommand="goDoCommand('button_delete')"/> 
       <toolbarbutton type="menu-button" id="button-mark" class="toolbarbutton-1" label="&markButton.label;" hidden="true" oncommand="goDoCommand('button_mark')"