Index: mail/base/content/mailWindowOverlay.js
===================================================================
RCS file: /cvsroot/mozilla/mail/base/content/mailWindowOverlay.js,v
retrieving revision 1.95.2.7
diff -u -p -6 -r1.95.2.7 mailWindowOverlay.js
--- mail/base/content/mailWindowOverlay.js	12 Oct 2005 21:31:50 -0000	1.95.2.7
+++ mail/base/content/mailWindowOverlay.js	29 Dec 2005 19:28:21 -0000
@@ -903,12 +903,19 @@ function MsgNewMessage(event)
   if (event && event.shiftKey)
     ComposeMessage(msgComposeType.New, msgComposeFormat.OppositeOfDefault, loadedFolder, messageArray);
   else
     ComposeMessage(msgComposeType.New, msgComposeFormat.Default, loadedFolder, messageArray);
 }
 
+function MsgNewHtmlMessage()
+{
+  var loadedFolder = GetFirstSelectedMsgFolder();
+  var messageArray = GetSelectedMessages();
+  ComposeMessage(msgComposeType.New, msgComposeFormat.HTML, loadedFolder, messageArray);
+}
+
 function MsgReplyMessage(event)
 {
   var loadedFolder = GetLoadedMsgFolder();
   if (loadedFolder)
   {
     var server = loadedFolder.server;
Index: mail/base/content/mailWindowOverlay.xul
===================================================================
RCS file: /cvsroot/mozilla/mail/base/content/mailWindowOverlay.xul,v
retrieving revision 1.116.2.8
diff -u -p -6 -r1.116.2.8 mailWindowOverlay.xul
--- mail/base/content/mailWindowOverlay.xul	24 Oct 2005 04:01:20 -0000	1.116.2.8
+++ mail/base/content/mailWindowOverlay.xul	29 Dec 2005 19:34:25 -0000
@@ -1399,12 +1399,15 @@
         <menu id="messageMenu" label="&msgMenu.label;" accesskey="&msgMenu.accesskey;">
           <menupopup id="messageMenuPopup" onpopupshowing="InitMessageMenu();">
             <menuitem id="newMsgCmd" label="&newMsgCmd.label;"
               accesskey="&newMsgCmd.accesskey;"
               key="key_newMessage"
               oncommand="MsgNewMessage(null);"/>
+	    <menuitem id="newHtmlMsgCmd" label="New HTML Message"
+	      accesskey="H"
+	      oncommand="MsgNewHtmlMessage();"/>
             <menuitem id="replyMainMenu" label="&replyMsgCmd.label;" 
               accesskey="&replyMsgCmd.accesskey;"
               key="key_reply"
               observes="cmd_reply"/>
             <menuitem id="replySenderMainMenu" label="&replySenderCmd.label;" 
               accesskey="&replySenderCmd.accesskey;"