Bug 515256 - Message Filter Dialog menulist missing some icons

r/sr=neil a-sm2.0=kairo

suite/mailnews/search/FilterListDialog.js

@@ -346,6 +346,9 @@ function selectServer(uri)
     // see bug #XXXXXX
     serverMenu.setAttribute("label", msgFolder.name);
     serverMenu.setAttribute("uri",uri);
+    serverMenu.setAttribute("IsServer", msgFolder.isServer);
+    serverMenu.setAttribute("IsSecure", msgFolder.server.isSecure);
+    serverMenu.setAttribute("ServerType", msgFolder.server.type);
 
     setServer(uri);
 }

suite/mailnews/search/FilterListDialog.xul

@@ -72,11 +72,15 @@
            accesskey="&filtersForPrefix.accesskey;" control="serverMenu"/>
 
       <menulist id="serverMenu"
-          datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
-          sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
-          sortDirection="ascending"
-          ref="msgaccounts:/"
-          oncommand="onFilterServerClick(event.target);">
+                class="folderMenuItem"
+                IsServer="true"
+                IsSecure="false"
+                ServerType="none"
+                datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
+                sortResource="http://home.netscape.com/NC-rdf#FolderTreeName"
+                sortDirection="ascending"
+                ref="msgaccounts:/"
+                oncommand="onFilterServerClick(event.target);">
           <template>
             <rule iscontainer="true" isempty="false" nc:ServerType="nntp">
               <menupopup>

suite/themes/classic/communicator/communicator.css

@@ -101,8 +101,9 @@
   margin: 0px !important;
 }
 
-/* ::::: iconic menuitems ::::: */
+/* ::::: iconic menus and menuitems ::::: */
 
+menu.menu-iconic > .menu-iconic-left,
 menuitem.menuitem-iconic > .menu-iconic-left {
   display: -moz-box;
 }