diff --git a/mozilla/mailnews/base/resources/content/newFolderNameDialog.xul b/mozilla/mailnews/base/resources/content/newFolderNameDialog.xul
index df38b0ce547..0cc6dccff67 100644
--- a/mozilla/mailnews/base/resources/content/newFolderNameDialog.xul
+++ b/mozilla/mailnews/base/resources/content/newFolderNameDialog.xul
@@ -25,6 +25,7 @@ Rights Reserved.
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:nc="http://home.netscape.com/NC-rdf#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         align="vertical"
         class="dialog"
@@ -46,10 +47,17 @@ Rights Reserved.
 		<html:select id="selectedparentfolder" 
           datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
           ref="msgaccounts:/">
+	<html:div flex="100%"/>
           <template>
-              <html:option uri="..." value="...">
-                <text value="rdf:http://home.netscape.com/NC-rdf#Name"/>
-              </html:option>
+		<rule nc:ServerType="pop3">
+		      <html:option uri="..." value="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+		</rule>
+		<rule nc:ServerType="none">
+		      <html:option uri="..." value="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+		</rule>
+		<rule nc:ServerType="imap">
+		      <html:option uri="..." value="..." label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+		</rule>
           </template>
         </html:select>
 		<spring flex="100%"/>
diff --git a/mozilla/mailnews/base/resources/content/subscribeDialog.xul b/mozilla/mailnews/base/resources/content/subscribeDialog.xul
index c27ee8c9dbf..e826bd12073 100644
--- a/mozilla/mailnews/base/resources/content/subscribeDialog.xul
+++ b/mozilla/mailnews/base/resources/content/subscribeDialog.xul
@@ -25,6 +25,7 @@ Rights Reserved.
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:nc="http://home.netscape.com/NC-rdf#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         align="vertical"
         class="dialog"
@@ -43,13 +44,13 @@ Rights Reserved.
 		
 		<html:input tabindex="0" type="text" id="name" style="width:100%"/>
 
-		<html:select id="selectedparentfolder"
+		<html:select id="selectedparentfolder" 
           datasources="rdf:msgaccountmanager rdf:mailnewsfolders"
           ref="msgaccounts:/">
           <template>
-              <html:option uri="..." value="..." >
-                <text value="rdf:http://home.netscape.com/NC-rdf#Name"/>
-              </html:option>
+		<rule nc:ServerType="nntp" nc:IsServer="true" >
+		      <html:option uri="..." value="..." label="rdf:http://home.netscape.com/NC-rdf#Name" />
+		</rule>
           </template>
         </html:select>
 		<spring flex="100%"/>