diff --git a/mozilla/mail/base/skin/mac/mailWindow1.css b/mozilla/mail/base/skin/mac/mailWindow1.css
index 26553e6fc35..c1da5d05b6d 100644
--- a/mozilla/mail/base/skin/mac/mailWindow1.css
+++ b/mozilla/mail/base/skin/mac/mailWindow1.css
@@ -123,9 +123,6 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
   list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
 }
 
-/* ..... Saved Search Folder ..... */
-
treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
  list-style-image: url("chrome://messenger/skin/icons/saved-search-folder.png");
}
-
 treechildren::-moz-tree-image(folderNameCol, isServer-true) {
     list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
 }
@@ -179,6 +176,12 @@ treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isS
   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) {
@@ -444,11 +447,29 @@ treechildren::-moz-tree-image(news, threadCol, ignore) {
         border-right: 1px solid #bebebe;
 }
 
-/* ::::: group rows ::::: */ 

treechildren::-moz-tree-row(dummy)  {
	background-image: url("chrome://messenger/skin/icons/group-background.gif");
+/* ::::: group rows ::::: */ 
+
+treechildren::-moz-tree-row(dummy)  {
+	background-image: url("chrome://messenger/skin/icons/group-background.gif");
 	background-repeat: repeat-x;
-	background-color: rgb(246, 246, 246);
	border: 1px solid rgb(197, 199, 202);
+	background-color: rgb(246, 246, 246);
+	border: 1px solid rgb(197, 199, 202);
 	margin-right: 1px;
-	margin-left: 1px;
}

treechildren::-moz-tree-row(dummy, selected) {
	background-color: -moz-Dialog;
}

treechildren::-moz-tree-row(dummy, selected, focus)  {
	background-color: Highlight;
}

treechildren::-moz-tree-cell-text(dummy) {
	font-weight: bold;
}
+	margin-left: 1px;
+}
+
+treechildren::-moz-tree-row(dummy, selected) {
+	background-color: -moz-Dialog;
+}
+
+treechildren::-moz-tree-row(dummy, selected, focus)  {
+	background-color: Highlight;
+}
+
+treechildren::-moz-tree-cell-text(dummy) {
+	font-weight: bold;
+}
+
 
 /* ::::: thread labels decoration ::::: */
 
diff --git a/mozilla/mail/base/skin/mailWindow1.css b/mozilla/mail/base/skin/mailWindow1.css
index 755689aee3c..e5c6105cc56 100644
--- a/mozilla/mail/base/skin/mailWindow1.css
+++ b/mozilla/mail/base/skin/mailWindow1.css
@@ -96,16 +96,8 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
   list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
 }
 
-/* ..... Saved Search Folder ..... */
-
-treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
-  list-style-image: url("chrome://messenger/skin/icons/folder-search.png");
-}
-
-
 /* ..... Servers  ..... */
 
-
 treechildren::-moz-tree-image(folderNameCol, isServer-true) {
   list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
 }
@@ -159,6 +151,12 @@ treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isS
   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) {