synch up with trunk changes

mail/app/profile/mailnews.js

@@ -454,7 +454,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

mail/base/content/msgMail3PaneWindow.js

@@ -934,11 +934,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");

mail/base/skin/threadPane.css

@@ -141,6 +141,7 @@ treechildren:-moz-tree-image(flaggedCol, flagged) {
 
 treecol.junkStatusHeader {
   list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
+  padding: 0px 4px 0px 0px;
 }
 
 /* "unknown" now looks like "not junk".  see bug #182386 */
@@ -152,6 +153,7 @@ treechildren:-moz-tree-image(junkStatusCol) {
 
 treechildren:-moz-tree-image(junkStatusCol, junk) {
   list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
+  margin-right: -1px;
 }
 
 treechildren:-moz-tree-image(junkStatusCol, notjunk) {

mail/config/Makefile.in

@@ -67,7 +67,7 @@ endif
 	-$(RM) -f $(MOZILLA_DIR)/mail/config/mail-tmp.mn
 	-$(RM) -f $(MOZILLA_DIR)/mail/config/qute-tmp.mn
 	-$(RM) -f $(MOZILLA_DIR)/mail/config/en-US-tmp.mn
-#	-$(RM) -rf $(DIST)/$(APP_NAME)/tmpchrome 
+	-$(RM) -rf $(DIST)/$(APP_NAME)/tmpchrome 
 
 mail_copy::
 	$(PERL) $(topsrcdir)/xpinstall/packager/pkgcp.pl -s $(DIST)/bin -d $(DIST) --f $(srcdir)/$(BASEMAIL) -o $(_PLATFORM) -v