195285 - junk mail column placement incorrect for existing profiles. r=jag,sr/a=sspitzer.

mailnews/base/resources/content/msgMail3PaneWindow.js

@@ -922,11 +922,24 @@ function UpgradeThreadPaneUI()
 
   try {
     threadPaneUIVersion = pref.getIntPref("mailnews.ui.threadpane.version");
-    if (threadPaneUIVersion == 1) {
-      labelCol = document.getElementById("labelCol");
-      labelCol.setAttribute("hidden", "true");
-      pref.setIntPref("mailnews.ui.threadpane.version", 2);
-    }
+    if (threadPaneUIVersion < 3) {
+      var subjectCol = document.getElementById("subjectCol");
+      var junkCol = document.getElementById("junkStatusCol");
+      var threadTree = document.getElementById("threadTree");
+      
+      var beforeCol = subjectCol.boxObject.nextSibling.boxObject.nextSibling;
+      if (beforeCol)
+        threadTree._reorderColumn(junkCol, beforeCol, true);
+      else // subjectCol was the last column, put it after
+        threadTree._reorderColumn(junkCol, subjectCol, false);
+
+      if (threadPaneUIVersion == 1) {
+        labelCol = document.getElementById("labelCol");
+        labelCol.setAttribute("hidden", "true");
+      }
+
+      pref.setIntPref("mailnews.ui.threadpane.version", 3);
+    }    
 	}
   catch (ex) {
     dump("UpgradeThreadPane: ex = " + ex + "\n");

mailnews/mailnews.js

@@ -450,7 +450,8 @@ pref("mail.ui.folderpane.version", 1);
 // for manual upgrades of certain UI features.
 // 1 -> 2 is for the thread pane tree landing, to hide the
 // labels column, see msgMail3PaneWindow.js
-pref("mailnews.ui.threadpane.version", 1);                                          
+// 2 -> 3 is for the junk status column
+pref("mailnews.ui.threadpane.version", 1);
 // for manual upgrades of certain UI features.
 // 1 -> 2 is for the ab results pane tree landing
 // to hide the non default columns in the addressbook dialog

modules/libpref/src/init/mailnews.js

@@ -450,7 +450,8 @@ pref("mail.ui.folderpane.version", 1);
 // for manual upgrades of certain UI features.
 // 1 -> 2 is for the thread pane tree landing, to hide the
 // labels column, see msgMail3PaneWindow.js
-pref("mailnews.ui.threadpane.version", 1);                                          
+// 2 -> 3 is for the junk status column
+pref("mailnews.ui.threadpane.version", 1);
 // for manual upgrades of certain UI features.
 // 1 -> 2 is for the ab results pane tree landing
 // to hide the non default columns in the addressbook dialog