diff --git a/addressbook/setup/etemplates.inc.php b/addressbook/setup/etemplates.inc.php
index bffb2438e1..e1df14f230 100755
--- a/addressbook/setup/etemplates.inc.php
+++ b/addressbook/setup/etemplates.inc.php
@@ -1,5 +1,5 @@
 <?php
-// eTemplates for Application 'addressbook', generated by soetemplate::dump4setup() 2006-03-14 15:25
+// eTemplates for Application 'addressbook', generated by soetemplate::dump4setup() 2006-03-20 22:55
 
 /* $Id$ */
 
@@ -41,7 +41,7 @@ $templ_data[] = array('name' => 'addressbook.edit.personal','template' => '','la
 
 $templ_data[] = array('name' => 'addressbook.edit.personal','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:9:{i:0;a:2:{s:2:"h6";s:2:"40";s:2:"c7";s:4:",top";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"personal";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"prefix";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_prefix";s:4:"size";s:5:"45,64";s:8:"tabindex";i:1;}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"first name";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:7:"n_given";s:4:"size";s:5:"45,64";s:8:"tabindex";i:2;}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"middle name";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_middle";s:4:"size";s:5:"45,64";s:8:"tabindex";i:3;}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"last name";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_family";s:4:"size";s:5:"45,64";s:8:"tabindex";i:4;}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"suffix";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_suffix";s:4:"size";s:5:"45,64";s:8:"tabindex";i:5;}}i:6;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"gohome";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"company name";s:4:"size";s:11:",,,org_name";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:8:"org_name";s:8:"tabindex";i:5;}}i:7;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:8:"category";}s:1:"C";a:5:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:1:"3";s:4:"span";s:1:"4";s:8:"tabindex";i:6;}}i:8;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"password";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:10:",,,private";}s:1:"C";a:3:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"private";s:8:"tabindex";i:7;}}}s:4:"rows";i:8;s:4:"cols";i:3;s:4:"size";s:4:",250";s:7:"options";a:1:{i:1;s:3:"250";}}}','size' => ',250','style' => '','modified' => '1130404323',);
 
-$templ_data[] = array('name' => 'addressbook.edit.personal','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:2:{s:2:"h6";s:2:"40";s:2:"c7";s:4:",top";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"personal";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"prefix";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_prefix";s:4:"size";s:5:"45,64";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"first name";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:7:"n_given";s:4:"size";s:5:"45,64";}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"middle name";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_middle";s:4:"size";s:5:"45,64";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"last name";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_family";s:4:"size";s:5:"45,64";}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"suffix";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_suffix";s:4:"size";s:5:"45,64";}}i:6;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"gohome";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"company name";s:4:"size";s:11:",,,org_name";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:8:"org_name";}}i:7;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:8:"category";}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:1:"3";s:4:"span";s:1:"4";}}i:8;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"password";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:10:",,,private";}s:1:"C";a:2:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"private";}}}s:4:"rows";i:8;s:4:"cols";i:3;s:4:"size";s:4:",250";s:7:"options";a:1:{i:1;s:3:"250";}}}','size' => ',250','style' => '','modified' => '1130404323',);
+$templ_data[] = array('name' => 'addressbook.edit.personal','template' => '','lang' => '','group' => '0','version' => '1.0.1.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:2:{s:2:"h6";s:2:"40";s:2:"c7";s:4:",top";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"personal";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"prefix";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_prefix";s:4:"size";s:5:"45,64";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"first name";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:7:"n_given";s:4:"size";s:5:"45,64";}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"middle name";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_middle";s:4:"size";s:5:"45,64";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"last name";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_family";s:4:"size";s:5:"45,64";}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"suffix";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_suffix";s:4:"size";s:5:"45,64";}}i:6;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"gohome";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"company name";s:4:"size";s:11:",,,org_name";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:8:"org_name";}}i:7;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:8:"category";}s:1:"C";a:4:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:12:"3,,width:99%";s:4:"span";s:1:"4";}}i:8;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"password";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:10:",,,private";}s:1:"C";a:2:{s:4:"type";s:8:"checkbox";s:4:"name";s:7:"private";}}}s:4:"rows";i:8;s:4:"cols";i:3;s:4:"size";s:4:",250";s:7:"options";a:1:{i:1;s:3:"250";}}}','size' => ',250','style' => '','modified' => '1130404323',);
 
 $templ_data[] = array('name' => 'addressbook.editphones','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:18:{i:0;a:1:{s:2:"c3";s:2:"th";}i:1;a:4:{s:1:"A";a:5:{s:4:"type";s:5:"label";s:5:"label";s:20:"Edit Phonenumbers - ";s:5:"align";s:6:"center";s:4:"span";s:16:"all,windowheader";s:4:"name";s:2:"fn";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:1:{s:4:"type";s:5:"label";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Description";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:6:"Number";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"pref";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_work2";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:8:"tel_work";s:4:"name";s:10:"tel_prefer";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_cell2";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:8:"tel_cell";s:4:"name";s:10:"tel_prefer";}}i:6;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_home2";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:8:"tel_home";s:4:"name";s:10:"tel_prefer";}}i:7;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"fax";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_fax";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"tel_fax";s:4:"name";s:10:"tel_prefer";}}i:8;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"car phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_car";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"tel_car";s:4:"name";s:10:"tel_prefer";}}i:9;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"video phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_video";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:9:"tel_video";s:4:"name";s:10:"tel_prefer";}}i:10;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"pager";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_pager";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:9:"tel_pager";s:4:"name";s:10:"tel_prefer";}}i:11;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"voice phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_voice";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:9:"tel_voice";s:4:"name";s:10:"tel_prefer";}}i:12;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"message phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_msg";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"tel_msg";s:4:"name";s:10:"tel_prefer";}}i:13;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"bbs phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:7:"tel_bbs";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:7:"tel_bbs";s:4:"name";s:10:"tel_prefer";}}i:14;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"modem phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:9:"tel_modem";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:9:"tel_modem";s:4:"name";s:10:"tel_prefer";}}i:15;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"isdn phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:8:"tel_isdn";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:8:"tel_isdn";s:4:"name";s:10:"tel_prefer";}}i:16;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:" Other Phone";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:2:"30";s:4:"name";s:6:"ophone";}s:1:"D";a:3:{s:4:"type";s:5:"radio";s:4:"size";s:6:"ophone";s:4:"name";s:10:"tel_prefer";}}i:17;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";i:1;a:1:{s:4:"type";s:5:"label";}}s:1:"C";a:3:{s:4:"type";s:6:"button";s:5:"label";s:2:"Ok";s:7:"onclick";s:36:"hidephones(this.form); return false;";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:17;s:4:"cols";i:4;s:4:"size";s:13:",,,editphones";s:7:"options";a:1:{i:3;s:10:"editphones";}}}','size' => ',,,editphones','style' => '.editphones{ 
 position: fixed;
diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index b82ddfc52b..6589cbd5c4 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -2,7 +2,7 @@
 <!-- $Id$ -->
 <overlay>
 	<template id="addressbook.edit.personal" template="" lang="" group="0" version="1.0.1.002">
-		<grid height="250">
+		<grid class="editphones">
 			<columns>
 				<column/>
 				<column/>
@@ -42,7 +42,7 @@
 				<row valign="top">
 					<image src="folder"/>
 					<description value="category"/>
-					<listbox type="select-cat" id="cat_id" rows="3" span="4"/>
+					<listbox type="select-cat" id="cat_id" rows="3" options=",width:99%" span="4"/>
 				</row>
 				<row>
 					<image src="password"/>
@@ -53,7 +53,7 @@
 		</grid>
 	</template>
 	<template id="addressbook.edit.organisation" template="" lang="" group="0" version="1.0.1.001">
-		<grid height="250">
+		<grid height="320">
 			<columns>
 				<column/>
 				<column/>
@@ -131,7 +131,7 @@
 		</grid>
 	</template>
 	<template id="addressbook.edit.home" template="" lang="" group="0" version="1.0.1.001">
-		<grid height="250">
+		<grid width="100%" height="250" overflow="auto">
 			<columns>
 				<column/>
 				<column/>
@@ -166,7 +166,7 @@
 				<row height="30">
 					<description/>
 					<description options=",,,bday" value="Birthday"/>
-					<date 1="label" id="bday" options="m/d/Y"/>
+					<date id="bday" options="m/d/Y"/>
 				</row>
 				<row>
 					<description/>
@@ -184,7 +184,7 @@
 		</grid>
 	</template>
 	<template id="addressbook.edit.details" template="" lang="" group="0" version="1.0.1.001">
-		<grid width="100%" height="250" overflow="auto">
+		<grid height="320">
 			<columns>
 				<column/>
 			</columns>
@@ -205,7 +205,7 @@
 		</grid>
 	</template>
 	<template id="addressbook.edit.links" template="" lang="" group="0" version="1.0.1.002">
-		<grid width="100%" height="250" overflow="auto">
+		<grid height="320">
 			<columns>
 				<column/>
 			</columns>
@@ -226,7 +226,7 @@
 		</grid>
 	</template>
 	<template id="addressbook.editphones" template="" lang="" group="0" version="1.0.1.001">
-		<grid class="editphones">
+		<grid width="100%">
 			<columns>
 				<column/>
 				<column/>
@@ -334,12 +334,19 @@
 						</columns>
 						<rows>
 							<row>
-								<textbox id="org_name" readonly="true"/>
+								<textbox id="org_name" readonly="true" no_lang="1"/>
 								<description value=":"/>
-								<textbox id="fn" readonly="true" span="all"/>
+								<textbox id="fn" no_lang="1" readonly="true"/>
 							</row>
 						</rows>
 					</grid>
+					<hbox align="right">
+						<description value="Type"/>
+						<menulist>
+							<menupopup no_lang="1" id="tid" onchange="1"/>
+						</menulist>
+						<html class="space" needed="1" label=" " no_lang="1" id="typegfx" readonly="true"/>
+					</hbox>
 				</row>
 				<row valign="top">
 					<tabbox>