diff --git a/mail/app/Makefile.in b/mail/app/Makefile.in
index a20904492353..66425627ceb2 100644
--- a/mail/app/Makefile.in
+++ b/mail/app/Makefile.in
@@ -76,9 +76,8 @@ MOZ_WINCONSOLE = 0
 endif
 endif
 
-
-EXTRA_LIBS = \
-	$(DIST)/lib/$(LIB_PREFIX)xulapp_s.$(LIB_SUFFIX) \
+LIBS = \
+	$(call EXPAND_LIBNAME, xulapp_s) \
 	$(MOZ_JS_LIBS) \
 	$(MOZ_COMPONENT_LIBS) \
 	$(TK_LIBS) \
diff --git a/mail/app/profile/localstore.rdf b/mail/app/profile/localstore.rdf
index 72a48fcad8e6..467b7cf42ced 100644
--- a/mail/app/profile/localstore.rdf
+++ b/mail/app/profile/localstore.rdf
@@ -20,14 +20,6 @@
   <RDF:Description about="chrome://messenger/content/messenger.xul#sizeCol">
     <hidden>true</hidden>
   </RDF:Description>
-  <RDF:Description about="chrome://messenger/content/messenger.xul#folderUnreadCol">
-    <hidden>true</hidden>
-  </RDF:Description>
-  <RDF:Description about="chrome://messenger/content/messenger.xul#folderTotalCol">
-    <hidden>true</hidden>
-  </RDF:Description>
-  <RDF:Description about="chrome://messenger/content/messenger.xul#folderSizeCol">
-    <hidden>true</hidden>
   </RDF:Description>
   <RDF:Description about="chrome://messenger/content/addressbook/addressbook.xul">
     <NC:persist resource="chrome://messenger/content/addressbook/addressbook.xul#abResultsOutliner"/>
@@ -42,9 +34,6 @@
     <NC:persist resource="chrome://messenger/content/messenger.xul#flaggedCol"/>
     <NC:persist resource="chrome://messenger/content/messenger.xul#messengerWindow"/>
     <NC:persist resource="chrome://messenger/content/messenger.xul#threadOutliner"/>
-    <NC:persist resource="chrome://messenger/content/messenger.xul#folderUnreadCol"/>
-    <NC:persist resource="chrome://messenger/content/messenger.xul#folderTotalCol"/>
-    <NC:persist resource="chrome://messenger/content/messenger.xul#folderSizeCol"/>
   </RDF:Description>
   <RDF:Description about="chrome://messenger/content/messenger.xul#messengerWindow">
     <screenX>4</screenX>
@@ -76,11 +65,7 @@
   <RDF:Description about="chrome://messenger/content/mail3PaneWindowVertLayout.xul#sizeCol">
     <hidden>true</hidden>
   </RDF:Description>
-  <RDF:Description about="chrome://messenger/content/mail3PaneWindowVertLayout.xul#folderUnreadCol">
-    <hidden>true</hidden>
   </RDF:Description>
-  <RDF:Description about="chrome://messenger/content/mail3PaneWindowVertLayout.xul#folderTotalCol">
-    <hidden>true</hidden>
   </RDF:Description>
   <RDF:Description about="chrome://messenger/content/mail3PaneWindowVertLayout.xul#folderSizeCol">
     <hidden>true</hidden>
@@ -92,8 +77,5 @@
     <NC:persist resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul#totalCol"/>
     <NC:persist resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul#OrderReceivedColumn"/>
     <NC:persist resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul#flaggedCol"/>
-    <NC:persist resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul#folderUnreadCol"/>
-    <NC:persist resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul#folderTotalCol"/>
-    <NC:persist resource="chrome://messenger/content/mail3PaneWindowVertLayout.xul#folderSizeCol"/>
   </RDF:Description>
 </RDF:RDF>