diff --git a/suite/browser/navigator.js b/suite/browser/navigator.js
index 810d36a6925..af91839f079 100644
--- a/suite/browser/navigator.js
+++ b/suite/browser/navigator.js
@@ -620,8 +620,56 @@ function BrowserHome()
   loadURI(homePage);
 }
 
+function OpenBookmarkGroup(element, datasource)
+{
+  if (!datasource)
+    return;
+    
+  var id = element.getAttribute("id");
+  var rdf = Components.classes["@mozilla.org/rdf/rdf-service;1"]
+                          .getService(Components.interfaces.nsIRDFService);
+  var resource = rdf.GetResource(id, true);
+  return OpenBookmarkGroupFromResource(resource, datasource, rdf);
+}
+
+function OpenBookmarkGroupFromResource(resource, datasource, rdf) {
+  var urlResource = rdf.GetResource("http://home.netscape.com/NC-rdf#URL");
+  var rdfContainer = Components.classes["@mozilla.org/rdf/container;1"].getService(Components.interfaces.nsIRDFContainer);
+  rdfContainer.Init(datasource, resource);
+  var containerChildren = rdfContainer.GetElements();
+  var tabPanels = gBrowser.mPanelContainer.childNodes;
+  var tabCount = tabPanels.length;
+  var index = 0;
+  while (containerChildren.hasMoreElements()) {
+    var resource = containerChildren.getNext().QueryInterface(Components.interfaces.nsIRDFResource);
+    var target = datasource.GetTarget(resource, urlResource, true);
+    if (target) {
+      var uri = target.QueryInterface(Components.interfaces.nsIRDFLiteral).Value;
+      if (index < tabCount)
+        tabPanels[index].loadURI(uri, null, nsIWebNavigation.LOAD_FLAGS_NONE);
+      else
+        gBrowser.addTab(uri);
+      index++;
+    }
+  }  
+  
+  if (index == 0)
+    return; // If the bookmark group was completely invalid, just bail.
+     
+  // Select the first tab in the group.
+  var tabs = gBrowser.mTabContainer.childNodes;
+  gBrowser.selectedTab = tabs[0];
+  
+  // Close any remaining open tabs that are left over.
+  for (var i = tabCount-1; i >= index; i--)
+    gBrowser.removeTab(tabs[i]);
+}
+
 function OpenBookmarkURL(node, datasources)
 {
+  if (node.getAttribute("group") == "true")
+    OpenBookmarkGroup(node, datasources);
+    
   if (node.getAttribute("container") == "true")
     return;
 
diff --git a/suite/browser/navigator.xul b/suite/browser/navigator.xul
index 97dc38f1467..ce5465a61b5 100644
--- a/suite/browser/navigator.xul
+++ b/suite/browser/navigator.xul
@@ -281,15 +281,13 @@ Contributor(s): ______________________________________. -->
            ref="NC:PersonalToolbarFolder" flags="dont-test-empty"
            rdf:type="http://home.netscape.com/NC-rdf#Folder"
            oncommand="OpenBookmarkURL(event.target, document.getElementById('innermostBox').database)">
-
         <tooltip id="ptTooltip" noautohide="true" onpopupshowing="return FillInPTTooltip(document.tooltipNode)">
           <vbox id="ptTooltipTextBox" flex="1">  
             <label id="ptTitleText" />
             <label id="ptUrlText" />
           </vbox>
         </tooltip>
-
-        <template>
+        <template xmlns:nc="http://home.netscape.com/NC-rdf#">
           <rule parent="hbox" rdf:type="http://home.netscape.com/NC-rdf#BookmarkSeparator">
             <toolbarseparator uri="rdf:*"
                               rdf:type="rdf:http://www.w3.org/1999/02/22-rdf-syntax-ns#type"/>
@@ -297,6 +295,14 @@ Contributor(s): ______________________________________. -->
 
           <!-- yes, the type attribute is necessary otherwise all leaves are 
                treated as containers for some reason -->
+          <rule parent="hbox" iscontainer="true"
+                nc:FolderGroup="true">
+            <toolbarbutton class="bookmark-item bookmark-group" uri="rdf:*" xulcontentsgenerated="true" 
+                           group="true"
+                           container="false"
+                           rdf:type="http://home.netscape.com/NC-rdf#Folder"
+                           label="rdf:http://home.netscape.com/NC-rdf#Name"/>
+          </rule>
           <rule parent="hbox" iscontainer="true" isempty="true"
                 rdf:type="http://home.netscape.com/NC-rdf#Folder">
             <toolbarbutton type="menu" editable="true" class="bookmark-item"
diff --git a/suite/browser/navigatorOverlay.xul b/suite/browser/navigatorOverlay.xul
index 369c1bf497a..bc50a804707 100644
--- a/suite/browser/navigatorOverlay.xul
+++ b/suite/browser/navigatorOverlay.xul
@@ -296,7 +296,16 @@
           datasources="rdf:bookmarks rdf:files rdf:localsearch rdf:internetsearch" 
           ref="NC:BookmarksRoot" flags="dont-test-empty" template="bookmarksMenuTemplate"
           oncommand="OpenBookmarkURL(event.target, document.getElementById('BookmarksMenu').database)">
-      <template id="bookmarksMenuTemplate">
+      <template id="bookmarksMenuTemplate" xmlns:nc="http://home.netscape.com/NC-rdf#">
+        <rule nc:FolderGroup="true" iscontainer="true">
+          <menupopup>
+            <menuitem class="menuitem-iconic bookmark-group" 
+                      label="rdf:http://home.netscape.com/NC-rdf#Name"
+                      group="true"
+                      uri="rdf:*"
+                      xulcontentsgenerated="true"/>
+          </menupopup>
+        </rule>
         <rule iscontainer="true" isempty="true"
               rdf:type="http://home.netscape.com/NC-rdf#Folder">
           <menupopup>