diff --git a/mailnews/base/resources/content/msgFolderPickerOverlay.xul b/mailnews/base/resources/content/msgFolderPickerOverlay.xul
index 896c58e6f1c..62b6d5ff66f 100644
--- a/mailnews/base/resources/content/msgFolderPickerOverlay.xul
+++ b/mailnews/base/resources/content/msgFolderPickerOverlay.xul
@@ -306,7 +306,13 @@ Rights Reserved.
       <template>
         <rule iscontainer="true" isempty="false">
           <menupopup>
-            <menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name">
+            <menu uri="..." 
+              class="folderMenuItem menu-iconic"
+              SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
+              BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
+              IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+              ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+              value="rdf:http://home.netscape.com/NC-rdf#Name">
               <menupopup>
                 <menuitem uri="..." data="..." value="&filemessageschoosethis.label;"/>
                 <menuseparator/>
@@ -316,8 +322,13 @@ Rights Reserved.
         </rule>
         <rule>
           <menupopup>
-            <menuitem uri="..." data="..."
-                      value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+            <menuitem uri="..." data="..." 
+               class="folderMenuItem menuitem-iconic"
+               SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
+               BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
+               IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+               ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+               value="rdf:http://home.netscape.com/NC-rdf#Name"/>
           </menupopup>
         </rule>
       </template>
@@ -332,9 +343,21 @@ Rights Reserved.
         </rule>
          <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
           <menupopup>
-              <menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name">
+              <menu uri="..." 
+                class="folderMenuItem menu-iconic"
+                SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
+                BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
+                IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+                ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+                value="rdf:http://home.netscape.com/NC-rdf#Name">
                 <menupopup>
-                  <menuitem hidden="true" uri="..." data="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                  <menuitem hidden="true" uri="..." data="..." 
+                    class="folderMenuItem menuitem-iconic" 
+                    SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
+                    BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
+                    IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+                    ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+                    value="rdf:http://home.netscape.com/NC-rdf#Name"/>
                   <!-- <menuseparator/> -->
                 </menupopup>
               </menu>
@@ -342,9 +365,21 @@ Rights Reserved.
         </rule>
           <rule nc:CanFileMessages="true" iscontainer="true" isempty="false">
           <menupopup>
-              <menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name">
+              <menu uri="..." 
+                class="folderMenuItem menu-iconic"
+                SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
+                BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
+                IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+                ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+                value="rdf:http://home.netscape.com/NC-rdf#Name">
                 <menupopup>
-                  <menuitem uri="..." data="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+                  <menuitem uri="..." data="..."
+                    class="folderMenuItem menuitem-iconic"
+                    SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
+                    BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
+                    IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+                    ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+                    value="rdf:http://home.netscape.com/NC-rdf#Name"/>
                   <menuseparator/>
                 </menupopup>
               </menu>
@@ -352,12 +387,24 @@ Rights Reserved.
         </rule>
        <rule nc:CanFileMessages="false" iscontainer="true" isempty="false">
           <menupopup>
-             <menu uri="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+             <menu uri="..."
+               class="folderMenuItem menu-iconic"
+               SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
+               BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
+               IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+               ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+               value="rdf:http://home.netscape.com/NC-rdf#Name"/>
           </menupopup>
         </rule>
         <rule nc:CanFileMessages="true">
           <menupopup>
-             <menuitem uri="..." data="..." value="rdf:http://home.netscape.com/NC-rdf#Name"/>
+             <menuitem uri="..." data="..."  
+              class="folderMenuItem menuitem-iconic"
+              SpecialFolder="rdf:http://home.netscape.com/NC-rdf#SpecialFolder"
+              BiffState="rdf:http://home.netscape.com/NC-rdf#BiffState"
+              IsServer="rdf:http://home.netscape.com/NC-rdf#IsServer"
+              ServerType="rdf:http://home.netscape.com/NC-rdf#ServerType"
+              value="rdf:http://home.netscape.com/NC-rdf#Name"/>
           </menupopup>
         </rule>
       </template>
diff --git a/themes/modern/global/menulist.css b/themes/modern/global/menulist.css
index 822a816911b..2db71f26b18 100644
--- a/themes/modern/global/menulist.css
+++ b/themes/modern/global/menulist.css
@@ -285,16 +285,18 @@
       border-bottom: 1px solid #E6EFEE;
     }
 
-  menulist > menupopup > menuitem 
+  menulist > menupopup > menuitem,
+  menulist > menupopup > menu 
     {
       padding-right       : 12px;
       padding-top         : 1px;
       padding-bottom      : 1px;
       min-width           : 0px;
-      max-width           : none;
+      max-width           : none !important;
       color				        : #000000;
     }
 
+
   menulist > menupopup > menuitem[menuactive="true"]
     {
     	background-color  : #465B75;
diff --git a/themes/modern/messenger/folder-closed.gif b/themes/modern/messenger/folder-closed.gif
index 1e06a5dadfd..e69de29bb2d 100644
Binary files a/themes/modern/messenger/folder-closed.gif and b/themes/modern/messenger/folder-closed.gif differ
diff --git a/themes/modern/messenger/folder-draft-open.gif b/themes/modern/messenger/folder-draft-open.gif
index f2acfcbb1bd..e69de29bb2d 100644
Binary files a/themes/modern/messenger/folder-draft-open.gif and b/themes/modern/messenger/folder-draft-open.gif differ
diff --git a/themes/modern/messenger/folder-draft.gif b/themes/modern/messenger/folder-draft.gif
index 97ec20a41cf..e69de29bb2d 100644
Binary files a/themes/modern/messenger/folder-draft.gif and b/themes/modern/messenger/folder-draft.gif differ
diff --git a/themes/modern/messenger/folder-sent-open.gif b/themes/modern/messenger/folder-sent-open.gif
index 6b01002d1e0..e69de29bb2d 100644
Binary files a/themes/modern/messenger/folder-sent-open.gif and b/themes/modern/messenger/folder-sent-open.gif differ
diff --git a/themes/modern/messenger/folder-sent.gif b/themes/modern/messenger/folder-sent.gif
index 28ef196431e..e69de29bb2d 100644
Binary files a/themes/modern/messenger/folder-sent.gif and b/themes/modern/messenger/folder-sent.gif differ
diff --git a/themes/modern/messenger/folder-template-open.gif b/themes/modern/messenger/folder-template-open.gif
index 58321b1f58d..e69de29bb2d 100644
Binary files a/themes/modern/messenger/folder-template-open.gif and b/themes/modern/messenger/folder-template-open.gif differ
diff --git a/themes/modern/messenger/folder-template.gif b/themes/modern/messenger/folder-template.gif
index 00fa04600a0..e69de29bb2d 100644
Binary files a/themes/modern/messenger/folder-template.gif and b/themes/modern/messenger/folder-template.gif differ
diff --git a/themes/modern/messenger/folder-trash-open.gif b/themes/modern/messenger/folder-trash-open.gif
index 0e2c1b43b1e..e69de29bb2d 100644
Binary files a/themes/modern/messenger/folder-trash-open.gif and b/themes/modern/messenger/folder-trash-open.gif differ
diff --git a/themes/modern/messenger/folder-trash.gif b/themes/modern/messenger/folder-trash.gif
index 6157ff23d58..e69de29bb2d 100644
Binary files a/themes/modern/messenger/folder-trash.gif and b/themes/modern/messenger/folder-trash.gif differ
diff --git a/themes/modern/messenger/folderPane.css b/themes/modern/messenger/folderPane.css
index 056abd7d05c..a87818a300a 100644
--- a/themes/modern/messenger/folderPane.css
+++ b/themes/modern/messenger/folderPane.css
@@ -19,33 +19,60 @@
  */
 
 /* basic mail folders */
+
 .tree-cell-folderpane-icon
 {
  list-style-image: url("chrome://messenger/skin/folder-closed.gif");
 }
 
-.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon,
+.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon
 {
  list-style-image: url("chrome://messenger/skin/folder-open.gif");
 }
 
-/* special folder */
+.tree-cell-folderpane-icon[NewMessages="true"]
+{
+  list-style-image: url("chrome://messenger/skin/folder-new.gif");
+  font-weight: bold;
+}
+
+treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"],
+treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"]
+{
+ list-style-image: url("chrome://messenger/skin/folder-new-open.gif");
+ font-weight: bold;
+}
+
+/* special folders */
+
 .tree-cell-folderpane-icon[SpecialFolder="Inbox"]
 {
  list-style-image: url("chrome://messenger/skin/folder-inbox.gif");
 }
 
-.folderTreeItem[selected="true"][SpecialFolder="Inbox"] > treerow > .tree-cell-folderpane-icon
+.folderTreeItem[selected="true"][SpecialFolder="Inbox"] > treerow > .tree-cell-folderpane-icon,
+.folderTreeItem[open="true"][SpecialFolder="Inbox"] > treerow > .tree-cell-folderpane-icon
 {
  list-style-image: url("chrome://messenger/skin/folder-inbox-open.gif");
 }
 
+.tree-cell-folderpane-icon[SpecialFolder="Inbox"][NewMessages="true"],
+treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"][SpecialFolder="Inbox"],
+treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"][SpecialFolder="Inbox"]
+{
+ list-style-image: url("chrome://messenger/skin/folder-inbox-new.gif");
+ font-weight: bold;
+}
+
 .tree-cell-folderpane-icon[SpecialFolder="Sent"]
 {
  list-style-image: url("chrome://messenger/skin/folder-sent.gif");
 }
 
-.folderTreeItem[selected="true"][SpecialFolder="Sent"] > treerow > .tree-cell-folderpane-icon
+.folderTreeItem[selected="true"][SpecialFolder="Sent"] > treerow > .tree-cell-folderpane-icon,
+.folderTreeItem[selected="true"][SpecialFolder="Sent"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"],
+.folderTreeItem[open="true"][SpecialFolder="Sent"] > treerow > .tree-cell-folderpane-icon
 {
  list-style-image: url("chrome://messenger/skin/folder-sent-open.gif");
 }
@@ -55,7 +82,9 @@
  list-style-image: url("chrome://messenger/skin/folder-draft.gif");
 }
 
-.folderTreeItem[selected="true"][SpecialFolder="Drafts"] > treerow > .tree-cell-folderpane-icon
+.folderTreeItem[selected="true"][SpecialFolder="Drafts"] > treerow > .tree-cell-folderpane-icon,
+.folderTreeItem[selected="true"][SpecialFolder="Drafts"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"],
+.folderTreeItem[open="true"][SpecialFolder="Drafts"] > treerow > .tree-cell-folderpane-icon
 {
  list-style-image: url("chrome://messenger/skin/folder-draft-open.gif");
 }
@@ -65,7 +94,9 @@
  list-style-image: url("chrome://messenger/skin/folder-template.gif");
 }
 
-.folderTreeItem[selected="true"][SpecialFolder="Templates"] > treerow > .tree-cell-folderpane-icon
+.folderTreeItem[selected="true"][SpecialFolder="Templates"] > treerow > .tree-cell-folderpane-icon,
+.folderTreeItem[selected="true"][SpecialFolder="Templates"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"],
+.folderTreeItem[open="true"][SpecialFolder="Templates"] > treerow > .tree-cell-folderpane-icon
 {
  list-style-image: url("chrome://messenger/skin/folder-template-open.gif");
 }
@@ -75,81 +106,62 @@
  list-style-image: url("chrome://messenger/skin/folder-trash.gif");
 }
 
-.folderTreeItem[selected="true"][SpecialFolder="Trash"] > treerow > .tree-cell-folderpane-icon
+.folderTreeItem[selected="true"][SpecialFolder="Trash"] > treerow > .tree-cell-folderpane-icon,
+.folderTreeItem[selected="true"][SpecialFolder="Trash"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"],
+.folderTreeItem[open="true"][SpecialFolder="Trash"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"]
 {
  list-style-image: url("chrome://messenger/skin/folder-trash-open.gif");
 }
 
-.tree-cell-folderpane-icon[IsServer="true"]
+/* server folders */
+
+.tree-cell-folderpane-icon[IsServer="true"],
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"],
+.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"]
 {
  list-style-image: url("chrome://messenger/skin/server-mail.gif");
 }
 
-.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"]
-{
- list-style-image: url("chrome://messenger/skin/server-mail.gif");
-}
-
-.tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
+.tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"],
+treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"],
+treeitem[open="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
 {
  list-style-image: url("chrome://messenger/skin/server-mail-new.gif");
 }
 
-treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[BiffState="NewMail"][IsServer="true"]
-{
- list-style-image: url("chrome://messenger/skin/server-mail-new.gif");
-}
-
-/* differentiate new messages on inbox/folders from biff on the server */
-.tree-cell-folderpane-icon[NewMessages="true"]
-{
-  list-style-image: url("chrome://messenger/skin/folder-new.gif");
-  font-weight: bold;
-}
-
-treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"]
-{
- list-style-image: url("chrome://messenger/skin/folder-new-open.gif");
- font-weight: bold;
-}
-
-.tree-cell-folderpane-icon[SpecialFolder="Inbox"][NewMessages="true"],
-treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="true"][SpecialFolder="Inbox"]
-{
- list-style-image: url("chrome://messenger/skin/folder-inbox-new.gif");
- font-weight: bold;
-}
-
-/* IMAP folders */
-
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"],
-.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"]
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"],
+.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="imap"][IsSecure="true"]
 {
     list-style-image: url("chrome://messenger/skin/server-remote-lock.gif");
 }
 
 /* Local servers */
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"],
-.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"]
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"],
+.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="none"]
 {
  list-style-image: url("chrome://messenger/skin/server-local.gif");
 }
 
 /* News folders */
 .tree-cell-folderpane-icon[ServerType="nntp"],
-.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[ServerType="nntp"]
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[ServerType="nntp"],
+.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[ServerType="nntp"]
 {
     list-style-image: url("chrome://messenger/skin/folder-newsgroup.gif");
 }
 
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"],
-.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"]
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"],
+.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"][IsSecure="true"]
 {
     list-style-image: url("chrome://messenger/skin/server-news-lock.gif");
 }
 
 .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"],
-.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"]
+.folderTreeItem[selected="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"],
+.folderTreeItem[open="true"] > treerow > .tree-cell-folderpane-icon[IsServer="true"][ServerType="nntp"]
 {
     list-style-image: url("chrome://messenger/skin/server-news.gif");
 }
@@ -176,5 +188,5 @@ treeitem[selected="true"] > treerow > .tree-cell-folderpane-icon[NewMessages="tr
 }
 
 treeitem[empty="true"] > treerow > treecell > .tree-cell-twisty {               
-  visibility:hidden;
+  visibility: hidden;
 }
diff --git a/themes/modern/messenger/message-mail-attach.gif b/themes/modern/messenger/message-mail-attach.gif
index ebc511d53ea..e69de29bb2d 100644
Binary files a/themes/modern/messenger/message-mail-attach.gif and b/themes/modern/messenger/message-mail-attach.gif differ
diff --git a/themes/modern/messenger/message-mail-imapdelete.gif b/themes/modern/messenger/message-mail-imapdelete.gif
index 317fdf5a6e8..e69de29bb2d 100644
Binary files a/themes/modern/messenger/message-mail-imapdelete.gif and b/themes/modern/messenger/message-mail-imapdelete.gif differ
diff --git a/themes/modern/messenger/message-mail-new.gif b/themes/modern/messenger/message-mail-new.gif
index e163f6f5c96..e69de29bb2d 100644
Binary files a/themes/modern/messenger/message-mail-new.gif and b/themes/modern/messenger/message-mail-new.gif differ
diff --git a/themes/modern/messenger/message-mail.gif b/themes/modern/messenger/message-mail.gif
index 8e66c23d9c3..e69de29bb2d 100644
Binary files a/themes/modern/messenger/message-mail.gif and b/themes/modern/messenger/message-mail.gif differ