Bug #239555 --> port Neil's cleanup in 239555 to thunderbird.

mail/base/content/mailWindowOverlay.js

@@ -421,10 +421,6 @@ function InitMessageMenu()
   if(labelMenu)
       labelMenu.setAttribute("disabled", !aMessage);
 
-  var openMenu = document.getElementById("openMessageWindowMenuitem");
-  if (openMenu)
-      openMenu.setAttribute("disabled", !aMessage);
-
   // Disable mark menu when we're not in a folder
   var markMenu = document.getElementById("markMenu");
   if(markMenu)
@@ -1235,23 +1231,15 @@ function MsgOpenFromFile()
   try {
      var ret = fp.show();
      if (ret == nsIFilePicker.returnCancel)
-       return null;
+       return;
    }
    catch (ex) {
      dump("filePicker.chooseInputFile threw an exception\n");
-     return null;
+     return;
    }
 
-  var ioService = Components.classes["@mozilla.org/network/io-service;1"]
-                         .getService(Components.interfaces.nsIIOService);
-  var handler = ioService.getProtocolHandler("file");
-  var fileHandler = handler.QueryInterface(Components.interfaces.nsIFileProtocolHandler);
-
-  var fileUrl = fileHandler.getURLSpecFromFile(fp.file);
-  var uri = Components.classes["@mozilla.org/network/standard-url;1"].
-              createInstance(Components.interfaces.nsIURI);
-  fileUrl += "?type=x-message-display";
-  uri.spec = fileUrl;
+   var uri = fp.fileURL;
+   uri.query = "type=x-message-display";
 
   MsgOpenNewWindowForMessage(uri, null);
 }

mail/base/content/mailWindowOverlay.xul

@@ -80,8 +80,6 @@
 
     <command id="cmd_emptyTrash" oncommand="goDoCommand('cmd_emptyTrash')" disabled="true"/>
     <command id="cmd_compactFolder" oncommand="goDoCommand('cmd_compactFolder')" disabled="true"/>
-    
-    <command id="cmd_openMessage" oncommand="goDoCommand('cmd_openMessage')" disabled="true"/>
     <command id="cmd_printSetup" oncommand="goDoCommand('cmd_printSetup')" disabled="true"/>
     <command id="cmd_print" oncommand="goDoCommand('cmd_print')" disabled="true"/>
     <command id="cmd_printpreview" oncommand="goDoCommand('cmd_printpreview')" disabled="true"/>
@@ -201,6 +199,7 @@
   <command id="cmd_forwardInline" oncommand="goDoCommand('cmd_forwardInline')"/>
   <command id="cmd_forwardAttachment" oncommand="goDoCommand('cmd_forwardAttachment')"/>
   <command id="cmd_editAsNew" oncommand="goDoCommand('cmd_editAsNew')"/>
+  <command id="cmd_openMessage" oncommand="goDoCommand('cmd_openMessage')"/>
   <command id="cmd_createFilterFromMenu" oncommand="goDoCommand('cmd_createFilterFromMenu')"/>
   <command id="cmd_killThread" oncommand="goDoCommand('cmd_killThread')"/>
   <command id="cmd_watchThread" oncommand="goDoCommand('cmd_watchThread')"/>

mail/base/locale/messenger.dtd

@@ -12,7 +12,7 @@
 <!ENTITY openMessageMenu.label "Open">
 <!ENTITY openMessageWindowCmd.label "Open Message">
 <!ENTITY openMessageWindowCmd.accesskey "s">
-<!ENTITY openMessageFileCmd.label "Open Saved Message">
+<!ENTITY openMessageFileCmd.label ""Open Saved Message..."">
 <!ENTITY openMessageFileCmd.accesskey "O">
 <!ENTITY openAttachmentCmd.label "Attachments">
 <!ENTITY openAttachmentCmd.accesskey "A">