Bug 704016 - Enable View Source for .eml files and port |Bug 550478 - Attached .eml - Other Actions --> View Source - only shows body|. r+moa=Mnyromyr

suite/mailnews/mailCommands.js

@@ -454,6 +454,10 @@ function ViewPageSource(messages)
             // Now, we need to get a URL from a URI
             var url = mailSession.ConvertMsgURIToMsgURL(messages[i], msgWindow);
 
+            // Strip out the message-display parameter to ensure that attached
+            // emails display the message source, not the processed HTML.
+            url = url.replace(/(\?|&)type=application\/x-message-display(&|$)/, "$1")
+                     .replace(/\?$/, "");
             window.openDialog( "chrome://global/content/viewSource.xul",
                                "_blank", "all,dialog=no", url,
                                mailCharacterSet);

suite/mailnews/messageWindow.js

@@ -618,7 +618,6 @@ var MessageWindowController =
       case "button_junk":
       case "cmd_shiftDelete":
       case "cmd_saveAsTemplate":
-      case "cmd_viewPageSource":
       case "cmd_getMsgsForAuthAccounts":
       case "button_mark":
       case "cmd_markAsRead":
@@ -649,6 +648,8 @@ var MessageWindowController =
       case "cmd_goForward":
       case "button_goForward":
         return (gDBView.keyForFirstSelectedMessage != nsMsgKey_None);
+      case "cmd_viewPageSource":
+        return GetNumSelectedMessages() > 0;
       case "cmd_reply":
       case "button_reply":
       case "cmd_replySender":