More stuff for bug 17796 that got mislaid somehow

git-svn-id: svn://10.0.0.236/trunk@215405 18797224-902f-48f8-a5cc-f745e15eee43

mozilla/mailnews/base/resources/content/mailWindowOverlay.js

@@ -175,6 +175,7 @@ function view_init()
       message_menuitem.setAttribute('disabled', gAccountCentralLoaded);
   }
 
+  var folderPane_menuitem = document.getElementById('menu_showFolderPane');
   if (folderPane_menuitem && !folderPane_menuitem.hidden)
     folderPane_menuitem.setAttribute('checked', !IsFolderPaneCollapsed());
 
@@ -555,6 +556,28 @@ function RemoveAllMessageTags()
   OnTagsChange();
 }
 
+function InitMessageForward(aPopup)
+{
+  var forwardType = 0;
+  try {
+    forwardType = gPrefs.getIntPref("mail.forward_message_mode");
+  }
+  catch (ex) {
+    dump("failed to retrieve pref mail.forward_message_mode");
+  }
+
+  if (forwardType) {
+    // forward inline is the first menuitem
+    aPopup.firstChild.setAttribute("default", "true");
+    aPopup.lastChild.removeAttribute("default");
+  }
+  else {
+    // attachment is the last menuitem
+    aPopup.lastChild.setAttribute("default", "true");
+    aPopup.firstChild.removeAttribute("default");
+  }
+}
+
 function ToggleMessageTagKey(index)
 {
   if (GetNumSelectedMessages() < 1)