diff --git a/mail/themes/pinstripe/mail/folderPane.css b/mail/themes/pinstripe/mail/folderPane.css
new file mode 100644
index 000000000000..e64238598a0c
--- /dev/null
+++ b/mail/themes/pinstripe/mail/folderPane.css
@@ -0,0 +1,134 @@
+/* ::::: Folder Pane ::::: */
+
+treechildren::-moz-tree-image(folderNameCol) {
+  margin-right: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+/* ..... Inbox ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+}
+
+/* ..... Sent ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
+}
+
+/* ..... Unsent ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Unsent Messages) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
+}
+
+/* ..... Drafts ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
+}
+
+/* ..... Templates ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
+}
+
+/* ..... Junk ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+}
+
+/* ..... Trash ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true) {
+    list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true),
+treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
+treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
+  font-weight: bold;
+  color: blue;
+}
+
+treechildren::-moz-tree-cell(folderNameCol, newMessages-true),
+treechildren::-moz-tree-cell(folderNameCol, specialFolder-Inbox, newMessages-true) {
+
+}
+
+treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-share.png");
+}
+
+
+/* ..... Server Folders ..... */
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
+  list-style-image: url("chrome://messenger/skin/icons/server-local.png");
+}
+
+/* ..... News Folders ..... */
+
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+/* ..... Saved Search Folder ..... */
+
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
+  list-style-image: url("chrome://messenger/skin/icons/saved-search-folder.png");
+}
+
+/* ::::: All Servers ::::: */
+
+treechildren::-moz-tree-cell-text(subfoldersHaveUnreadMessages-true) {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
+  color: gray;
+  font-style: italic;
+}
+
+.tree-folder-checkbox {
+  list-style-image: none;
+}
diff --git a/mail/themes/pinstripe/mail/jar.mn b/mail/themes/pinstripe/mail/jar.mn
index c38cd2a2ce1b..2d2bb33f7936 100644
--- a/mail/themes/pinstripe/mail/jar.mn
+++ b/mail/themes/pinstripe/mail/jar.mn
@@ -17,6 +17,7 @@ classic.jar:
      skin/classic/messenger/searchBox.css
      skin/classic/messenger/junkMail.css
      skin/classic/messenger/folderMenus.css
+     skin/classic/messenger/folderPane.css
      skin/classic/messenger/subscribe.css
      skin/classic/messenger/virtualFolderListDialog.css
      skin/classic/messenger/searchDialog.css
diff --git a/mail/themes/pinstripe/mail/mailWindow1.css b/mail/themes/pinstripe/mail/mailWindow1.css
index 23e1b6c8fea1..ac3cf60a56e3 100644
--- a/mail/themes/pinstripe/mail/mailWindow1.css
+++ b/mail/themes/pinstripe/mail/mailWindow1.css
@@ -44,6 +44,7 @@
 @import url("chrome://messenger/skin/");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
+@import url("chrome://messenger/skin/folderPane.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -51,13 +52,15 @@
 	 margin-bottom: -1px;
 }
 
-/* ::::: Folder Pane ::::: */
+#folderPaneHeader {
+	-moz-appearance: treeheadercell;
+}
 
 #folderTree {
-        border-bottom: 1px solid #bebebe;
-        border-right: 1px solid #bebebe;
-        background-color: #FFFFFF !important;
-        background-image: none !important;
+  border-bottom: 1px solid #bebebe;
+  border-right: 1px solid #bebebe;
+  background-color: #FFFFFF !important;
+  background-image: none !important;
 	-moz-appearance: none !important;
 }
 
@@ -69,10 +72,6 @@
   background-color: #FFF;
 }
 
-#folderPaneHeader {
-	-moz-appearance: treeheadercell;
-}
-
 #folderTree treechildren::-moz-tree-row(selected) {
   background: url("chrome://messenger/skin/icons/foldertree-selected-unfocused.png") #676767 repeat-x !important;
 }
@@ -85,139 +84,6 @@
   color: #FFFFFF;
 }
 
-treechildren::-moz-tree-image(folderNameCol) {
-  margin-right: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
-}
-
-/* ..... Inbox ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
-}
-
-/* ..... Sent ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
-}
-
-/* ..... Unsent ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Unsent Messages) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
-}
-
-/* ..... Drafts ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
-}
-
-/* ..... Templates ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
-}
-
-/* ..... Junk ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
-}
-
-/* ..... Trash ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true) {
-    list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, biffState-NewMail, isServer-true),
-treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
-treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  font-weight: bold;
-  color: blue;
-}
-
-treechildren::-moz-tree-cell(folderNameCol, newMessages-true),
-treechildren::-moz-tree-cell(folderNameCol, specialFolder-Inbox, newMessages-true) {
-
-}
-
-treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-share.png");
-}
-
-
-/* ..... Server Folders ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-  list-style-image: url("chrome://messenger/skin/icons/server-local.png");
-}
-
-/* ..... News Folders ..... */
-
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
-  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
-}
-
-/* ..... Saved Search Folder ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
-  list-style-image: url("chrome://messenger/skin/icons/saved-search-folder.png");
-}
-
-/* ::::: All Servers ::::: */
-
-treechildren::-moz-tree-cell-text(subfoldersHaveUnreadMessages-true) {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
-  color: gray;
-  font-style: italic;
-}
-
-.tree-folder-checkbox {
-  list-style-image: none;
-}
-
 #folderUnreadCol,
 #folderTotalCol,
 #folderSizeCol {
diff --git a/mail/themes/qute/mail/jar.mn b/mail/themes/qute/mail/jar.mn
index 43639b366496..854c429d0408 100644
--- a/mail/themes/qute/mail/jar.mn
+++ b/mail/themes/qute/mail/jar.mn
@@ -18,6 +18,7 @@ classic.jar:
     skin/classic/messenger/searchBox.css
     skin/classic/messenger/junkMail.css
     skin/classic/messenger/folderMenus.css
+    skin/classic/messenger/folderPane.css
     skin/classic/messenger/subscribe.css
     skin/classic/messenger/virtualFolderListDialog.css
     skin/classic/messenger/searchDialog.css
diff --git a/mail/themes/qute/mail/mailWindow1.css b/mail/themes/qute/mail/mailWindow1.css
index 174550090840..596cfbe1b313 100644
--- a/mail/themes/qute/mail/mailWindow1.css
+++ b/mail/themes/qute/mail/mailWindow1.css
@@ -44,6 +44,7 @@
 @import url("chrome://messenger/skin/");
 @import url("chrome://messenger/skin/primaryToolbar.css");
 @import url("chrome://messenger/skin/folderMenus.css");
+@import url("chrome://messenger/skin/folderPane.css");
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
@@ -52,153 +53,6 @@
   background-color: -moz-Dialog;
 }
 
-/* ::::: Folder Pane ::::: */
-
-treechildren::-moz-tree-image(folderNameCol) {
-  margin-right: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
-}
-
-
-treechildren::-moz-tree-image(folderNameCol, selected, open) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-open.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, selected, open, newMessages-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-new-open.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-new-closed.png");
-}
-
-/* ..... Inbox ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.png");
-}
-
-/* ..... Sent ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
-}
-
-/* ..... Unsent ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Unsent Messages) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
-}
-
-/* ..... Drafts ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
-}
-
-/* ..... Templates ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
-}
-
-/* ..... Junk ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
-}
-
-/* ..... Trash ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
-}
-
-/* ..... Servers  ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-mail-new.png");
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
-treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
-  font-weight: bold;
-}
-
-/* Disable rules for special shared folder artwork until we actually have new artwork for these icons */
-
-/* treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-share.gif");
-}
-
-*/
-
-/* ..... Server Folders ..... */
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock-new.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
-  list-style-image: url("chrome://messenger/skin/icons/server-local.png");
-}
-
-/* ..... News Folders ..... */
-
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
-  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
-}
-
-treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
-  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
-}
-
-/* ..... Saved Search Folder ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-search.png");
-}
-
-/* ::::: All Servers ::::: */
-
-treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
-treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
-  font-weight: bold;
-}
-
-treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
-  color: gray;
-  font-style: italic;
-}
-
-.tree-folder-checkbox {
-  list-style-image: none;
-}
-
 #folderUnreadCol,
 #folderTotalCol,
 #folderSizeCol {