--- a/mail/base/content/mail3PaneWindowCommands.js
+++ b/mail/base/content/mail3PaneWindowCommands.js
@@ -317,20 +317,19 @@ var DefaultController =
             whichText = "valueSelection";
           goSetMenuValue(command, whichText);
           goSetAccessKey(command, whichText + "AccessKey");
         }
         if (GetNumSelectedMessages() > 0)
         {
           if (!gFolderDisplay.getCommandStatus(nsMsgViewCommandType.cmdRequiringMsgBody))
             return false;
-          if (command == "cmd_reply" || command == "button_reply")
+          if (command == "cmd_reply" || command == "button_reply" ||
+              command == "cmd_replyall" ||command == "button_replyall")
             return IsReplyEnabled();
-          if (command == "cmd_replyall" || command == "button_replyall")
-            return IsReplyAllEnabled();
           if (command == "cmd_replylist" || command == "button_replylist")
             return IsReplyListEnabled();
           return true;
         }
         return false;
       case "cmd_printpreview":
         if (GetNumSelectedMessages() == 1)
           return gFolderDisplay.getCommandStatus(nsMsgViewCommandType.cmdRequiringMsgBody);

--- a/mail/base/content/messageWindow.js
+++ b/mail/base/content/messageWindow.js
@@ -764,20 +764,19 @@ var MessageWindowController =
         return (!gFolderDisplay.view.isNewsFolder);
       case "button_archive":
         var folder = gFolderDisplay.displayedFolder;
         return folder &&
           !(IsSpecialFolder(folder, Components.interfaces.nsMsgFolderFlags.Archive,
                             true));
       case "cmd_reply":
       case "button_reply":
-        return gFolderDisplay.selectedMessage && IsReplyEnabled();
       case "cmd_replyall":
       case "button_replyall":
-        return gFolderDisplay.selectedMessage && IsReplyAllEnabled();
+        return gFolderDisplay.selectedMessage && IsReplyEnabled();
       case "cmd_replylist":
       case "button_replylist":
         return gFolderDisplay.selectedMessage && IsReplyListEnabled();
       case "cmd_archive":
       case "cmd_replySender":
       case "cmd_replyGroup":
       case "cmd_forward":
       case "button_forward":