diff --git a/content/treestyletab/treestyletab.js b/content/treestyletab/treestyletab.js
index 0db388c5..4f8026fd 100644
--- a/content/treestyletab/treestyletab.js
+++ b/content/treestyletab/treestyletab.js
@@ -406,7 +406,7 @@ var TreeStyleTabService = {
 			var adoption   = this.getPref('extensions.treestyletab.adoptChildrenToGrandParentOnRemoveTab');
 			var processTab = !adoption ? function(aTab) {
 					self.repudiateTab(aTab);
-					b.moveTabTo(aTab, b.mTabContainer.lastChild._tPos);
+					self.moveTabSubTreeTo(aTab, b.mTabContainer.lastChild._tPos);
 				} :
 				parentTab ? function(aTab) {
 					self.adoptTabTo(aTab, parentTab, tab);
@@ -612,13 +612,21 @@ var TreeStyleTabService = {
 		return lastChild;
 	},
  
-	getChildTabsOf : function(aTab) 
+	getDescendantTabsOf : function(aTab) 
+	{
+		var tabs = [];
+		this.getChildTabsOf(aTab, tabs);
+		return tabs;
+	},
+ 
+	getChildTabsOf : function(aTab, aAllTabsArray) 
 	{
 		var tabs     = [];
-		var id       = aTab.getAttribute(this.kID);
 		var children = aTab.getAttribute(this.kCHILDREN);
 		if (!children) return tabs;
 
+		if (aAllTabsArray) tabs = aAllTabsArray;
+
 		var list = children.split('|');
 		var b    = this.getTabBrowserFromChildren(aTab);
 		var tab;
@@ -629,6 +637,8 @@ var TreeStyleTabService = {
 			tab = this.getTabById(list[i], b)
 			if (tab) {
 				tabs.push(tab);
+				if (aAllTabsArray)
+					this.getChildTabsOf(tab, tabs);
 			}
 			else {
 				children = children.replace('|'+list[i], '');
@@ -642,7 +652,6 @@ var TreeStyleTabService = {
  
 	getFirstChildTabOf : function(aTab) 
 	{
-		var id         = aTab.getAttribute(this.kID);
 		var b          = this.getTabBrowserFromChildren(aTab);
 		var children   = aTab.getAttribute(this.kCHILDREN);
 		var firstChild = null;
@@ -664,7 +673,6 @@ var TreeStyleTabService = {
  
 	getLastChildTabOf : function(aTab) 
 	{
-		var id        = aTab.getAttribute(this.kID);
 		var b         = this.getTabBrowserFromChildren(aTab);
 		var children  = aTab.getAttribute(this.kCHILDREN);
 		var lastChild = null;
@@ -750,6 +758,19 @@ var TreeStyleTabService = {
 			this.updateTabsIndent(this.getChildTabsOf(aTabs[i]), aLevel+1);
 		}
 	},
+ 
+	moveTabSubTreeTo : function(aTab, aIndex) 
+	{
+		var tabs = this.getDescendantTabsOf(aTab);
+
+		var b = this.getTabBrowserFromChildren(aTab);
+		b.moveTabTo(aTab, aIndex);
+
+		for (var i = 0, maxi = tabs.length; i < maxi; i++)
+		{
+			b.moveTabTo(tabs[i], aTab._tPos+i+1);
+		}
+	},
  	 
 /* Pref Listener */ 
 	 
diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index 0509ad9c..b429b744 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -1,10 +1,7 @@
 <?xml version="1.0"?>
-
 <?xml-stylesheet href="treestyletab.css" type="text/css"?>
 <?xml-stylesheet href="chrome://treestyletab/skin/treestyletab.css" type="text/css"?>
-
 <!DOCTYPE overlay SYSTEM "chrome://treestyletab/locale/treestyletab.dtd">
-
 <overlay id="treestyletab-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
          xmlns:html="http://www.w3.org/1999/xhtml">