diff --git a/mozilla/mail/components/compose/content/MsgComposeCommands.js b/mozilla/mail/components/compose/content/MsgComposeCommands.js
index a7bbb16d167..7e303c73569 100644
--- a/mozilla/mail/components/compose/content/MsgComposeCommands.js
+++ b/mozilla/mail/components/compose/content/MsgComposeCommands.js
@@ -1723,6 +1723,13 @@ function GenericSendMessage( msgType )
               return;
             action = result2.action;
           }
+          
+          // we will remember the users "send format" decision
+          // in the address collector code (see nsAbAddressCollecter::CollectAddress())
+          // by using msgCompFields.forcePlainText and msgCompFields.useMultipartAlternative
+          // to determine the nsIAbPreferMailFormat (unknown, plaintext, or html)
+          // if the user sends both, we remember html.
+
           switch (action)
           {
             case nsIMsgCompSendFormat.PlainText:
@@ -2628,12 +2635,7 @@ function DetermineHTMLAction(convertible)
         dump("DetermineHTMLAction: preferFormat = " + preferFormat + ", noHtmlRecipients are " + noHtmlRecipients + "\n");
 
         //Check newsgroups now...
-        try {
-            noHtmlnewsgroups = gMsgCompose.GetNoHtmlNewsgroups(null);
-        } catch(ex)
-        {
-           noHtmlnewsgroups = gMsgCompose.compFields.newsgroups;
-        }
+        noHtmlnewsgroups = gMsgCompose.compFields.newsgroups;
 
         if (noHtmlRecipients != "" || noHtmlnewsgroups != "")
         {