diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.css b/mozilla/xpfe/components/bookmarks/resources/bookmarks.css
index 78e3a16bb24..a760534116f 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.css
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.css
@@ -51,96 +51,96 @@
   }  
   
   
-treeitem[container="true"][open="true"][loading="true"] > treerow > treecell > .tree-icon
+treeitem[container="true"][open="true"][loading="true"] > treerow > .treecell-bookmark
 {
  list-style-image: url("resource:/res/rdf/loading.gif") ! important ;
 }
 
-treeitem[status="new"] > treerow > treecell > .tree-icon
+treeitem[status="new"] > treerow > .treecell-bookmark
 {
  list-style-image: url("resource:/res/rdf/loading.gif") ! important ;
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > treecell > .tree-icon,
-treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > treecell > .tree-icon,
-treeitem[container="true"][open="true"] > treerow > treecell > .tree-icon
+treeitem[type="http://home.netscape.com/NC-rdf#Folder"] > treerow > .treecell-bookmark,
+treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > .treecell-bookmark,
+treeitem[container="true"][open="true"] > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed.gif");
 }
 
-treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"] > treerow > treecell > .tree-icon,
-treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > treecell > .tree-icon,
-treeitem[selected="true"][container="true"][open="true"] > treerow > treecell > .tree-icon
+treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"] > treerow > .treecell-bookmark,
+treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"] > treerow > .treecell-bookmark,
+treeitem[selected="true"][container="true"][open="true"] > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-closed-sel.gif");
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > treecell > .tree-icon
-treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > treecell > .tree-icon
+treeitem[type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > .treecell-bookmark
+treeitem[type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
 }
 
-treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > treecell > .tree-icon,
-treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > treecell > .tree-icon
+treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][open="true"] > treerow > .treecell-bookmark,
+treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#IEFavoriteFolder"][open="true"] > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open-sel.gif");
 }
 
-treeitem[container="true"][open="true"] > treerow > treecell > .tree-icon {
+treeitem[container="true"][open="true"] > treerow > .treecell-bookmark {
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-folder-open.gif");
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > treecell > .tree-icon
+treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-closed.gif");
 }
 
-treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > treecell > .tree-icon
+treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"] > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-closed-sel.gif");
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > treecell > .tree-icon
+treeitem[type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-open.gif");
 }
 
-treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > treecell > .tree-icon
+treeitem[selected="true"][type="http://home.netscape.com/NC-rdf#Folder"][id="NC:PersonalToolbarFolder"][open="true"] > > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/personal-folder-open-sel.gif");
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > treecell > .tree-icon
+treeitem[type="http://home.netscape.com/NC-rdf#BookmarkSeparator"] > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > treecell > .tree-icon
+treeitem[type="http://home.netscape.com/NC-rdf#IEFavorite"] > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/iefavorite.gif");
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > treecell > .tree-icon
+treeitem[type="http://home.netscape.com/NC-rdf#Bookmark"] > treerow > .treecell-bookmark
 {
  list-style-image: url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > treecell > .tree-icon
+treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"][open="true"] > treerow > .treecell-bookmark
 {
  list-style-image: url("resource:/res/rdf/folder-open.gif");
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"] > treerow > treecell > .tree-icon
+treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"][container="true"] > treerow > .treecell-bookmark
 {
  list-style-image: url("resource:/res/rdf/folder-closed.gif");
 }
 
-treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"] > treerow > treecell > .tree-icon
+treeitem[type="http://home.netscape.com/NC-rdf#FileSystemObject"] > treerow > .treecell-bookmark
 {
  list-style-image: url("resource:/res/rdf/article.gif");
 }
 
-treeitem > treerow > treecell > .tree-icon {
+treeitem > treerow > .treecell-bookmark {
  list-style-image:url("chrome://communicator/skin/bookmarks/bookmark-item.gif");
 }
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.js b/mozilla/xpfe/components/bookmarks/resources/bookmarks.js
index 35f171ff662..df3545609c4 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.js
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.js
@@ -489,8 +489,6 @@ function OpenURL(event, node, root)
 	return(true);
 }
 
-
-
 function doSort(sortColName)
 {
 	var node = document.getElementById(sortColName);
@@ -952,3 +950,15 @@ function doContextCmd(cmdName)
 	debug("doContextCmd ends.");
 	return(true);
 }
+
+function bookmarkSelect()
+{
+  var tree = document.getElementById( "bookmarksTree" );
+  var status = document.getElementById( "statusbar-text" );
+  if( tree.selectedItems.length != 1 ) {
+    status.setAttribute( "value", "" );
+    return;
+  }
+  var url = tree.selectedItems[0].getAttribute("location");
+  status.setAttribute( "value", url );
+}
\ No newline at end of file
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
index f671e572f89..acd2ac11e30 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -41,6 +41,7 @@
   <html:script src="chrome://communicator/content/bookmarks/bookmarksDD.js"/>
   <html:script src="chrome://global/content/treePopups.js"/>
   <html:script src="chrome://global/content/strres.js"/>
+  <html:script src="chrome://global/content/globalOverlay.js"/>
 
   <menubar>
     <menu value="&menu.file.label;">
@@ -90,8 +91,10 @@
 
 <tree  id="bookmarksTree" ref="NC:BookmarksRoot" context="contextual"
        datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch rdf:httpindex"
-       onkeyup="if (event.keyCode == 8)	return doDelete(false);"
+       onkeyup="if (event.keyCode == 8)	return doDelete(false); if( event.keyCode == 13 ) OpenURL(event, event.target.parentNode.parentNode, this);"
+       onclick="OpenURL(event, event.target.parentNode.parentNode, this);"
        multiple="true"
+       onselect="bookmarkSelect();"
        ondragover="return DragOverTree(event);"
        ondraggesture="return BeginDragTree(event);"
        ondragdrop="return DropOnTree(event);"
@@ -119,6 +122,7 @@
      <rule>
       <treechildren>
        <treeitem uri="rdf:*" persist="open"
+         location="rdf:http://home.netscape.com/NC-rdf#URL"
          web:status="rdf:http://home.netscape.com/WEB-rdf#status"
          rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"
          loading="rdf:http://home.netscape.com/NC-rdf#loading">
@@ -212,8 +216,8 @@ of the tree so that the scrollbar is visible. Yes, I know this is not
 necessary for win32 or gtk, but we can use this area for information
 (maybe full URL of selected item or the like) in the future.
 -->
-<box id="status-bar" style="min-height:16px; max-height:16px;">
-  <button class="status-bar" align="left" value=""/>
+<box id="status-bar" style="height:16px; max-height:16px;">
+  <text id="statusbar-text" />
 </box>
 
 </window>