diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index 1dfa7216..fbcf111e 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -174,6 +174,9 @@
 		<preference id="extensions.treestyletab.show.context-menu-tabbarPosition"
 			name="extensions.treestyletab.show.context-menu-tabbarPosition"
 			type="bool"/>
+		<preference id="extensions.treestyletab.show.context-item-bookmarkTabSubTree"
+			name="extensions.treestyletab.show.context-item-bookmarkTabSubTree"
+			type="bool"/>
 	</preferences>
 
 	<vbox>
@@ -207,6 +210,11 @@
 				preference="extensions.treestyletab.show.context-menu-tabbarPosition"
 				label="&context.tabbarPosition.label;"/>
 		</hbox>
+		<hbox align="center">
+			<checkbox id="extensions.treestyletab.show.context-item-bookmarkTabSubTree-check"
+				preference="extensions.treestyletab.show.context-item-bookmarkTabSubTree"
+				label="&context.bookmarkTabSubTree.label;"/>
+		</hbox>
 	</groupbox>
 	<checkbox id="extensions.treestyletab.show.openSelectionLinks-check"
 		preference="extensions.treestyletab.show.openSelectionLinks"
diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index f4246715..2a0f541c 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -1360,7 +1360,7 @@ catch(e) {
 			));
 		}
 	},
- 	 
+  
 	destroy : function() 
 	{
 		window.removeEventListener('unload', this, false);
@@ -1564,7 +1564,7 @@ catch(e) {
 		}
 	},
  
-	showHideRemoveSubTreeMenuItem : function(aMenuItem, aTabs) 
+	showHideSubTreeMenuItem : function(aMenuItem, aTabs) 
 	{
 		if (!aMenuItem ||
 			aMenuItem.getAttribute('hidden') == 'true' ||
@@ -1586,7 +1586,7 @@ catch(e) {
 	},
   
 /* Commands */ 
-	
+	 
 	removeTabSubTree : function(aTabOrTabs, aOnlyChildren) 
 	{
 		var tabs = aTabOrTabs;
@@ -1624,7 +1624,7 @@ catch(e) {
 			b.removeTab(tabs[i]);
 		}
 	},
-	
+	 
 	cleanUpTabsArray : function(aTabs) 
 	{
 		var b = this.getTabBrowserFromChild(aTabs[0]);
@@ -1641,6 +1641,81 @@ catch(e) {
 		return aTabs;
 	},
   
+	bookmarkTabSubTree : function(aTabOrTabs) 
+	{
+		var tabs = aTabOrTabs;
+		if (!(tabs instanceof Array)) {
+			tabs = [aTabOrTabs];
+		}
+
+		var b = this.getTabBrowserFromChild(tabs[0]);
+		var bookmarkedTabs = [];
+		for (var i = 0, maxi = tabs.length; i < maxi; i++)
+		{
+			bookmarkedTabs.push(tabs[i]);
+			bookmarkedTabs = bookmarkedTabs.concat(b.treeStyleTab.getDescendantTabs(tabs[i]));
+		}
+
+		if ('MultipleTabService' in window &&
+			'addBookmarkFor' in MultipleTabService) {
+			MultipleTabService.addBookmarkFor(bookmarkedTabs);
+		}
+
+		this._addBookmarkFor(bookmarkedTabs);
+	},
+	 
+	_addBookmarkFor : function(aTabs) // from Multiple Tab Handler 
+	{
+		if (!aTabs) return;
+
+		var b = this.getTabBrowserFromChild(aTabs[0]);
+
+		if ('PlacesUIUtils' in window || 'PlacesUtils' in window) { // Firefox 3
+			var utils = 'PlacesUIUtils' in window ? PlacesUIUtils : PlacesUtils ;
+			utils.showMinimalAddMultiBookmarkUI(Array.slice(aTabs).map(function(aTab) {
+				return aTab.linkedBrowser.currentURI;
+			}));
+			return;
+		}
+
+		var currentTabInfo;
+		var tabsInfo = Array.slice(aTabs).map(function(aTab) {
+				var webNav = aTab.linkedBrowser.webNavigation;
+				var url    = webNav.currentURI.spec;
+				var name   = '';
+				var charSet, description;
+				try {
+					var doc = webNav.document;
+					name = doc.title || url;
+					charSet = doc.characterSet;
+					description = BookmarksUtils.getDescriptionFromDocument(doc);
+				}
+				catch (e) {
+					name = url;
+				}
+				return {
+					name        : name,
+					url         : url,
+					charset     : charSet,
+					description : description
+				};
+			});
+
+		window.openDialog(
+			'chrome://browser/content/bookmarks/addBookmark2.xul',
+			'',
+			BROWSER_ADD_BM_FEATURES,
+			(aTabs.length == 1 ?
+				tabsInfo[0] :
+				{
+					name             : gNavigatorBundle.getString('bookmarkAllTabsDefault'),
+					bBookmarkAllTabs : true,
+					objGroup         : tabsInfo
+				}
+			)
+		);
+	},
+ 	 
 	openSelectionLinks : function() 
 	{
 		var links = this.getSelectionLinks();
diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index 059bfdfe..2f840ad6 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -88,6 +88,12 @@
 					type="radio" value="bottom"/>
 			</menupopup>
 		</menu>
+
+
+		<menuitem id="context-item-bookmarkTabSubTree"
+			label="&context.bookmarkTabSubTree.label;"
+			accesskey="&context.bookmarkTabSubTree.accesskey;"
+			oncommand="TreeStyleTabService.bookmarkTabSubTree(TreeStyleTabService.getTabBrowserFromChild(this).mContextTab);"/>
 	</data>
 </window>
 
diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index d9807773..9103b1ef 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -18,6 +18,7 @@ TreeStyleTabBrowser.prototype = {
 	kMENUITEM_AUTOHIDE                 : 'context-item-toggleAutoHide',
 	kMENUITEM_FIXED                    : 'context-item-toggleFixed',
 	kMENUITEM_POSITION                 : 'context-menu-tabbarPosition',
+	kMENUITEM_BOOKMARKSUBTREE          : 'context-item-bookmarkTabSubTree',
 	 
 	mTabBrowser : null, 
 
@@ -445,6 +446,14 @@ TreeStyleTabBrowser.prototype = {
 				item.setAttribute('id', item.getAttribute('id')+suffix);
 				tabContext.appendChild(item);
 			});
+
+			var item = document.getElementById(aSelf.kMENUITEM_BOOKMARKSUBTREE).cloneNode(true);
+			item.setAttribute('id', item.getAttribute('id')+suffix);
+			var refNodes = tabContext.getElementsByAttribute('command', 'Browser:BookmarkAllTabs');
+			if (refNodes && refNodes.length)
+				tabContext.insertBefore(item, refNodes[0].nextSibling || refNodes[0]);
+			else
+				tabContext.appendChild(item);
 		}, 0, this);
 
 		var allTabPopup = document.getAnonymousElementByAttribute(b.mTabContainer, 'anonid', 'alltabs-popup');
@@ -1662,7 +1671,7 @@ TreeStyleTabBrowser.prototype = {
 			item.removeAttribute('hidden');
 		else
 			item.setAttribute('hidden', true);
-		this.showHideRemoveSubTreeMenuItem(item, [b.mContextTab]);
+		this.showHideSubTreeMenuItem(item, [b.mContextTab]);
 
 		item = this.evaluateXPath(
 			'descendant::xul:menuitem[starts-with(@id, "'+this.kMENUITEM_REMOVECHILDREN+'")]',
@@ -1673,7 +1682,7 @@ TreeStyleTabBrowser.prototype = {
 			item.removeAttribute('hidden');
 		else
 			item.setAttribute('hidden', true);
-		this.showHideRemoveSubTreeMenuItem(item, [b.mContextTab]);
+		this.showHideSubTreeMenuItem(item, [b.mContextTab]);
 
 		// collapse/expand all
 		sep = this.evaluateXPath(
@@ -1803,6 +1812,18 @@ TreeStyleTabBrowser.prototype = {
 		else {
 			sep.setAttribute('hidden', true);
 		}
+
+		// bookmark
+		item = this.evaluateXPath(
+			'descendant::xul:menuitem[starts-with(@id, "'+this.kMENUITEM_BOOKMARKSUBTREE+'")]',
+			aEvent.currentTarget,
+			XPathResult.FIRST_ORDERED_NODE_TYPE
+		).singleNodeValue;
+		if (this.getTreePref('show.'+this.kMENUITEM_BOOKMARKSUBTREE))
+			item.removeAttribute('hidden');
+		else
+			item.setAttribute('hidden', true);
+		this.showHideSubTreeMenuItem(item, [b.mContextTab]);
 	},
  
 	initAllTabsPopup : function(aEvent) 
diff --git a/defaults/preferences/treestyletab.js b/defaults/preferences/treestyletab.js
index 039f53e8..9e8d6bd3 100644
--- a/defaults/preferences/treestyletab.js
+++ b/defaults/preferences/treestyletab.js
@@ -47,6 +47,7 @@ pref("extensions.treestyletab.show.context-item-expandAllSubtree", true);
 pref("extensions.treestyletab.show.context-item-toggleAutoHide", true);
 pref("extensions.treestyletab.show.context-item-toggleFixed", true);
 pref("extensions.treestyletab.show.context-menu-tabbarPosition", true);
+pref("extensions.treestyletab.show.context-item-bookmarkTabSubTree", true);
 
 pref("extensions.treestyletab.openOuterLinkInNewTab",              false);
 pref("extensions.treestyletab.openAnyLinkInNewTab",                false);
diff --git a/locale/de-DE/treestyletab/treestyletab.dtd b/locale/de-DE/treestyletab/treestyletab.dtd
index f6b8a645..bf96c8b8 100644
--- a/locale/de-DE/treestyletab/treestyletab.dtd
+++ b/locale/de-DE/treestyletab/treestyletab.dtd
@@ -135,3 +135,5 @@
 <!ENTITY context.toggleFixed.accesskey "f">
 <!ENTITY context.tabbarPosition.label     "Position">
 <!ENTITY context.tabbarPosition.accesskey "p">
+<!ENTITY context.bookmarkTabSubTree.label     "Bookmark this Tree...">
+<!ENTITY context.bookmarkTabSubTree.accesskey "t">
diff --git a/locale/en-US/treestyletab/treestyletab.dtd b/locale/en-US/treestyletab/treestyletab.dtd
index 13b03bc7..d997ba1b 100644
--- a/locale/en-US/treestyletab/treestyletab.dtd
+++ b/locale/en-US/treestyletab/treestyletab.dtd
@@ -135,3 +135,5 @@
 <!ENTITY context.toggleFixed.accesskey "f">
 <!ENTITY context.tabbarPosition.label     "Position">
 <!ENTITY context.tabbarPosition.accesskey "p">
+<!ENTITY context.bookmarkTabSubTree.label     "Bookmark this Tree...">
+<!ENTITY context.bookmarkTabSubTree.accesskey "t">
diff --git a/locale/es-ES/treestyletab/treestyletab.dtd b/locale/es-ES/treestyletab/treestyletab.dtd
index 188a8569..cf7a116e 100644
--- a/locale/es-ES/treestyletab/treestyletab.dtd
+++ b/locale/es-ES/treestyletab/treestyletab.dtd
@@ -135,3 +135,5 @@
 <!ENTITY context.toggleFixed.accesskey "f">
 <!ENTITY context.tabbarPosition.label     "Posición">
 <!ENTITY context.tabbarPosition.accesskey "p">
+<!ENTITY context.bookmarkTabSubTree.label     "Bookmark this Tree...">
+<!ENTITY context.bookmarkTabSubTree.accesskey "t">
diff --git a/locale/it-IT/treestyletab/treestyletab.dtd b/locale/it-IT/treestyletab/treestyletab.dtd
index 7e29444c..ce7edfc2 100644
--- a/locale/it-IT/treestyletab/treestyletab.dtd
+++ b/locale/it-IT/treestyletab/treestyletab.dtd
@@ -135,3 +135,5 @@
 <!ENTITY context.toggleFixed.accesskey "h">
 <!ENTITY context.tabbarPosition.label     "Posiziona">
 <!ENTITY context.tabbarPosition.accesskey "p">
+<!ENTITY context.bookmarkTabSubTree.label     "Bookmark this Tree...">
+<!ENTITY context.bookmarkTabSubTree.accesskey "t">
diff --git a/locale/ja/treestyletab/treestyletab.dtd b/locale/ja/treestyletab/treestyletab.dtd
index a3cdad6c..d59bb792 100644
--- a/locale/ja/treestyletab/treestyletab.dtd
+++ b/locale/ja/treestyletab/treestyletab.dtd
@@ -133,3 +133,5 @@
 <!ENTITY context.toggleFixed.accesskey "f">
 <!ENTITY context.tabbarPosition.label     "タブバーの位置">
 <!ENTITY context.tabbarPosition.accesskey "p">
+<!ENTITY context.bookmarkTabSubTree.label     "このサブツリーをブックマーク...">
+<!ENTITY context.bookmarkTabSubTree.accesskey "t">
diff --git a/locale/zh-CN/treestyletab/treestyletab.dtd b/locale/zh-CN/treestyletab/treestyletab.dtd
index 7b8a608c..c6bff90e 100644
--- a/locale/zh-CN/treestyletab/treestyletab.dtd
+++ b/locale/zh-CN/treestyletab/treestyletab.dtd
@@ -135,3 +135,5 @@
 <!ENTITY context.toggleFixed.accesskey "f">
 <!ENTITY context.tabbarPosition.label     "位置">
 <!ENTITY context.tabbarPosition.accesskey "p">
+<!ENTITY context.bookmarkTabSubTree.label     "Bookmark this Tree...">
+<!ENTITY context.bookmarkTabSubTree.accesskey "t">
diff --git a/locale/zh-TW/treestyletab/treestyletab.dtd b/locale/zh-TW/treestyletab/treestyletab.dtd
index 74409d02..a7e94324 100644
--- a/locale/zh-TW/treestyletab/treestyletab.dtd
+++ b/locale/zh-TW/treestyletab/treestyletab.dtd
@@ -130,3 +130,5 @@
 <!ENTITY context.toggleFixed.accesskey "f">
 <!ENTITY context.tabbarPosition.label     "分頁工具列的位置">
 <!ENTITY context.tabbarPosition.accesskey "p">
+<!ENTITY context.bookmarkTabSubTree.label     "Bookmark this Tree...">
+<!ENTITY context.bookmarkTabSubTree.accesskey "t">