diff --git a/mozilla/mailnews/base/resources/content/folderPane.xul b/mozilla/mailnews/base/resources/content/folderPane.xul
index 6ed308fd67f..ccb88fe7372 100644
--- a/mozilla/mailnews/base/resources/content/folderPane.xul
+++ b/mozilla/mailnews/base/resources/content/folderPane.xul
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 <!--
  The contents of this file are subject to the Netscape Public
  License Version 1.1 (the "License"); you may not use this file
@@ -22,16 +21,15 @@
 -->
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/folderpane.dtd">
 
-<window
+<overlay
   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="top.OnLoadFolderPane(document.getElementById('folderTree'))">
+  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
-<html:div flex="100%">
+<html:div id="folder-panel" flex="100%">
 <tree style="height: 100%"
       rdf:datasources="rdf:null"
-      id="folderTree"
+      id="folderTree" class="mail-folders"
       rdf:ignore="http://home.netscape.com/NC-rdf#MessageChild"
       onclick="return top.ChangeFolderByDOMNode(event.target.parentNode.parentNode)">
 
@@ -66,4 +64,4 @@
 
 </tree>
 </html:div>
-</window>
+</overlay>
diff --git a/mozilla/mailnews/base/resources/content/messenger.xul b/mozilla/mailnews/base/resources/content/messenger.xul
index 2289f65bd17..43f33a3ef50 100644
--- a/mozilla/mailnews/base/resources/content/messenger.xul
+++ b/mozilla/mailnews/base/resources/content/messenger.xul
@@ -24,6 +24,8 @@ Rights Reserved.
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://messenger/content/threadPane.xul"?>
+<?xul-overlay href="chrome://messenger/content/folderPane.xul"?>
+<?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
 <?xul-overlay href="chrome://sidebar/content/sidebarOverlay.xul"?>
 <?xml-stylesheet href="chrome://sidebar/skin/sidebarOverlay.css" type="text/css"?> 
 
@@ -98,8 +100,10 @@ Rights Reserved.
 
   <!-- The main mail three pane frame -->
   <box align="horizontal" style="height:100px" flex="1">
-    <box id="sidebarbox" />
-    <splitter id="sidebarsplitter" collapse="before" persist="state"/>
+      <box id="sidebar-box">
+        <html:div id="folder-panel"/>
+      </box>
+      <splitter id="sidebar-splitter" collapse="before" persist="state"/>
     <box align="vertical"  flex="1"  style="border-left:solid black 1px">
       <toolbox>
         <menubar>
@@ -166,6 +170,7 @@ Rights Reserved.
               <menuseparator/>
             </menupopup>
           </menu>
+>>>>>>> 1.79
 	
 	<menu id="menu_Edit">
 		<menupopup>