diff --git a/mailnews/ui/messenger/resources/AccountManager.js b/mailnews/ui/messenger/resources/AccountManager.js
index 139597f9cb07..a105cd668807 100644
--- a/mailnews/ui/messenger/resources/AccountManager.js
+++ b/mailnews/ui/messenger/resources/AccountManager.js
@@ -1,2 +1,41 @@
 
+var RDF = Components.classes['component://netscape/rdf/rdf-service'].getService();
+RDF = RDF.QueryInterface(Components.interfaces.nsIRDFService);
+var pageTagArc = RDF.GetResource("http://home.netscape.com/NC-rdf#PageTag");
+
+function showPage(event) {
+
+  var node = event.target.parentNode;
+  var uri = node.getAttribute('id');
+
+  var server = node.parentNode.parentNode;
+  var serveruri = server.getAttribute('id');
+
+  var pageResource = RDF.GetResource(uri);
+
+  // we have to do this extra QI because of a bug in XPConnect
+  var db = document.getElementById("accounttree").database;
+  var db2 = db.QueryInterface(Components.interfaces.nsIRDFDataSource);
+
+  // convert node->literal
+  var newPageNode = db2.GetTarget(pageResource, pageTagArc, true);
+  var newPageResource = newPageNode.QueryInterface(Components.interfaces.nsIRDFLiteral);
+  
+  var pageURI = newPageResource.Value;
+
+  var destFrame = window.parent.frames["prefframe"];
+
+  var oldLocation = new String(destFrame.location);
+  var lastSlashPos = oldLocation.lastIndexOf('/');
+
+  if (lastSlashPos >= 0) {
+    var newLocation = oldLocation.slice(0, lastSlashPos+1);
+    newLocation += pageURI;
+  }
+  
+  if (oldLocation != newLocation) {
+    destFrame.location = newLocation;
+  }
+}
+
 
diff --git a/mailnews/ui/messenger/resources/AccountManager.xul b/mailnews/ui/messenger/resources/AccountManager.xul
index 83b071e043df..52d06a4e424b 100644
--- a/mailnews/ui/messenger/resources/AccountManager.xul
+++ b/mailnews/ui/messenger/resources/AccountManager.xul
@@ -8,8 +8,8 @@
   <script language="javascript" src="AccountManager.js"/>
 
 <frameset cols="25%,75%">
-  <frame name="accounttree" id="accounttree" src="am-test.xul" scrolling="auto"/>
-  <frame name="am-main" id="am-main" src="am-main.xul" resize="yes" scrolling="auto"/>
+  <frame name="accounttree" id="accounttree" src="accounttree.xul" scrolling="auto"/>
+  <frame name="prefframe" id="prefframe" src="am-main.xul" resize="yes" scrolling="auto"/>
 </frameset>
 
 </xul:window>
diff --git a/mailnews/ui/messenger/resources/Makefile.in b/mailnews/ui/messenger/resources/Makefile.in
index 2ba8064ae4e1..fd98e88bb5a8 100644
--- a/mailnews/ui/messenger/resources/Makefile.in
+++ b/mailnews/ui/messenger/resources/Makefile.in
@@ -57,6 +57,7 @@ EXPORT_RESOURCE_SAMPLES = \
 	$(srcdir)/AccountManager.xul	\
 	$(srcdir)/AccountManager.js		\
 	$(srcdir)/accounttree.xul	\
+	$(srcdir)/accounttree.css		\
 	$(srcdir)/am-main.xul		\
 	$(srcdir)/am-test.xul		\
 	$(srcdir)/am-server.xul		\
@@ -69,6 +70,9 @@ EXPORT_RESOURCE_SAMPLES = \
 	$(srcdir)/am-advanced.xul	\
 	$(srcdir)/SearchDialog.xul	\
 	$(srcdir)/FilterListDialog.xul	\
+	$(srcdir)/FilterEditor.xul		\
+	$(srcdir)/FilterEditor.js		\
+	$(srcdir)/test1.html			\
 	$(NULL)
 
 EXPORT_RESOURCE_SAMPLES_TO_REMOVE := $(addprefix $(SAMPLES_DIR)/, $(EXPORT_RESOURCE_SAMPLES))
diff --git a/mailnews/ui/messenger/resources/accounttree.css b/mailnews/ui/messenger/resources/accounttree.css
new file mode 100644
index 000000000000..daf532eb66db
--- /dev/null
+++ b/mailnews/ui/messenger/resources/accounttree.css
@@ -0,0 +1,38 @@
+tree {
+  display: table;
+  background-color: white;
+  border: none;
+  border-spacing: 0px;
+  width: 100%;
+}
+
+treeitem {
+  display: table-row;
+}
+
+treehead {
+/*  display: table-header-group; */
+}
+
+treebody {
+  display: table-row-group;
+}
+
+treecell {
+  display: table-cell;
+  color: black;
+  font-family: Veranda;
+  font-size: 12pt;
+}
+
+treecell[selectedcell] { 
+ background-color: #666699; 
+ color: white;
+} 
+
+treehead treeitem treecell { 
+ font-size: 9pt;
+ background-color: #666699; 
+ border: thin darkgray solid; 
+ color: white;
+} 
diff --git a/mailnews/ui/messenger/resources/accounttree.xul b/mailnews/ui/messenger/resources/accounttree.xul
index 514fdf732f80..80a6d95cf5d2 100644
--- a/mailnews/ui/messenger/resources/accounttree.xul
+++ b/mailnews/ui/messenger/resources/accounttree.xul
@@ -1,58 +1,39 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="resource:/res/samples/xul.css" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
+<?xml-stylesheet href="accounttree.css" type="text/css"?>
 
 <!DOCTYPE window>
 
 <xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        onload = ""> 
-
+        style="width:100%"
+        onload = "">
+<html:script language="JavaScript" src="AccountManager.js"/>
 <tree rdf:datasources="rdf:msgaccountmanager"
-  onclick="return ClickChangePanel(event.target);"> 
+  onclick="showPage(event)"
+  id="accounttree">
   <treecol rdf:resource="http://home.netscape.com/NC-rdf#Name"/>
   <treehead>
     <treecell>Name</treecell>
   </treehead>
 
-  <treebody rdf:containment="http://home.netscape.com/NC-rdf#settings">
-    <treeitem id="msgaccounts:/" open="true">
-      <treecell><treeindentation/>RealAccounts</treecell>
-    </treeitem>
-    <treeitem>
-      <treecell name="Account"><treeindentation/>FakeAccount1</treecell>
-	  <treechildren>
-        <treeitem>
-            <treecell name="MailServers">
-               <treeindentation/>Server
-            </treecell>
-        </treeitem>
-        <treeitem>
-            <treecell name="CopiesFolders">
-               <treeindentation/>Copies &amp; Folders
-            </treecell>
-        </treeitem>
-        <treeitem>
-            <treecell name="Advanced">
-               <treeindentation/>Advanced
-            </treecell>
-        </treeitem>
-      </treechildren>
-    
-    </treeitem>
-    
+  <treebody rdf:containment="http://home.netscape.com/NC-rdf#Settings">
+    <treeitem id="msgaccounts:/" open="true"/>
   </treebody>
   
 </tree>
-<html:form>
-<html:center>
-  <html:button type="button" name="Duplicate">Duplicate</html:button>
-  <html:button type="button" name="Delete">Delete</html:button>
-<html:br/>
-<html:button type="button" name="NewAccount">New Account</html:button>
-<html:br/>
-<html:button type="button" name="Default">Set as Default</html:button>
-</html:center>
-</html:form>
+<box align="vertical">
+<box align="horizontal">
+<titledbutton class="push" flex="50%" name="Duplicate" value="Duplicate"/>
+<titledbutton class="push" flex="50%" name="Delete" value="Delete"/>
+</box>
+<box align="horizontal">
+<titledbutton class="push" name="NewAccount" value="New Account" flex="100%"/>
+</box>
+<box align="horizontal">
+<titledbutton class="push" name="Default" value="Set As Default" flex="100%"/>
+</box>
+</box>
 </xul:window>
diff --git a/mailnews/ui/messenger/resources/makefile.win b/mailnews/ui/messenger/resources/makefile.win
index dc9e822e4a3b..442097f06c30 100644
--- a/mailnews/ui/messenger/resources/makefile.win
+++ b/mailnews/ui/messenger/resources/makefile.win
@@ -52,6 +52,7 @@ install::
 	$(MAKE_INSTALL) AccountManager.xul	$(DIST)\bin\res\mailnews\messenger
 	$(MAKE_INSTALL) AccountManager.js	$(DIST)\bin\res\mailnews\messenger
 	$(MAKE_INSTALL) accounttree.xul		$(DIST)\bin\res\mailnews\messenger
+	$(MAKE_INSTALL) accounttree.css		$(DIST)\bin\res\mailnews\messenger
 	$(MAKE_INSTALL) am-main.xul			$(DIST)\bin\res\mailnews\messenger
 	$(MAKE_INSTALL) am-test.xul			$(DIST)\bin\res\mailnews\messenger
 	$(MAKE_INSTALL) am-server.xul		$(DIST)\bin\res\mailnews\messenger
@@ -84,6 +85,7 @@ clobber::
 	rm -f $(DIST)\res\mailnews\messenger\AccountManager.xul
 	rm -f $(DIST)\res\mailnews\messenger\AccountManager.js
 	rm -f $(DIST)\res\mailnews\messenger\accounttree.xul
+	rm -f $(DIST)\res\mailnews\messenger\accounttree.css
 	rm -f $(DIST)\res\mailnews\messenger\am-main.xul
 	rm -f $(DIST)\res\mailnews\messenger\am-test.xul
 	rm -f $(DIST)\res\mailnews\messenger\am-server.xul