diff --git a/addressbook/inc/class.uicontacts.inc.php b/addressbook/inc/class.uicontacts.inc.php
index eb006e1ffd..cd3cb191a0 100644
--- a/addressbook/inc/class.uicontacts.inc.php
+++ b/addressbook/inc/class.uicontacts.inc.php
@@ -907,6 +907,7 @@ class uicontacts extends bocontacts
 				$content['link_to']['to_id'] = $contact_id;
 			}
 		}
+		$content['disable_change_org'] = $view || !$content['org_name'];
 		//_debug_array($content);
 		$readonlys['button[delete]'] = !$this->check_perms(EGW_ACL_DELETE,$content);
 		$readonlys['button[copy]'] = $readonlys['button[edit]'] = $readonlys['button[vcard]'] = true;
diff --git a/addressbook/setup/etemplates.inc.php b/addressbook/setup/etemplates.inc.php
index 6460e75378..1a5559c224 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() 2006-06-17 19:07
+	 * generated by soetemplate::dump4setup() 2006-07-07 02:43
 	 *
 	 * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	 * @package addressbook
@@ -24,7 +24,7 @@ $templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => ''
 
 $templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h5";s:13:",@hidebuttons";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:7:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:3:"tab";s:5:"label";s:38:"Personal|Company|Private|Details|Links";s:4:"name";s:40:"personal|organisation|home|details|links";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"email";s:4:"size";s:5:"28,64";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:10:"email_home";s:4:"size";s:5:"28,64";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:14:"select-account";s:4:"name";s:7:"creator";s:8:"readonly";s:1:"1";s:5:"label";s:7:"Created";s:4:"span";s:9:",leftPad5";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:7:"created";s:4:"span";s:9:",leftPad5";s:8:"readonly";s:1:"1";}}s:1:"B";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:5:"right";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:8:"modifier";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:8:"modified";s:8:"readonly";s:1:"1";}}}i:5;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:185:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:5;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1146380727',);
 
-$templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h5";s:13:",@hidebuttons";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:7:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:3:"tab";s:5:"label";s:38:"Personal|Company|Private|Details|Links";s:4:"name";s:40:"personal|organisation|home|details|links";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"email";s:4:"size";s:5:"28,64";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:10:"email_home";s:4:"size";s:5:"28,64";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:14:"select-account";s:4:"name";s:7:"creator";s:8:"readonly";s:1:"1";s:5:"label";s:7:"Created";s:4:"span";s:9:",leftPad5";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:7:"created";s:4:"span";s:9:",leftPad5";s:8:"readonly";s:1:"1";}}s:1:"B";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:5:"right";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:8:"modifier";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:8:"modified";s:8:"readonly";s:1:"1";}}}i:5;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:185:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:5;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1146375235',);
+$templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.3.003','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h5";s:13:",@hidebuttons";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:7:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:2:{s:1:"A";s:11:",!@org_name";s:1:"B";s:11:",!@org_name";}i:1;a:3:{s:1:"A";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:8:"readonly";s:1:"1";s:7:"no_lang";s:1:"1";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:1:":";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:3;s:4:"span";s:7:",fileas";s:4:"name";s:11:"fileas_type";s:7:"no_lang";s:1:"1";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:5:"align";s:5:"right";s:4:"data";a:2:{i:0;a:1:{s:2:"h1";s:8:",@no_tid";}i:1;a:2:{s:1:"A";a:6:{s:4:"type";s:6:"select";s:7:"no_lang";s:1:"1";s:4:"name";s:3:"tid";s:8:"onchange";i:1;s:5:"label";s:4:"Type";s:4:"span";s:9:",leftPad5";}s:1:"B";a:7:{s:4:"type";s:4:"html";s:4:"span";s:6:",space";s:6:"needed";s:1:"1";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";s:4:"name";s:7:"typegfx";s:8:"readonly";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:3:"tab";s:5:"label";s:43:"Personal|Organisation|Private|Details|Links";s:4:"name";s:40:"personal|organisation|home|details|links";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:8:"template";s:4:"name";s:22:"addressbook.editphones";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"B";s:3:"120";s:1:"A";s:2:"20";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"phone";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"business";s:4:"size";s:11:",,,tel_work";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_work,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";s:4:"size";s:11:",,,tel_cell";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_cell,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:3;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:11:",,,tel_home";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"type";s:5:"radio";s:4:"size";s:17:"tel_home,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:4:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:120:"set_style_by_class(\'table\',\'editphones\',\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:4;s:4:"cols";i:4;}s:4:"span";s:11:",phoneGroup";}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:5:"label";s:16:"Email & Internet";i:1;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"internet";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";s:4:"size";s:6:",,,url";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,url_home";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";}}i:3;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:9:"email.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"email";s:4:"size";s:8:",,,email";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:5:"email";s:4:"size";s:5:"28,64";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Private";s:4:"size";s:13:",,,email_home";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:10:"email_home";s:4:"size";s:5:"28,64";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"options";a:0:{}}s:4:"span";s:11:",emailGroup";}}}i:4;a:2:{s:1:"A";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:5:{s:4:"type";s:14:"select-account";s:4:"name";s:7:"creator";s:8:"readonly";s:1:"1";s:5:"label";s:7:"Created";s:4:"span";s:9:",leftPad5";}i:2;a:4:{s:4:"type";s:9:"date-time";s:4:"name";s:7:"created";s:4:"span";s:9:",leftPad5";s:8:"readonly";s:1:"1";}}s:1:"B";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:5:"right";s:4:"size";s:1:"3";i:1;a:2:{s:4:"type";s:5:"label";s:5:"label";s:13:"Last modified";}i:2;a:3:{s:4:"type";s:14:"select-account";s:4:"name";s:8:"modifier";s:8:"readonly";s:1:"1";}i:3;a:3:{s:4:"type";s:9:"date-time";s:4:"name";s:8:"modified";s:8:"readonly";s:1:"1";}}}i:5;a:2:{s:1:"A";a:8:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"6";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Edit";s:4:"name";s:12:"button[edit]";s:7:"onclick";s:185:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:2;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Copy";s:4:"name";s:12:"button[copy]";s:7:"onclick";s:194:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";}i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:4:"type";s:6:"button";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:9:"accesskey";s:1:"s";}i:5;a:3:{s:4:"type";s:6:"button";s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";}i:6;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Cancel";s:4:"name";s:14:"button[cancel]";s:7:"onclick";s:57:"if($cont[view]0) return true; self.close(); return false;";}}s:1:"B";a:6:{s:4:"type";s:6:"button";s:5:"label";s:6:"Delete";s:4:"name";s:14:"button[delete]";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:5:"align";s:5:"right";s:8:"tabindex";i:25;}}}s:4:"rows";i:5;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1146375235',);
 
 $templ_data[] = array('name' => 'addressbook.edit.access','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:"c2";s:4:",top";}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:20:"Publish into groups:";}s:1:"B";a:3:{s:4:"type";s:6:"manual";s:7:"onclick";s:13:"return false;";s:4:"name";s:30:"ManualAddressbookPublishgroups";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:6:"select";s:4:"size";s:1:"5";s:4:"name";s:16:"published_groups";s:4:"span";s:3:"all";s:7:"no_lang";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:2;s:4:"cols";i:2;s:4:"size";s:4:",250";s:7:"options";a:1:{i:1;s:3:"250";}}}','size' => ',250','style' => '','modified' => '1140005589',);
 
@@ -44,7 +44,7 @@ $templ_data[] = array('name' => 'addressbook.edit.home','template' => '','lang'
 
 $templ_data[] = array('name' => 'addressbook.edit.home','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:1:{s:2:"h7";s:2:"30";}i:1;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:6:"street";s:4:"size";s:17:",,,adr_two_street";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_two_street";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,adr_two_street2";s:5:"label";s:14:"address line 2";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:15:"adr_two_street2";}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"city";s:4:"size";s:19:",,,adr_two_locality";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:16:"adr_two_locality";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"zip code";s:4:"size";s:21:",,,adr_two_postalcode";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:18:"adr_two_postalcode";}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"state";s:4:"size";s:17:",,,adr_two_region";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_two_region";}}i:6;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"country";s:4:"size";s:22:",,,adr_two_countryname";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:19:"adr_two_countryname";}}i:7;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,bday";s:5:"label";s:8:"Birthday";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";i:1;a:3:{s:4:"type";s:4:"date";s:4:"size";s:5:"Y-m-d";s:4:"name";s:4:"bday";}s:4:"name";s:4:"bday";s:4:"size";s:6:"2,,0,0";i:2;a:5:{s:4:"type";s:6:"select";s:4:"name";s:2:"tz";s:7:"no_lang";s:1:"1";s:5:"label";s:8:"Timezone";s:5:"align";s:5:"right";}}}i:8;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:7:"private";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"Public key";s:4:"size";s:9:",,,pubkey";}s:1:"C";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,40";s:4:"name";s:6:"pubkey";}}}s:4:"rows";i:8;s:4:"cols";i:3;s:4:"size";s:4:",258";s:7:"options";a:1:{i:1;s:3:"258";}}}','size' => ',258','style' => '','modified' => '1130409535',);
 
-$templ_data[] = array('name' => 'addressbook.edit.home','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:1:{s:2:"h7";s:2:"30";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"accounts";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"street";s:4:"size";s:17:",,,adr_two_street";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_two_street";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,adr_two_street2";s:5:"label";s:14:"address line 2";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:15:"adr_two_street2";}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"city";s:4:"size";s:19:",,,adr_two_locality";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:16:"adr_two_locality";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"zip code";s:4:"size";s:21:",,,adr_two_postalcode";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:18:"adr_two_postalcode";}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"state";s:4:"size";s:17:",,,adr_two_region";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_two_region";}}i:6;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"country";s:4:"size";s:22:",,,adr_two_countryname";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:19:"adr_two_countryname";}}i:7;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"gear";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,bday";s:5:"label";s:8:"Birthday";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";i:1;a:3:{s:4:"type";s:4:"date";s:4:"size";s:5:"Y-m-d";s:4:"name";s:4:"bday";}s:4:"name";s:4:"bday";s:4:"size";s:6:"2,,0,0";i:2;a:5:{s:4:"type";s:6:"select";s:4:"name";s:2:"tz";s:7:"no_lang";s:1:"1";s:5:"label";s:8:"Timezone";s:5:"align";s:5:"right";}}}i:8;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:11:"private.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"Public key";s:4:"size";s:9:",,,pubkey";}s:1:"C";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,40";s:4:"name";s:6:"pubkey";}}}s:4:"rows";i:8;s:4:"cols";i:3;s:4:"size";s:4:",258";s:7:"options";a:1:{i:1;s:3:"258";}}}','size' => ',258','style' => '','modified' => '1130409535',);
+$templ_data[] = array('name' => 'addressbook.edit.home','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:1:{s:2:"h7";s:2:"30";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"accounts";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"street";s:4:"size";s:17:",,,adr_two_street";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_two_street";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,adr_two_street2";s:5:"label";s:14:"address line 2";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:15:"adr_two_street2";}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"city";s:4:"size";s:19:",,,adr_two_locality";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:16:"adr_two_locality";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"zip code";s:4:"size";s:21:",,,adr_two_postalcode";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:18:"adr_two_postalcode";}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"state";s:4:"size";s:17:",,,adr_two_region";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_two_region";}}i:6;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"country";s:4:"size";s:22:",,,adr_two_countryname";}s:1:"C";a:4:{s:4:"type";s:14:"select-country";s:4:"size";s:12:"Select one,1";s:4:"name";s:19:"adr_two_countryname";s:4:"span";s:10:",fullWidth";}}i:7;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"gear";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,bday";s:5:"label";s:8:"Birthday";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";i:1;a:3:{s:4:"type";s:4:"date";s:4:"size";s:5:"Y-m-d";s:4:"name";s:4:"bday";}s:4:"name";s:4:"bday";s:4:"size";s:6:"2,,0,0";i:2;a:5:{s:4:"type";s:6:"select";s:4:"name";s:2:"tz";s:7:"no_lang";s:1:"1";s:5:"label";s:8:"Timezone";s:5:"align";s:5:"right";}}}i:8;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:11:"private.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"Public key";s:4:"size";s:9:",,,pubkey";}s:1:"C";a:3:{s:4:"type";s:8:"textarea";s:4:"size";s:4:"2,40";s:4:"name";s:6:"pubkey";}}}s:4:"rows";i:8;s:4:"cols";i:3;s:4:"size";s:4:",258";s:7:"options";a:1:{i:1;s:3:"258";}}}','size' => ',258','style' => '','modified' => '1130409535',);
 
 $templ_data[] = array('name' => 'addressbook.edit.links','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:5:{i:0;a:2:{s:2:"c3";s:2:"th";s:2:"h1";s:6:",@view";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Create new links";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:7:"link-to";s:4:"name";s:7:"link_to";}}i:3;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"Existing links";}}i:4;a:1:{s:1:"A";a:2:{s:4:"type";s:9:"link-list";s:4:"name";s:4:"link";}}}s:4:"rows";i:4;s:4:"cols";i:1;s:4:"size";s:17:"100%,250,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"250";i:6;s:4:"auto";}}}','size' => '100%,250,,,,,auto','style' => '','modified' => '1131900825',);
 
@@ -58,7 +58,7 @@ $templ_data[] = array('name' => 'addressbook.edit.organisation','template' => ''
 
 $templ_data[] = array('name' => 'addressbook.edit.organisation','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:12:{i:0;a:0:{}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"gear";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"title";s:4:"size";s:8:",,,title";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:5:"title";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"department";s:4:"size";s:11:",,,org_unit";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_unit";s:4:"size";s:5:"45,64";}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:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,role";s:5:"label";s:4:"Role";}s:1:"C";a:27:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"role";s:4:"size";s:5:"25,64";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:4:"8,64";s:5:"label";s:4:"Room";s:5:"align";s:5:"right";s:4:"name";s:4:"room";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;a:1:{s:4:"type";s:5:"label";}}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}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:5;a:4:{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:6:"street";s:4:"size";s:17:",,,adr_one_street";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_one_street";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"address line 2";s:4:"size";s:18:",,,adr_one_street2";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:15:"adr_one_street2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"city";s:4:"size";s:19:",,,adr_one_locality";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:16:"adr_one_locality";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"zip code";s:4:"size";s:21:",,,adr_one_postalcode";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:18:"adr_one_postalcode";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:9;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"state";s:4:"size";s:17:",,,adr_one_region";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_one_region";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:10;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"country";s:4:"size";s:22:",,,adr_one_countryname";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:19:"adr_one_countryname";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:11;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}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";}}}s:4:"rows";i:11;s:4:"cols";i:4;s:4:"size";s:4:",258";s:7:"options";a:1:{i:1;s:3:"258";}}}','size' => ',258','style' => '','modified' => '1130408337',);
 
-$templ_data[] = array('name' => 'addressbook.edit.organisation','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:11:{i:0;a:3:{s:2:"h3";s:2:"30";s:2:"c3";s:7:",bottom";s:3:"h10";s:6:",@view";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"gear";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"title";s:4:"size";s:8:",,,title";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:5:"title";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,role";s:5:"label";s:4:"Role";}s:1:"C";a:27:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"role";s:4:"size";s:5:"25,64";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:4:"8,64";s:5:"label";s:4:"Room";s:5:"align";s:5:"right";s:4:"name";s:4:"room";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;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:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"home";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"department";s:4:"size";s:11:",,,org_unit";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_unit";s:4:"size";s:5:"45,64";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{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:6:"street";s:4:"size";s:17:",,,adr_one_street";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_one_street";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"address line 2";s:4:"size";s:18:",,,adr_one_street2";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:15:"adr_one_street2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"city";s:4:"size";s:19:",,,adr_one_locality";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:16:"adr_one_locality";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"zip code";s:4:"size";s:21:",,,adr_one_postalcode";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:18:"adr_one_postalcode";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"state";s:4:"size";s:17:",,,adr_one_region";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_one_region";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:9;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"country";s:4:"size";s:22:",,,adr_one_countryname";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:19:"adr_one_countryname";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:10;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"check";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:31:"change all organisation members";s:4:"name";s:10:"change_org";s:4:"span";s:3:"all";s:4:"help";s:73:"Apply changes to all members, whose fields have the same previous content";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:10;s:4:"cols";i:4;s:4:"size";s:4:",258";s:7:"options";a:1:{i:1;s:3:"258";}}}','size' => ',258','style' => '','modified' => '1146386513',);
+$templ_data[] = array('name' => 'addressbook.edit.organisation','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:11:{i:0;a:3:{s:2:"h3";s:2:"30";s:2:"c3";s:7:",bottom";s:3:"h10";s:20:",@disable_change_org";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"gear";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"title";s:4:"size";s:8:",,,title";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:5:"title";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:2;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,role";s:5:"label";s:4:"Role";}s:1:"C";a:27:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:4:"text";s:4:"name";s:4:"role";s:4:"size";s:5:"25,64";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:4:"8,64";s:5:"label";s:4:"Room";s:5:"align";s:5:"right";s:4:"name";s:4:"room";}i:3;a:1:{s:4:"type";s:5:"label";}i:4;a:1:{s:4:"type";s:5:"label";}i:5;a:1:{s:4:"type";s:5:"label";}i:6;a:1:{s:4:"type";s:5:"label";}i:7;a:1:{s:4:"type";s:5:"label";}i:8;a:1:{s:4:"type";s:5:"label";}i:9;a:1:{s:4:"type";s:5:"label";}i:10;a:1:{s:4:"type";s:5:"label";}i:11;a:1:{s:4:"type";s:5:"label";}i:12;a:1:{s:4:"type";s:5:"label";}i:13;a:1:{s:4:"type";s:5:"label";}i:14;a:1:{s:4:"type";s:5:"label";}i:15;a:1:{s:4:"type";s:5:"label";}i:16;a:1:{s:4:"type";s:5:"label";}i:17;a:1:{s:4:"type";s:5:"label";}i:18;a:1:{s:4:"type";s:5:"label";}i:19;a:1:{s:4:"type";s:5:"label";}i:20;a:1:{s:4:"type";s:5:"label";}i:21;a:1:{s:4:"type";s:5:"label";}i:22;a:1:{s:4:"type";s:5:"label";}i:23;a:1:{s:4:"type";s:5:"label";}i:24;a:1:{s:4:"type";s:5:"label";}i:25;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:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"home";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"department";s:4:"size";s:11:",,,org_unit";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_unit";s:4:"size";s:5:"45,64";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:4;a:4:{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:6:"street";s:4:"size";s:17:",,,adr_one_street";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_one_street";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:5;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"address line 2";s:4:"size";s:18:",,,adr_one_street2";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:15:"adr_one_street2";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:6;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:4:"city";s:4:"size";s:19:",,,adr_one_locality";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:16:"adr_one_locality";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:7;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:8:"zip code";s:4:"size";s:21:",,,adr_one_postalcode";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:18:"adr_one_postalcode";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:8;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:5:"state";s:4:"size";s:17:",,,adr_one_region";}s:1:"C";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:14:"adr_one_region";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:9;a:4:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"country";s:4:"size";s:22:",,,adr_one_countryname";}s:1:"C";a:4:{s:4:"type";s:14:"select-country";s:4:"size";s:12:"Select one,1";s:4:"name";s:19:"adr_one_countryname";s:4:"span";s:10:",fullWidth";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}i:10;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:5:"check";}s:1:"B";a:1:{s:4:"type";s:5:"label";}s:1:"C";a:5:{s:4:"type";s:8:"checkbox";s:5:"label";s:31:"change all organisation members";s:4:"name";s:10:"change_org";s:4:"span";s:3:"all";s:4:"help";s:73:"Apply changes to all members, whose fields have the same previous content";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:10;s:4:"cols";i:4;s:4:"size";s:4:",258";s:7:"options";a:1:{i:1;s:3:"258";}}}','size' => ',258','style' => '','modified' => '1146386513',);
 
 $templ_data[] = array('name' => 'addressbook.edit.personal','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:12:{i:0;a:2:{s:2:"c9";s:4:",top";s:3:"h11";s:4:"100%";}i:1;a:6:{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:2:"40";s:8:"tabindex";i:1;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:9:"time zone";}s:1:"F";a:5:{s:4:"type";s:6:"select";i:1;a:1:{s:4:"type";s:5:"label";}i:2;a:1:{s:4:"type";s:5:"label";}s:4:"name";s:2:"tz";s:7:"no_lang";s:1:"1";}}i:2;a:6:{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:2:"40";s:8:"tabindex";i:2;}s:1:"D";a:2:{s:4:"type";s:5:"image";s:4:"name";s:12:"kaddressbook";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"home phone";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_home";s:4:"size";s:2:"30";s:8:"tabindex";i:6;}}i:3;a:6:{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:" middle name";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_middle";s:4:"size";s:2:"40";s:8:"tabindex";i:3;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"business phone";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_work";s:4:"size";s:2:"30";s:8:"tabindex";i:7;}}i:4;a:6:{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:2:"40";s:8:"tabindex";i:4;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"tel_cell";s:4:"size";s:2:"30";s:8:"tabindex";i:8;}}i:5;a:6:{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:2:"40";s:8:"tabindex";i:5;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:5:{s:4:"type";s:6:"button";s:5:"label";s:17:"more phonenumbers";s:7:"onclick";s:36:"showphones(this.form); return false;";s:8:"tabindex";i:9;s:9:"accesskey";s:1:"m";}}i:6;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}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:2:{s:4:"type";s:5:"image";s:4:"name";s:10:"email_icon";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"home email";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:10:"email_home";s:4:"size";s:2:"30";s:8:"tabindex";i:10;}}i:7;a:6:{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:" birthday";}s:1:"C";a:3:{s:4:"type";s:4:"date";i:1;a:1:{s:4:"type";s:5:"label";}s:4:"name";s:4:"bday";}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:14:"business email";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:5:"email";s:4:"size";s:2:"30";s:8:"tabindex";i:11;}}i:8;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}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";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:9;a:6:{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:13;}s:1:"D";a:1:{s:4:"type";s:5:"label";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}i:10;a:6:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"password";}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:8:"checkbox";s:4:"name";s:7:"private";s:8:"tabindex";i:14;}s:1:"D";a:2:{s:4:"type";s:5:"image";s:4:"name";s:15:"package_network";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"url";}s:1:"F";a:4:{s:4:"type";s:4:"text";s:4:"name";s:3:"url";s:4:"size";s:2:"30";s:8:"tabindex";i:12;}}i:11;a:6:{s:1:"A";a:1:{s:4:"type";s:5:"label";}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";}s:1:"E";a:1:{s:4:"type";s:5:"label";}s:1:"F";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:11;s:4:"cols";i:6;s:4:"size";s:4:",320";s:7:"options";a:1:{i:1;s:3:"320";}}}','size' => ',320','style' => '','modified' => '1130404323',);
 
@@ -68,7 +68,7 @@ $templ_data[] = array('name' => 'addressbook.edit.personal','template' => '','la
 
 $templ_data[] = array('name' => 'addressbook.edit.personal','template' => '','lang' => '','group' => '0','version' => '1.3.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:"accounts";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,n_prefix";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:"onchange";s:23:"setFileasOptions(this);";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"first name";s:4:"size";s:10:",,,n_given";}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:"onchange";s:23:"setFileasOptions(this);";}}i:3;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"middle name";s:4:"size";s:11:",,,n_middle";}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:"onchange";s:23:"setFileasOptions(this);";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:9:"last name";s:4:"size";s:11:",,,n_family";}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:"onchange";s:23:"setFileasOptions(this);";}}i:5;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:6:"suffix";s:4:"size";s:8:"n_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:"onchange";s:23:"setFileasOptions(this);";}}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:"onchange";s:23:"setFileasOptions(this);";}}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:11:"private.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Addressbook";s:4:"size";s:8:",,,owner";}s:1:"C";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"owner";s:4:"help";s:42:"Addressbook the contact should be saved to";s:7:"no_lang";s:1:"1";s:4:"span";s:6:",owner";}}}s:4:"rows";i:8;s:4:"cols";i:3;s:4:"size";s:4:",258";s:7:"options";a:1:{i:1;s:3:"258";}}}','size' => ',258','style' => '','modified' => '1130404323',);
 
-$templ_data[] = array('name' => 'addressbook.edit.personal','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:4:{s:2:"c1";s:4:",top";s:2:"h2";s:2:"28";s:2:"c3";s:4:",top";s:2:"h3";s:2:"70";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"accounts";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:5:"image";s:4:"name";s:5:"photo";s:4:"span";s:6:",photo";}i:2;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"change";s:4:"name";s:12:"change_photo";s:4:"help";s:26:"Upload or delete the photo";s:7:"onclick";s:75:"set_style_by_class(\'table\',\'uploadphoto\',\'display\',\'inline\'); return false;";}i:3;a:2:{s:4:"type";s:8:"template";s:4:"name";s:6:"upload";}}s:1:"C";a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:1:{s:1:"A";s:3:"20%";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,n_prefix";s:5:"label";s:6:"prefix";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_prefix";s:4:"size";s:5:"35,64";s:8:"onchange";s:23:"setFileasOptions(this);";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"first name";s:4:"size";s:10:",,,n_given";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:7:"n_given";s:4:"size";s:5:"35,64";s:8:"onchange";s:23:"setFileasOptions(this);";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,n_middle";s:5:"label";s:11:"middle name";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_middle";s:4:"size";s:5:"35,64";s:8:"onchange";s:23:"setFileasOptions(this);";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,n_family";s:5:"label";s:9:"last name";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_family";s:4:"size";s:5:"35,64";s:8:"onchange";s:23:"setFileasOptions(this);";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,n_suffix";s:5:"label";s:6:"suffix";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_suffix";s:4:"size";s:5:"35,64";s:8:"onchange";s:23:"setFileasOptions(this);";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"home";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"company";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:"onchange";s:23:"setFileasOptions(this);";}}i:3;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:4;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:11:"private.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Addressbook";s:4:"size";s:8:",,,owner";}s:1:"C";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"owner";s:4:"help";s:42:"Addressbook the contact should be saved to";s:7:"no_lang";s:1:"1";s:4:"span";s:6:",owner";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:4:"size";s:4:",258";s:7:"options";a:1:{i:1;s:3:"258";}}}','size' => ',258','style' => '','modified' => '1130404323',);
+$templ_data[] = array('name' => 'addressbook.edit.personal','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:4:{s:2:"c1";s:4:",top";s:2:"h2";s:2:"28";s:2:"c3";s:4:",top";s:2:"h3";s:2:"70";}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:8:"accounts";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:5:"image";s:4:"name";s:5:"photo";s:4:"span";s:6:",photo";}i:2;a:5:{s:4:"type";s:6:"button";s:5:"label";s:6:"change";s:4:"name";s:12:"change_photo";s:4:"help";s:26:"Upload or delete the photo";s:7:"onclick";s:75:"set_style_by_class(\'table\',\'uploadphoto\',\'display\',\'inline\'); return false;";}i:3;a:2:{s:4:"type";s:8:"template";s:4:"name";s:6:"upload";}}s:1:"C";a:5:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:1:{s:1:"A";s:3:"20%";}i:1;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,n_prefix";s:5:"label";s:6:"prefix";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_prefix";s:4:"size";s:5:"35,64";s:8:"onchange";s:23:"setFileasOptions(this);";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:5:"label";s:10:"first name";s:4:"size";s:10:",,,n_given";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:7:"n_given";s:4:"size";s:5:"35,64";s:8:"onchange";s:23:"setFileasOptions(this);";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,n_middle";s:5:"label";s:11:"middle name";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_middle";s:4:"size";s:5:"35,64";s:8:"onchange";s:23:"setFileasOptions(this);";}}i:4;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,n_family";s:5:"label";s:9:"last name";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_family";s:4:"size";s:5:"35,64";s:8:"onchange";s:23:"setFileasOptions(this);";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:11:",,,n_suffix";s:5:"label";s:6:"suffix";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"n_suffix";s:4:"size";s:5:"35,64";s:8:"onchange";s:23:"setFileasOptions(this);";}}}s:4:"rows";i:5;s:4:"cols";i:2;s:7:"options";a:0:{}}}i:2;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:4:"home";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"organisation";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:"onchange";s:23:"setFileasOptions(this);";}}i:3;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:4;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:11:"private.png";}s:1:"B";a:3:{s:4:"type";s:5:"label";s:5:"label";s:11:"Addressbook";s:4:"size";s:8:",,,owner";}s:1:"C";a:5:{s:4:"type";s:6:"select";s:4:"name";s:5:"owner";s:4:"help";s:42:"Addressbook the contact should be saved to";s:7:"no_lang";s:1:"1";s:4:"span";s:6:",owner";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:4:"size";s:4:",258";s:7:"options";a:1:{i:1;s:3:"258";}}}','size' => ',258','style' => '','modified' => '1130404323',);
 
 $templ_data[] = array('name' => 'addressbook.edit.personal.upload','template' => '','lang' => '','group' => '0','version' => '1.3.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:1:{s:2:"h1";s:12:",!@jpegphoto";}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:8:"checkbox";s:5:"label";s:6:"delete";s:4:"name";s:12:"delete_photo";s:4:"help";s:17:"Deletes the photo";}}i:2;a:1:{s:1:"A";a:4:{s:4:"type";s:4:"file";s:4:"name";s:12:"upload_photo";s:4:"span";s:6:",photo";s:4:"help";s:74:"Select a portrait format jpeg photo. It will be resized to 60 pixel width.";}}i:3;a:1:{s:1:"A";a:4:{s:4:"type";s:6:"button";s:5:"label";s:2:"Ok";s:5:"align";s:6:"center";s:7:"onclick";s:73:"set_style_by_class(\'table\',\'uploadphoto\',\'display\',\'none\'); return false;";}}}s:4:"rows";i:3;s:4:"cols";i:1;s:4:"size";s:14:",,,uploadphoto";s:7:"options";a:1:{i:3;s:11:"uploadphoto";}}}','size' => ',,,uploadphoto','style' => '','modified' => '1145724831',);
 
@@ -106,11 +106,11 @@ $templ_data[] = array('name' => 'addressbook.index','template' => '','lang' => '
 
 $templ_data[] = array('name' => 'addressbook.index.left','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:10:{s:4:"type";s:6:"select";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"name";s:8:"org_view";s:7:"no_lang";s:1:"1";s:4:"help";s:13:"Select a view";s:4:"span";s:5:",bold";s:8:"onchange";i:1;s:4:"size";s:12:"All contacts";}}','size' => '','style' => '','modified' => '1146123855',);
 
-$templ_data[] = array('name' => 'addressbook.index.org_rows','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"G";s:2:"90";s:1:"F";s:17:",@no_customfields";}i:1;a:7:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:5:"label";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}s:5:"label";s:1:"#";s:5:"align";s:6:"center";}s:1:"C";a:3:{s:4:"name";s:8:"org_name";s:5:"label";s:7:"Company";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"department";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Business address";}s:1:"F";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}s:1:"G";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:7:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:7:{s:4:"type";s:3:"int";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}s:4:"name";s:17:"${row}[org_count]";s:8:"readonly";s:1:"1";s:5:"align";s:6:"center";}s:1:"C";a:8:{s:4:"type";s:5:"label";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:16:"${row}[org_name]";s:7:"no_lang";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}s:1:"E";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"F";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:14:",60,,,0,0,auto";s:4:"name";s:20:"${row}[customfields]";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:4:{i:1;s:2:"60";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}s:1:"G";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"4,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:38:"Show the contacts of this organisation";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:3:"Add";s:7:"onclick";s:182:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&org=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:18:"add[$row_cont[id]]";s:4:"help";s:34:"Add a contact to this organisation";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:51:"Delete this organisation including ALL its contacts";s:7:"onclick";s:70:"return confirm(\'Delete this organisation including ALL its contacts\');";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:7;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1146288783',);
+$templ_data[] = array('name' => 'addressbook.index.org_rows','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:4:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"G";s:2:"90";s:1:"F";s:17:",@no_customfields";}i:1;a:7:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:5:"label";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}s:5:"label";s:1:"#";s:5:"align";s:6:"center";}s:1:"C";a:3:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"department";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Business address";}s:1:"F";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}s:1:"G";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:7:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:7:{s:4:"type";s:3:"int";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}s:4:"name";s:17:"${row}[org_count]";s:8:"readonly";s:1:"1";s:5:"align";s:6:"center";}s:1:"C";a:8:{s:4:"type";s:5:"label";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:16:"${row}[org_name]";s:7:"no_lang";s:1:"1";}s:1:"D";a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}s:1:"E";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"F";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:14:",60,,,0,0,auto";s:4:"name";s:20:"${row}[customfields]";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:4:{i:1;s:2:"60";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}s:1:"G";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"4,0,0";i:1;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"view";s:5:"label";s:4:"View";s:4:"name";s:19:"view[$row_cont[id]]";s:4:"help";s:38:"Show the contacts of this organisation";}i:2;a:6:{s:4:"type";s:6:"button";s:4:"size";s:3:"new";s:5:"label";s:3:"Add";s:7:"onclick";s:182:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&org=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:18:"add[$row_cont[id]]";s:4:"help";s:34:"Add a contact to this organisation";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:51:"Delete this organisation including ALL its contacts";s:7:"onclick";s:70:"return confirm(\'Delete this organisation including ALL its contacts\');";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:7;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1146288783',);
 
 $templ_data[] = array('name' => 'addressbook.index.right','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:6:"select";s:5:"label";s:4:"Type";s:4:"name";s:15:"col_filter[tid]";s:4:"help";s:23:"Select addressbook type";s:8:"onchange";i:1;}}','size' => '','style' => '','modified' => '1145286218',);
 
-$templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"E";s:12:",!@show_home";s:1:"C";s:12:"60,@no_photo";s:1:"I";s:2:"90";s:1:"H";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=n_given";s:2:"h5";s:32:",!@order=/^(org_name|n_fileas)$/";s:2:"h3";s:17:",!@order=n_family";s:2:"h1";s:17:",!@order=n_fileas";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}}i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:7:"Company";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Photo";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Business address";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Home address";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business phone";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:8:"tel_home";s:5:"label";s:10:"Home phone";}}s:1:"G";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"H";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"D";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"E";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"no_lang";s:1:"1";}}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[tel_work]";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_work_link],,,calling,$cont[call_popup]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_cell]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_cell_link],,,calling,$cont[call_popup]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_home]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_home_link],,,calling,$cont[call_popup]";}i:4;a:4:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s:1:"G";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:5:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:11:"${row}[url]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"size";s:52:",@${row}[email_link],,,_blank,$row_cont[email_popup]";s:4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:7:"no_lang";s:1:"1";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"size";s:62:",@${row}[email_home_link],,,_blank,$row_cont[email_home_popup]";s:4:"span";s:12:",fixedHeight";s:4:"name";s:18:"${row}[email_home]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:14:",60,,,0,0,auto";s:4:"name";s:20:"${row}[customfields]";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:4:{i:1;s:2:"60";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}s:1:"I";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"4,0,0";i:1;a:4:{s:4:"type";s:5:"image";s:4:"size";s:52:"addressbook.uicontacts.view&contact_id=$row_cont[id]";s:5:"label";s:4:"View";s:4:"name";s:4:"view";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1145192391',);
+$templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.3.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:6:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"E";s:12:",!@show_home";s:1:"C";s:12:"60,@no_photo";s:1:"I";s:2:"90";s:1:"H";s:17:",@no_customfields";}i:1;a:9:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h2";s:16:",!@order=n_given";s:2:"h5";s:32:",!@order=/^(org_name|n_fileas)$/";s:2:"h3";s:17:",!@order=n_family";s:2:"h1";s:17:",!@order=n_fileas";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}}i:3;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";}s:1:"B";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";}}i:4;a:2:{s:1:"A";a:4:{s:4:"name";s:8:"org_name";s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:5;a:2:{s:1:"A";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:8:"n_family";s:5:"label";s:4:"Name";}s:1:"B";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"name";s:7:"n_given";s:5:"label";s:9:"Firstname";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:3:"all";s:5:"label";s:11:"own sorting";s:4:"name";s:8:"n_fileas";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:6;s:4:"cols";i:2;s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}s:4:"size";s:7:",,,,0,0";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:5:"label";s:5:"Photo";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:5:"label";s:16:"Business address";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Home address";}s:1:"F";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:8:"tel_work";s:5:"label";s:14:"Business phone";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:8:"tel_home";s:5:"label";s:10:"Home phone";}}s:1:"G";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"url";s:5:"label";s:3:"Url";}i:2;a:3:{s:4:"type";s:5:"label";s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:10:"email_home";s:5:"label";s:10:"Home email";}}s:1:"H";a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:25:"customfields[$row][label]";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:7:",,,,0,0";s:7:"options";a:2:{i:4;s:1:"0";i:5;s:1:"0";}}s:1:"I";a:6:{s:4:"type";s:4:"hbox";s:5:"align";s:6:"center";s:4:"size";s:1:"2";i:1;a:3:{s:4:"type";s:5:"label";s:5:"label";s:7:"Actions";s:5:"align";s:6:"center";}i:2;a:8:{s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:5:"label";s:9:"Check all";s:4:"name";s:9:"check_all";s:4:"help";s:9:"Check all";s:7:"onclick";s:60:"toggle_all(this.form,form::name(\'checked[]\')); return false;";s:6:"needed";s:1:"1";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}i:2;a:9:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:5:"label";s:21:"$row_cont[type_label]";s:4:"name";s:12:"${row}[type]";s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";}s:1:"B";a:8:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"5,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line2]";s:7:"no_lang";s:1:"1";}i:3;a:3:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";s:7:"no_lang";s:1:"1";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[title]";s:7:"no_lang";s:1:"1";}i:5;a:3:{s:4:"type";s:5:"label";s:4:"name";s:17:"${row}[first_org]";s:7:"no_lang";s:1:"1";}s:4:"name";s:10:"${row}[id]";}s:1:"C";a:2:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";}s:1:"D";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:7:"2,0,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";s:7:"no_lang";s:1:"1";}}s:1:"E";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_two_countryname]";s:7:"no_lang";s:1:"1";}i:2;a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"span";s:9:",leftPad5";s:5:"label";s:1:" ";s:7:"no_lang";s:1:"1";}}i:3;a:3:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";}i:4;a:3:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_two_street2]";s:7:"no_lang";s:1:"1";}}s:1:"F";a:6:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"4,,0,0";i:1;a:5:{s:4:"type";s:5:"label";s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[tel_work]";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_work_link],,,calling,$cont[call_popup]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_cell]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_cell_link],,,calling,$cont[call_popup]";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_home]";s:7:"no_lang";s:1:"1";s:4:"span";s:11:",telNumbers";s:4:"size";s:53:",$row_cont[tel_home_link],,,calling,$cont[call_popup]";}i:4;a:4:{s:4:"type";s:5:"label";s:4:"name";s:20:"${row}[tel_prefered]";s:7:"no_lang";s:1:"1";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";}}s:1:"G";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"3,,0,0";i:1;a:5:{s:4:"type";s:5:"label";s:4:"size";s:3:",,1";s:4:"span";s:12:",fixedHeight";s:7:"no_lang";s:1:"1";s:4:"name";s:11:"${row}[url]";}i:2;a:5:{s:4:"type";s:5:"label";s:4:"size";s:52:",@${row}[email_link],,,_blank,$row_cont[email_popup]";s:4:"span";s:12:",fixedHeight";s:4:"name";s:13:"${row}[email]";s:7:"no_lang";s:1:"1";}i:3;a:5:{s:4:"type";s:5:"label";s:4:"size";s:62:",@${row}[email_home_link],,,_blank,$row_cont[email_home_popup]";s:4:"span";s:12:",fixedHeight";s:4:"name";s:18:"${row}[email_home]";s:7:"no_lang";s:1:"1";}}s:1:"H";a:7:{s:4:"type";s:4:"grid";s:4:"size";s:14:",60,,,0,0,auto";s:4:"name";s:20:"${row}[customfields]";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:4:{s:4:"type";s:5:"label";s:4:"span";s:12:",fixedHeight";s:4:"name";s:4:"$row";s:7:"no_lang";s:1:"1";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:7:"options";a:4:{i:1;s:2:"60";i:6;s:4:"auto";i:4;s:1:"0";i:5;s:1:"0";}}s:1:"I";a:7:{s:4:"type";s:4:"hbox";s:4:"size";s:5:"4,0,0";i:1;a:4:{s:4:"type";s:5:"image";s:4:"size";s:52:"addressbook.uicontacts.view&contact_id=$row_cont[id]";s:5:"label";s:4:"View";s:4:"name";s:4:"view";}i:2;a:5:{s:4:"type";s:6:"button";s:4:"size";s:4:"edit";s:5:"label";s:4:"Edit";s:7:"onclick";s:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.uicontacts.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";}i:3;a:6:{s:4:"type";s:6:"button";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"size";s:6:"delete";s:5:"label";s:6:"Delete";s:4:"help";s:19:"Delete this contact";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";}i:4;a:5:{s:4:"type";s:8:"checkbox";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"help";s:45:"Select multiple contacts for a further action";s:5:"align";s:5:"right";}s:4:"span";s:8:",noPrint";}}}s:4:"rows";i:2;s:4:"cols";i:9;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1145192391',);
 
 $templ_data[] = array('name' => 'addressbook.search','template' => '','lang' => '','group' => '0','version' => '','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:14:"advancedsearch";s:4:"name";s:4:"advs";}}}s:4:"rows";i:1;s:4:"cols";i:1;s:4:"size";s:4:"100%";s:7:"options";a:1:{i:0;s:4:"100%";}}}','size' => '100%','style' => '','modified' => '1130609044',);
 
diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index 5dd5522869..41b391a5c3 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -47,7 +47,7 @@
 				</row>
 				<row height="28">
 					<image src="home"/>
-					<description value="company" options=",,,org_name"/>
+					<description value="organisation" options=",,,org_name"/>
 					<textbox size="45" maxlength="64" id="org_name" onchange="setFileasOptions(this);"/>
 				</row>
 				<row valign="top" height="70">
@@ -128,10 +128,12 @@
 				<row>
 					<description/>
 					<description value="country" options=",,,adr_one_countryname"/>
-					<textbox size="45" maxlength="64" id="adr_one_countryname"/>
+					<menulist span=",fullWidth">
+						<menupopup type="select-country" options="Select one,1" id="adr_one_countryname"/>
+					</menulist>
 					<description/>
 				</row>
-				<row disabled="@view">
+				<row disabled="@disable_change_org">
 					<image src="check"/>
 					<description/>
 					<checkbox label="change all organisation members" id="change_org" span="all" statustext="Apply changes to all members, whose fields have the same previous content"/>
@@ -175,7 +177,9 @@
 				<row>
 					<description/>
 					<description value="country" options=",,,adr_two_countryname"/>
-					<textbox size="45" maxlength="64" id="adr_two_countryname"/>
+					<menulist span=",fullWidth">
+						<menupopup type="select-country" options="Select one,1" id="adr_two_countryname"/>
+					</menulist>
 				</row>
 				<row height="30">
 					<image src="gear"/>
@@ -358,7 +362,7 @@
 					<tabbox>
 						<tabs>
 							<tab label="Personal" statustext=""/>
-							<tab label="Company" statustext=""/>
+							<tab label="Organisation" statustext=""/>
 							<tab label="Private" statustext=""/>
 							<tab label="Details" statustext=""/>
 							<tab label="Links" statustext=""/>
diff --git a/addressbook/templates/default/index.xet b/addressbook/templates/default/index.xet
index 7640acf383..188e59008d 100644
--- a/addressbook/templates/default/index.xet
+++ b/addressbook/templates/default/index.xet
@@ -45,7 +45,7 @@
 								<nextmatch-sortheader id="n_given" label="Firstname"/>
 							</row>
 							<row>
-								<nextmatch-sortheader id="org_name" label="Company" span="all"/>
+								<nextmatch-sortheader id="org_name" label="Organisation" span="all"/>
 							</row>
 							<row disabled="!@order=/^(org_name|n_fileas)$/">
 								<nextmatch-sortheader id="n_family" label="Name"/>