Remove forward as quoted.

mailnews/base/resources/content/commandglue.js

@@ -53,7 +53,7 @@ function OpenURL(url)
 
 function ComposeMessage(type, format)
 //type: 0=new message, 1=reply, 2=reply all,
-//      3=forward inline, 4=forward quoted, 5=forward as attachment
+//      3=forward inline, 4=forward as attachment
 //
 //format: 0=default (use preference), 1=HTML, 2=plain text
 {
@@ -101,14 +101,15 @@ function ComposeMessage(type, format)
 				}
 			}
 			
-			if (type >= 3 && type <= 5) //forward
+			if (type == 3 || type == 4) //forward
 			{
 				if (appCore)
 					object = appCore.GetRDFResourceForMessage(tree, nodeList); //temporary
 				msgComposeService.OpenComposeWindow(null, uri, type, format, object);
 			}
 		}
-		dump("### nodeList is invalid\n");
+		else
+			dump("### nodeList is invalid\n");
 	}
 	else
 		dump("### tree is invalid\n");

mailnews/base/resources/content/messenger.xul

@@ -198,7 +198,6 @@ Rights Reserved.
 <!ENTITY forwardMsgCmd.label "Forward">  
 <!ENTITY forwardAsMenu.label "Forward As">  
 <!ENTITY forwardAsInline.label "Inline">  
-<!ENTITY forwardAsQuoted.label "Quoted">  
 <!ENTITY forwardAsAttachmentCmd.label "Attachment">  
 <!ENTITY editMsgAsNewCmd.label ".Edit Message As New">  
 <!ENTITY moveMsgMenu.label "Move Message">  
@@ -482,7 +481,6 @@ Rights Reserved.
       <menuitem name="&forwardMsgCmd.label;" onclick="MsgForwardMessage();"/>
       <menu name="&forwardAsMenu.label;">
         <menuitem name="&forwardAsInline.label;" onclick="MsgForwardAsInline();"/>
-        <menuitem name="&forwardAsQuoted.label;" onclick="MsgForwardAsQuoted();"/>
         <menuitem name="&forwardAsAttachmentCmd.label;" onclick="MsgForwardAsAttachment();"/>
       </menu>
       <menuitem name="&editMsgAsNewCmd.label;" onclick="MsgEditMessageAsNew();"/>

mailnews/base/resources/content/widgetglue.js

@@ -117,7 +117,7 @@ function MsgForwardMessage()
 function MsgForwardAsAttachment()
 {
   dump("\nMsgForwardAsAttachment from XUL\n");
-  ComposeMessage(5, 0);
+  ComposeMessage(4, 0);
 }
 
 function MsgForwardAsInline()
@@ -126,12 +126,6 @@ function MsgForwardAsInline()
   ComposeMessage(3, 0);
 }
 
-function MsgForwardAsQuoted()
-{
-  dump("\nMsgForwardAsQuoted from XUL\n");
-  ComposeMessage(4, 0);
-}
-
 function MsgCopyMessage(destFolder)
 {
 	// Get the id for the folder we're copying into

mailnews/compose/public/nsIMsgCompose.idl

@@ -20,6 +20,7 @@
 #include "domstubs.idl"
 #include "nsIMsgCompFields.idl"
 #include "nsIEditorShell.idl"
+#include "nsIMsgIdentity.idl"
 
 %{ C++
 #include "nsIDOMWindow.h"
@@ -35,7 +36,6 @@ enum
 	MSGCOMP_TYPE_Reply,
 	MSGCOMP_TYPE_ReplyAll,
 	MSGCOMP_TYPE_ForwardInline,
-	MSGCOMP_TYPE_ForwardQuoted,
 	MSGCOMP_TYPE_ForwardAsAttachment
 };
 %}
@@ -94,7 +94,7 @@ interface nsIMsgCompose : nsISupports {
     void SendMsgEx(in MSG_DeliverMode deliverMode, in wstring addrTo, in wstring addrCc, in wstring addrBcc,
             in wstring newsgroup, in wstring subject, in wstring body,
             in wstring callback);
-            
+    
 	/* ... */
     void CloseWindow();