Bug 500687 - "reply-all key binding shouldn't be disabled, even in 1-1 messages" [r=mkmelin+mozilla]

mail/base/content/mail3PaneWindowCommands.js

@@ -322,10 +322,9 @@ var DefaultController =
         {
           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;

mail/base/content/messageWindow.js

@@ -769,10 +769,9 @@ var MessageWindowController =
                             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();