diff --git a/addressbook/setup/etemplates.inc.php b/addressbook/setup/etemplates.inc.php
index de7831eea1..703a40addd 100755
--- a/addressbook/setup/etemplates.inc.php
+++ b/addressbook/setup/etemplates.inc.php
@@ -2,7 +2,7 @@
 	/**
 	 * eGroupWare - eTemplates for Application addressbook
 	 * http://www.egroupware.org 
-	 * generated by soetemplate::dump4setup() 2007-07-11 17:15
+	 * generated by soetemplate::dump4setup() 2007-07-22 14:41
 	 *
 	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	 * @package addressbook
@@ -34,6 +34,8 @@ $templ_data[] = array('name' => 'addressbook.edit.access','template' => '','lang
 
 $templ_data[] = array('name' => 'addressbook.edit.cats','template' => '','lang' => '','group' => '0','version' => '1.3.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:1:{s:2:"c1";s:4:",top";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:13:"13,,width:99%";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"size";s:17:"100%,258,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";}}}','size' => '100%,258,,,,,auto','style' => '','modified' => '1165513081',);
 
+$templ_data[] = array('name' => 'addressbook.edit.cats','template' => '','lang' => '','group' => '0','version' => '1.4.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:3:{s:2:"c1";s:4:",top";s:1:"C";s:14:",@cat_tab=Tree";s:1:"D";s:15:",!@cat_tab=Tree";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:14:"013,,width:99%";}s:1:"D";a:3:{s:4:"type";s:8:"tree-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:13:"13,,width:99%";}}}s:4:"rows";i:1;s:4:"cols";i:4;s:4:"size";s:17:"100%,258,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";}}}','size' => '100%,258,,,,,auto','style' => '','modified' => '1165513081',);
+
 $templ_data[] = array('name' => 'addressbook.edit.custom','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:2:"h2";s:4:"100%";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}i:2;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:4:",320";s:7:"options";a:1:{i:1;s:3:"320";}}}','size' => ',320','style' => '','modified' => '1130529421',);
 
 $templ_data[] = array('name' => 'addressbook.edit.custom','template' => '','lang' => '','group' => '0','version' => '1.0.1.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:1:{s:2:"h2";s:4:"100%";}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:12:"customfields";}}i:2;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:4:",250";s:7:"options";a:1:{i:1;s:3:"250";}}}','size' => ',250','style' => '','modified' => '1130529421',);
diff --git a/addressbook/templates/default/config.tpl b/addressbook/templates/default/config.tpl
index be9016cbec..2750e6dfb1 100644
--- a/addressbook/templates/default/config.tpl
+++ b/addressbook/templates/default/config.tpl
@@ -43,6 +43,7 @@
      <select name="newsettings[cat_tab]">
       <option value="">{lang_No}</option>
       <option value="True"{selected_cat_tab_True}>{lang_Yes}</option>
+      <option value="Tree"{selected_cat_tab_Tree}>{lang_Yes}, {lang_Category_tree}</option>
      </select>
     </td>
    </tr>
diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index 91e79083e8..525a25fc62 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -159,18 +159,20 @@
 			</rows>
 		</grid>
 	</template>
-	<template id="addressbook.edit.cats" template="" lang="" group="0" version="1.3.004">
+	<template id="addressbook.edit.cats" template="" lang="" group="0" version="1.4.001">
 		<grid width="100%" height="258" overflow="auto">
 			<columns>
 				<column/>
 				<column/>
-				<column/>
+				<column disabled="@cat_tab=Tree"/>
+				<column disabled="!@cat_tab=Tree"/>
 			</columns>
 			<rows>
 				<row valign="top">
 					<image src="folder"/>
 					<description value="Categories"/>
-					<listbox type="select-cat" id="cat_id" rows="13" options=",width:99%"/>
+					<listbox type="select-cat" id="cat_id" rows="013" options=",width:99%"/>
+					<tree-cat id="cat_id" options="13,,width:99%"/>
 				</row>
 			</rows>
 		</grid>