44446: Remove HTML->HTML recognition of structured phrases from Prefs UI and disable by default.

mailnews/compose/prefs/resources/content/pref-composing_messages.xul

@@ -81,9 +81,6 @@
     <checkbox id="spellCheckBeforeSend" value="&spellCheck.label;" accesskey="&spellCheck.accesskey;"
               pref="true" preftype="bool" prefstring="mail.SpellCheckBeforeSend"
               prefattribute="checked"/>
-    <checkbox id="sendStruct" value="&convertStructs.label;" accesskey="&convertStructs.accesskey;"
-              pref="true" preftype="bool" prefstring="mail.send_struct"
-              prefattribute="checked" tooltip="aTooltip" tooltiptext="&convertStructs.tooltip;"/>
 	
 	<checkbox id="strictlyMime" value="&useMIME.label;" accesskey="&useMIME.accesskey;"
                 pref="true" preftype="bool" prefstring="mail.strictly_mime"

mailnews/compose/prefs/resources/locale/en-US/pref-composing_messages.dtd

@@ -47,8 +47,6 @@ Rights Reserved.
 <!ENTITY messageWrapping.label                "Message Wrapping">
 <!ENTITY wrapInMsg.label                      "Wrap plain text messages to fit window width">
 <!ENTITY wrapInMsg.accesskey                  "w">
-<!ENTITY convertStructs.label                 "Convert structured phrases to HTML styles on Send. For example, convert '*test*' to '*test*'">
-<!ENTITY convertStructs.accesskey             "s">
 
 <!ENTITY sendingMessagesHeader.label          "Composing Messages">
 <!ENTITY spellCheck.label                     "Check spelling before sending">
@@ -70,5 +68,3 @@ Rights Reserved.
 <!ENTITY addressingEnable.label				  "Enable address autocompletion">
 
 <!-- Tooltips -->  
-<!ENTITY convertStructs.tooltip "Convert Structs">  
-

mailnews/compose/src/nsMsgSend.cpp

@@ -1249,7 +1249,7 @@ nsMsgComposeAndSend::GetBodyFromEditor()
     if (NS_SUCCEEDED(rv)) 
     {
       PRUint32 whattodo = mozITXTToHTMLConv::kURLs;
-      PRBool enable_structs = PR_TRUE;
+      PRBool enable_structs = PR_FALSE;
       NS_WITH_SERVICE(nsIPref, prefs, kPrefCID, &rv);
       if (NS_SUCCEEDED(rv) && prefs)
       {

mailnews/mailnews.js

@@ -411,9 +411,9 @@ pref("mail.server.default.dual_use_folders", true);
 
 pref("mail.smtpserver.default.auth_method", 2); // auth login
 
-pref("mail.display_glyph",true);   // see <http://www.bucksch.org/1/projects/mozilla/16507>
-pref("mail.display_struct",true);  // dito
-pref("mail.send_struct",true);     // dito
+pref("mail.display_glyph", true);   // see <http://www.bucksch.org/1/projects/mozilla/16507>
+pref("mail.display_struct", true);  // ditto
+pref("mail.send_struct", false);   // ditto
 
 pref("mail.forward_message_mode", 0); // 0=default as attachment 2=forward as inline with attachments, (obsolete)1=forward as quoted
 

modules/libpref/src/init/mailnews.js

@@ -411,9 +411,9 @@ pref("mail.server.default.dual_use_folders", true);
 
 pref("mail.smtpserver.default.auth_method", 2); // auth login
 
-pref("mail.display_glyph",true);   // see <http://www.bucksch.org/1/projects/mozilla/16507>
-pref("mail.display_struct",true);  // dito
-pref("mail.send_struct",true);     // dito
+pref("mail.display_glyph", true);   // see <http://www.bucksch.org/1/projects/mozilla/16507>
+pref("mail.display_struct", true);  // ditto
+pref("mail.send_struct", false);   // ditto
 
 pref("mail.forward_message_mode", 0); // 0=default as attachment 2=forward as inline with attachments, (obsolete)1=forward as quoted