diff --git a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
index 93bd350471f..02d706f872c 100644
--- a/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
+++ b/mozilla/mailnews/base/resources/content/mailWindowOverlay.js
@@ -525,6 +525,9 @@ function MsgForwardMessage(event)
       forwardType = pref.GetIntPref("mail.forward_message_mode");
   } catch (e) {dump ("failed to retrieve pref mail.forward_message_mode");}
 
+  // mail.forward_message_mode could be 1, if the user migrated from 4.x
+  // 1 (forward as quoted) is obsolete, so we treat is as forward inline
+  // since that is more like forward as quoted then forward as attachment
   if (forwardType == 0)
       MsgForwardAsAttachment(event);
   else
diff --git a/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul b/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
index 6a12ad54869..b26cf1d218e 100644
--- a/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
+++ b/mozilla/mailnews/compose/prefs/resources/content/pref-composing_messages.xul
@@ -65,8 +65,8 @@
                 pref="true" preftype="int" prefstring="mail.forward_message_mode"
                 prefattribute="value">
         <menupopup>
-          <menuitem value="0" label="&asAttachment.label;" accesskey="&asAttachment.accesskey;"/>
           <menuitem value="2" label="&inline.label;" accesskey="&inline.accesskey;"/>
+          <menuitem value="0" label="&asAttachment.label;" accesskey="&asAttachment.accesskey;"/>
         </menupopup>
       </menulist>
     </box>
diff --git a/mozilla/mailnews/mailnews.js b/mozilla/mailnews/mailnews.js
index bd8c525b2b1..e702abaa727 100644
--- a/mozilla/mailnews/mailnews.js
+++ b/mozilla/mailnews/mailnews.js
@@ -285,7 +285,7 @@ pref("mail.display_glyph", true);   // see <http://www.bucksch.org/1/projects/mo
 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
+pref("mail.forward_message_mode", 0); // 0=default as attachment 2=forward as inline with attachments, (obsolete 4.x value)1=forward as quoted (mapped to 2 in mozilla)
 
 pref("mail.startup.enabledMailCheckOnce", false);
 
diff --git a/mozilla/modules/libpref/src/init/mailnews.js b/mozilla/modules/libpref/src/init/mailnews.js
index bd8c525b2b1..e702abaa727 100644
--- a/mozilla/modules/libpref/src/init/mailnews.js
+++ b/mozilla/modules/libpref/src/init/mailnews.js
@@ -285,7 +285,7 @@ pref("mail.display_glyph", true);   // see <http://www.bucksch.org/1/projects/mo
 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
+pref("mail.forward_message_mode", 0); // 0=default as attachment 2=forward as inline with attachments, (obsolete 4.x value)1=forward as quoted (mapped to 2 in mozilla)
 
 pref("mail.startup.enabledMailCheckOnce", false);