diff --git a/addressbook/setup/etemplates.inc.php b/addressbook/setup/etemplates.inc.php
index 06c3fcf390..f28bc98418 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() 2013-07-17 16:05
+ * generated by soetemplate::dump4setup() 2013-07-30 08:22
  *
  * @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
  * @package addressbook
@@ -24,7 +24,7 @@ $templ_data[] = array('name' => 'addressbook.display','template' => '','lang' =>
 
 $templ_data[] = array('name' => 'addressbook.display.rows','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:17:{s:2:"c1";s:2:"th";s:2:"c2";s:7:"row,top";s:1:"B";s:17:",!@show[org_name]";s:1:"C";s:17:",!@show[org_unit]";s:1:"D";s:13:",!@show[n_fn]";s:1:"E";s:14:",!@show[email]";s:1:"F";s:17:",!@show[tel_work]";s:1:"G";s:17:",!@show[tel_cell]";s:1:"H";s:16:",!@show[tel_fax]";s:1:"I";s:17:",!@show[org_home]";s:1:"J";s:12:",!@show[url]";s:1:"K";s:23:",!@show[adr_one_street]";s:1:"L";s:27:",!@show[adr_one_postalcode]";s:1:"M";s:25:",!@show[adr_one_locality]";s:1:"N";s:23:",!@show[adr_one_region]";s:1:"O";s:16:",!@show[custom1]";s:1:"P";s:16:",!@show[custom2]";}i:1;a:17:{s:1:"A";a:2:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:4:"type";}s:1:"B";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Company";s:4:"name";s:8:"org_name";}s:1:"C";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:10:"Department";s:4:"name";s:8:"org_unit";}s:1:"D";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:7:"Contact";s:4:"name";s:4:"n_fn";}s:1:"E";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:5:"Email";s:4:"name";s:5:"email";}s:1:"F";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"Business phone";s:4:"name";s:8:"tel_work";}s:1:"G";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";}s:1:"H";a:3:{s:4:"type";s:16:"nextmatch-header";s:4:"name";s:7:"tel_fax";s:5:"label";s:3:"Fax";}s:1:"I";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:10:"Home phone";s:4:"name";s:8:"tel_home";}s:1:"J";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:8:"Internet";s:4:"name";s:3:"url";}s:1:"K";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:6:"Street";s:4:"name";s:14:"adr_one_street";}s:1:"L";a:3:{s:4:"type";s:20:"nextmatch-sortheader";s:5:"label";s:8:"ZIP Code";s:4:"name";s:18:"adr_one_postalcode";}s:1:"M";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:4:"City";s:4:"name";s:16:"adr_one_locality";}s:1:"N";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:6:"Region";s:4:"name";s:14:"adr_one_region";}s:1:"O";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:15:"@customlabel[1]";s:4:"name";s:7:"custom1";}s:1:"P";a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:15:"@customlabel[2]";s:4:"name";s:7:"custom2";}s:1:"Q";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:6:"2,,0,0";i:1;a:3:{s:4:"type";s:16:"nextmatch-header";s:5:"label";s:14:"select country";s:4:"name";s:7:"country";}i:2;a:4:{s:4:"type";s:22:"nextmatch-customfilter";s:4:"name";s:19:"adr_one_countryname";s:4:"size";s:24:"select-country,Country,1";s:4:"span";s:14:",countrySelect";}}}i:2;a:17:{s:1:"A";a:5:{s:4:"type";s:5:"image";s:4:"size";s:1:"1";s:4:"name";s:12:"${row}[type]";s:8:"readonly";s:1:"1";s:5:"label";s:21:"$row_cont[type_label]";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_name]";}s:1:"C";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[org_unit]";}s:1:"D";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[line1]";}s:1:"E";a:2:{s:4:"type";s:5:"label";s:4:"name";s:13:"${row}[email]";}s:1:"F";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_work]";}s:1:"G";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_cell]";}s:1:"H";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[tel_fax]";}s:1:"I";a:2:{s:4:"type";s:5:"label";s:4:"name";s:16:"${row}[tel_home]";}s:1:"J";a:2:{s:4:"type";s:5:"label";s:4:"name";s:11:"${row}[url]";}s:1:"K";a:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:2:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[adr_one_street]";}i:2;a:2:{s:4:"type";s:5:"label";s:4:"name";s:23:"${row}[adr_one_street2]";}}s:1:"L";a:2:{s:4:"type";s:5:"label";s:4:"name";s:26:"${row}[adr_one_postalcode]";}s:1:"M";a:2:{s:4:"type";s:5:"label";s:4:"name";s:24:"${row}[adr_one_locality]";}s:1:"N";a:2:{s:4:"type";s:5:"label";s:4:"name";s:22:"${row}[adr_one_region]";}s:1:"O";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[custom1]";}s:1:"P";a:2:{s:4:"type";s:5:"label";s:4:"name";s:15:"${row}[custom2]";}s:1:"Q";a:2:{s:4:"type";s:5:"label";s:4:"name";s:27:"${row}[adr_one_countryname]";}}}s:4:"rows";i:2;s:4:"cols";i:17;s:4:"size";s:14:"100%,,,,,,auto";s:7:"options";a:2:{i:0;s:4:"100%";i:6;s:4:"auto";}}}','size' => '100%,,,,,,auto','style' => '','modified' => '1195309977',);
 
-$templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.9.004','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:1:"A";s:3:"450";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:1:"B";s:3:"350";s:2:"h4";s:13:",@hidebuttons";}i:1;a:2:{s:1:"A";a:5:{s:4:"type";s:8:"htmlarea";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";s:8:"readonly";s:1:"1";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:9:{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:4:"blur";s:4:"Name";s:4:"help";s:11:"own sorting";}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:4:{s:4:"type";s:3:"tab";s:5:"label";s:87:"General|Categories|Private|Details|Links|Distribution lists|Extra|Extra private|History";s:4:"name";s:84:"tabs=general|cats|home|details|links|distribution_list|custom|custom_private|history";s:4:"help";s:141:"Name, Address|Categories|Home address, Birthday, ...|Categories, Notes, ...|Links|Distribution lists, ...|Custom fields|Private custom fields";}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:6:{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:9:"url-phone";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:9:"url-phone";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:9:"url-phone";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:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}s:1:"C";a:4:{s:4:"type";s:9:"url-phone";s:4:"name";s:7:"tel_fax";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:16:"tel_fax,♥";s:4:"name";s:10:"tel_prefer";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;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:5:{s:4:"type";s:6:"button";s:5:"label";s:8:"More ...";s:7:"onclick";s:111:"jQuery(\'table.editphones\').css(\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:9:"accesskey";s:1:"m";s:4:"name";s:12:"button[more]";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:5;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:3:"url";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:3:"url";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:4:{s:4:"type";s:9:"url-email";s:4:"name";s:5:"email";s:4:"size";s:6:"28,128";s:8:"onchange";s:30:"check_value(this,\'$cont[id]\');";}}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:4:{s:4:"type";s:9:"url-email";s:4:"name";s:10:"email_home";s:4:"size";s:6:"28,128";s:8:"onchange";s:30:"check_value(this,\'$cont[id]\');";}}}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:9:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"7";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:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,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:198:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.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;";}i:7;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:"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:4;s:4:"cols";i:2;s:5:"align";s:6:"center";s:7:"options";a:0:{}}}','size' => '','style' => '','modified' => '1343142627',);
+$templ_data[] = array('name' => 'addressbook.edit','template' => '','lang' => '','group' => '0','version' => '1.9.004','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:5:{s:1:"A";s:3:"450";s:1:"B";s:3:"350";s:2:"h1";s:6:",!@msg";s:2:"c3";s:4:",top";s:2:"h4";s:13:",@hidebuttons";}i:1;a:2:{s:1:"A";a:5:{s:7:"no_lang";s:1:"1";s:8:"readonly";s:4:"true";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";s:4:"type";s:8:"htmlarea";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:6:{s:5:"class";s:6:"fileas";s:4:"blur";s:4:"Name";s:7:"no_lang";s:1:"1";s:4:"name";s:11:"fileas_type";s:4:"type";s:6:"select";s:4:"help";s:11:"own sorting";}s:1:"B";a:4:{s:4:"type";s:4:"grid";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:5:"class";s:8:"leftPad5";s:5:"label";s:4:"Type";s:7:"no_lang";s:1:"1";s:8:"onchange";s:1:"1";s:4:"name";s:3:"tid";s:4:"type";s:6:"select";}s:1:"B";a:7:{s:5:"label";s:1:" ";s:6:"needed";s:1:"1";s:7:"no_lang";s:1:"1";s:8:"readonly";s:4:"true";s:4:"name";s:7:"typegfx";s:4:"type";s:4:"html";s:4:"span";s:6:",space";}}}s:4:"cols";i:2;s:4:"rows";i:1;}}i:3;a:2:{s:1:"A";a:4:{s:4:"name";s:232:"addressbook.edit.general|addressbook.edit.cats|addressbook.edit.home|addressbook.edit.details|addressbook.edit.links|addressbook.edit.distribution_list|addressbook.edit.custom|addressbook.edit.custom_private|addressbook.edit.history";s:4:"type";s:3:"tab";s:5:"label";s:87:"General|Categories|Private|Details|Links|Distribution lists|Extra|Extra private|History";s:4:"help";s:142:"Name, Address|Categories|Home address, Birthday, ...|Categories, Notes, ...|Links|Distribution lists, ...|Custom fields|Private custom fields|";}s:1:"B";a:5:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"3";i:1;a:2:{s:4:"name";s:22:"addressbook.editphones";s:4:"type";s:8:"template";}i:2;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:4:"span";s:11:",phoneGroup";s:5:"label";s:13:"Phone Numbers";i:1;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:6:{i:0;a:2:{s:1:"A";s:2:"20";s:1:"B";s:3:"120";}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:3:"for";s:8:"tel_work";s:4:"type";s:5:"label";s:5:"label";s:8:"business";}s:1:"C";a:4:{s:4:"name";s:8:"tel_work";s:4:"size";s:5:"24,40";s:4:"type";s:9:"url-phone";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"name";s:10:"tel_prefer";s:4:"size";s:17:"tel_work,♥";s:4:"type";s:5:"radio";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:3:"for";s:8:"tel_cell";s:4:"type";s:5:"label";s:5:"label";s:12:"mobile phone";}s:1:"C";a:4:{s:4:"name";s:8:"tel_cell";s:4:"size";s:5:"24,40";s:4:"type";s:9:"url-phone";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"name";s:10:"tel_prefer";s:4:"size";s:17:"tel_cell,♥";s:4:"type";s:5:"radio";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:3:"for";s:8:"tel_home";s:4:"type";s:5:"label";s:5:"label";s:7:"Private";}s:1:"C";a:4:{s:4:"name";s:8:"tel_home";s:4:"size";s:5:"24,40";s:4:"type";s:9:"url-phone";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"name";s:10:"tel_prefer";s:4:"size";s:17:"tel_home,♥";s:4:"type";s:5:"radio";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:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}s:1:"C";a:4:{s:4:"name";s:7:"tel_fax";s:4:"size";s:5:"24,40";s:4:"type";s:9:"url-phone";s:4:"span";s:11:",telNumbers";}s:1:"D";a:4:{s:4:"name";s:10:"tel_prefer";s:4:"size";s:16:"tel_fax,♥";s:4:"type";s:5:"radio";s:4:"help";s:46:"select phone number as prefered way of contact";}}i:5;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:5:{s:9:"accesskey";s:1:"m";s:5:"label";s:8:"More ...";s:7:"onclick";s:111:"jQuery(\'table.editphones\').css(\'display\',\'inline\'); if (window.showphones) showphones(this.form); return false;";s:4:"name";s:12:"button[more]";s:4:"type";s:6:"button";}s:1:"D";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:4;s:4:"rows";i:5;}}i:3;a:5:{s:4:"type";s:8:"groupbox";s:4:"size";s:1:"1";s:4:"span";s:11:",emailGroup";s:5:"label";s:16:"Email & Internet";i:1;a:4:{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:3:"for";s:3:"url";s:4:"type";s:5:"label";s:5:"label";s:3:"url";}s:1:"C";a:3:{s:4:"name";s:3:"url";s:4:"size";s:6:"28,128";s:4:"type";s:3:"url";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:3:"for";s:8:"url_home";s:4:"type";s:5:"label";s:5:"label";s:7:"Private";}s:1:"C";a:3:{s:4:"name";s:8:"url_home";s:4:"size";s:6:"28,128";s:4:"type";s:3:"url";}}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:3:"for";s:5:"email";s:4:"type";s:5:"label";s:5:"label";s:5:"email";}s:1:"C";a:4:{s:8:"onchange";s:30:"check_value(this,\'$cont[id]\');";s:4:"name";s:5:"email";s:4:"size";s:6:"28,128";s:4:"type";s:9:"url-email";}}i:4;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:3:{s:3:"for";s:10:"email_home";s:4:"type";s:5:"label";s:5:"label";s:7:"Private";}s:1:"C";a:4:{s:8:"onchange";s:30:"check_value(this,\'$cont[id]\');";s:4:"name";s:10:"email_home";s:4:"size";s:6:"28,128";s:4:"type";s:9:"url-email";}}}s:4:"cols";i:3;s:4:"rows";i:4;}}}}i:4;a:2:{s:1:"A";a:9:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"7";i:1;a:4:{s:5:"label";s:4:"Edit";s:7:"onclick";s:189:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]\'),\'_blank\',\'dependent=yes,width=850,height=460,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:12:"button[edit]";s:4:"type";s:6:"button";}i:2;a:4:{s:5:"label";s:4:"Copy";s:7:"onclick";s:198:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$cont[id]&makecp=1\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:12:"button[copy]";s:4:"type";s:6:"button";}i:3;a:4:{s:5:"label";s:5:"vCard";s:4:"name";s:13:"button[vcard]";s:4:"type";s:6:"button";s:4:"help";s:35:"download this contact as vCard file";}i:4;a:4:{s:9:"accesskey";s:1:"s";s:5:"label";s:4:"Save";s:4:"name";s:12:"button[save]";s:4:"type";s:6:"button";}i:5;a:3:{s:5:"label";s:5:"Apply";s:4:"name";s:13:"button[apply]";s:4:"type";s:6:"button";}i:6;a:4:{s:5:"label";s:6:"Cancel";s:7:"onclick";s:65:"if($cont[view] || false) return true; self.close(); return false;";s:4:"name";s:14:"button[cancel]";s:4:"type";s:6:"button";}i:7;a:5:{s:5:"label";s:31:"change all organisation members";s:4:"span";s:3:"all";s:4:"name";s:10:"change_org";s:4:"type";s:8:"checkbox";s:4:"help";s:73:"Apply changes to all members, whose fields have the same previous content";}}s:1:"B";a:6:{s:5:"align";s:5:"right";s:5:"label";s:6:"Delete";s:7:"onclick";s:65:"return confirm(\'Are you shure you want to delete this contact?\');";s:8:"tabindex";s:2:"25";s:4:"name";s:14:"button[delete]";s:4:"type";s:6:"button";}}}s:4:"cols";i:2;s:4:"rows";i:4;}}','size' => '','style' => '','modified' => '1375194166',);
 
 $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',);
 
@@ -88,7 +88,7 @@ $templ_data[] = array('name' => 'addressbook.importexport_wizzard_fieldmaping','
 
 $templ_data[] = array('name' => 'addressbook.importexport_wizzard_samplefile','template' => '','lang' => '','group' => '0','version' => '0.0.1','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:0:{}i:1;a:1:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"name";s:3:"msg";s:7:"no_lang";s:1:"1";}}i:2;a:1:{s:1:"A";a:2:{s:4:"type";s:4:"file";s:4:"name";s:4:"file";}}}s:4:"rows";i:2;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1146650510',);
 
-$templ_data[] = array('name' => 'addressbook.index','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:4:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";s:2:"h4";s:34:",!@nm[selectcols]=/legacy_actions/";}i:1;a:9:{s:1:"A";a:5:{s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";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:1:"G";a:1:{s:4:"type";s:5:"label";}s:1:"H";a:1:{s:4:"type";s:5:"label";}s:1:"I";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"name";s:22:"addressbook.index.left";s:4:"type";s:8:"template";}s:1:"B";a:3:{s:5:"align";s:5:"right";s:4:"name";s:27:"addressbook.index.right_add";s:4:"type";s:8:"template";}}i:3;a:9:{s:1:"A";a:4:{s:4:"span";s:3:"all";s:4:"name";s:2:"nm";s:4:"size";s:22:"addressbook.index.rows";s:4:"type";s:9:"nextmatch";}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:1:"G";a:1:{s:4:"type";s:5:"label";}s:1:"H";a:1:{s:4:"type";s:5:"label";}s:1:"I";a:1:{s:4:"type";s:5:"label";}}i:4;a:9:{s:1:"A";a:5:{s:5:"label";s:3:"Add";s:7:"onclick";s:168:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:3:"add";s:4:"type";s:6:"button";s:4:"help";s:17:"Add a new contact";}s:1:"B";a:6:{s:5:"align";s:5:"right";s:4:"span";s:3:"all";s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:5:"label";s:13:"Select action";s:7:"onclick";s:231:"if (!egw_globalObjectManager.getObjectById(\'addressbook.\'+({$cont[nm][do_email]} ? \'email\' : \'index\') + \'.rows\').executeActionImplementation(this, \'popup\')) alert(egw::lang(\'You need to select some entries first!\')); return false;;";s:4:"name";s:14:"legacy_actions";s:4:"type";s:10:"buttononly";s:4:"help";s:13:"Select action";}i:2;a:8:{s:5:"label";s:9:"Check all";s:6:"needed";s:1:"1";s:7:"onclick";s:142:"egw_globalObjectManager.getObjectById(\'addressbook.\'+({$cont[nm][do_email]} ? \'email\' : \'index\') + \'.rows\').toggleAllSelected(); return false;";s:4:"name";s:9:"check_all";s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:4:"help";s:9:"Check all";s:4:"span";s:14:",checkAllArrow";}}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:1:"G";a:1:{s:4:"type";s:5:"label";}s:1:"H";a:1:{s:4:"type";s:5:"label";}s:1:"I";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:9;s:4:"rows";i:4;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1307033758',);
+$templ_data[] = array('name' => 'addressbook.index','template' => '','lang' => '','group' => '0','version' => '1.9.002','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:4:{s:2:"h1";s:6:",!@msg";s:2:"h2";s:2:",1";s:2:"c4";s:7:"noPrint";s:2:"h4";s:34:",!@nm[selectcols]=/legacy_actions/";}i:1;a:9:{s:1:"A";a:5:{s:5:"align";s:6:"center";s:7:"no_lang";s:1:"1";s:4:"span";s:13:"all,redItalic";s:4:"name";s:3:"msg";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:1:"G";a:1:{s:4:"type";s:5:"label";}s:1:"H";a:1:{s:4:"type";s:5:"label";}s:1:"I";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:2:{s:4:"name";s:22:"addressbook.index.left";s:4:"type";s:8:"template";}s:1:"B";a:3:{s:5:"align";s:5:"right";s:4:"name";s:27:"addressbook.index.right_add";s:4:"type";s:8:"template";}}i:3;a:9:{s:1:"A";a:4:{s:4:"span";s:3:"all";s:4:"name";s:2:"nm";s:4:"size";s:22:"addressbook.index.rows";s:4:"type";s:9:"nextmatch";}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:1:"G";a:1:{s:4:"type";s:5:"label";}s:1:"H";a:1:{s:4:"type";s:5:"label";}s:1:"I";a:1:{s:4:"type";s:5:"label";}}i:4;a:9:{s:1:"A";a:5:{s:5:"label";s:3:"Add";s:7:"onclick";s:168:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:3:"add";s:4:"type";s:6:"button";s:4:"help";s:17:"Add a new contact";}s:1:"B";a:6:{s:5:"align";s:5:"right";s:4:"span";s:3:"all";s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:5:{s:5:"label";s:13:"Select action";s:7:"onclick";s:231:"if (!egw_globalObjectManager.getObjectById(\'addressbook.\'+({$cont[nm][do_email]} ? \'email\' : \'index\') + \'.rows\').executeActionImplementation(this, \'popup\')) alert(egw::lang(\'You need to select some entries first!\')); return false;;";s:4:"name";s:14:"legacy_actions";s:4:"type";s:10:"buttononly";s:4:"help";s:13:"Select action";}i:2;a:8:{s:5:"label";s:9:"Check all";s:6:"needed";s:1:"1";s:7:"onclick";s:142:"egw_globalObjectManager.getObjectById(\'addressbook.\'+({$cont[nm][do_email]} ? \'email\' : \'index\') + \'.rows\').toggleAllSelected(); return false;";s:4:"name";s:9:"check_all";s:4:"type";s:6:"button";s:4:"size";s:9:"arrow_ltr";s:4:"help";s:9:"Check all";s:4:"span";s:14:",checkAllArrow";}}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:1:"G";a:1:{s:4:"type";s:5:"label";}s:1:"H";a:1:{s:4:"type";s:5:"label";}s:1:"I";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:9;s:4:"rows";i:4;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1372179804',);
 
 $templ_data[] = array('name' => 'addressbook.index.cat_add','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:3:{s:2:"c1";s:4:",top";s:1:"C";s:14:",@cat_tab=Tree";s:1:"D";s:15:",!@cat_tab=Tree";}i:1;a:4:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:6:"folder";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:10:"Categories";}s:1:"C";a:3:{s:4:"type";s:10:"select-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:14:"013,,width:99%";}s:1:"D";a:3:{s:4:"type";s:8:"tree-cat";s:4:"name";s:6:"cat_id";s:4:"size";s:13:"13,,width:99%";}}i:2;a:4:{s:1:"A";a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:3:{s:4:"type";s:6:"button";s:5:"label";s:3:"add";s:4:"name";s:7:"cat_add";}i:2;a:3:{s:4:"type";s:6:"button";s:5:"label";s:6:"delete";s:4:"name";s:10:"cat_delete";}s:4:"span";s:3:"all";i:3;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"cancel";s:4:"name";s:10:"cat_cancel";s:7:"onclick";s:15:"window.close();";}}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:2;s:4:"cols";i:4;s:4:"size";s:17:"100%,300,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"300";i:6;s:4:"auto";}}}','size' => '100%,300,,,,,auto','style' => '','modified' => '1204881537',);
 
@@ -102,7 +102,7 @@ $templ_data[] = array('name' => 'addressbook.index.right_add','template' => '','
 
 $templ_data[] = array('name' => 'addressbook.index.right_addplus','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:2:{i:0;a:0:{}i:1;a:3:{s:1:"A";a:6:{s:5:"align";s:5:"right";s:5:"label";s:4:"Type";s:8:"onchange";s:1:"1";s:4:"name";s:15:"col_filter[tid]";s:4:"size";s:3:"All";s:4:"type";s:6:"select";}s:1:"B";a:5:{s:5:"align";s:5:"right";s:5:"label";s:15:"Advanced search";s:7:"onclick";s:170:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.search\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:6:"search";s:4:"type";s:10:"buttononly";}s:1:"C";a:6:{s:5:"align";s:5:"right";s:5:"label";s:3:"Add";s:7:"onclick";s:168:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit\'),\'_blank\',\'dependent=yes,width=850,height=440,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:3:"add";s:4:"type";s:10:"buttononly";s:4:"help";s:17:"Add a new contact";}}}s:4:"cols";i:3;s:4:"rows";i:1;}}','size' => '','style' => '.rightPadAdd { width: 30px; }','modified' => '1360250716',);
 
-$templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.9.005','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"C";s:9:",@no_role";s:1:"E";s:12:"60,@no_photo";s:1:"K";s:17:",@no_customfields";s:1:"L";s:9:",@no_note";s:1:"M";s:22:",@no_distribution_list";s:1:"R";s:2:"75";s:2:"c1";s:2:"th";s:2:"c2";s:38:"$row_cont[cat_id] $row_cont[class],top";s:1:"H";s:48:",@no_home_adr_two_countrycode_adr_two_postalcode";}i:1;a:18:{s:1:"A";a:2:{s:4:"size";s:1:"1";s:4:"type";s:5:"label";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h1";s:17:",!@order=n_fileas";s:2:"h2";s:16:",!@order=n_given";s:2:"h3";s:17:",!@order=n_family";s:2:"h5";s:85:",!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:5:"label";s:11:"own sorting";s:4:"span";s:3:"all";s:4:"name";s:8:"n_fileas";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:5:"label";s:9:"Firstname";s:4:"name";s:7:"n_given";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:3:{s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";s:4:"type";s:20:"nextmatch-sortheader";}}i:3;a:2:{s:1:"A";a:3:{s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:3:{s:5:"label";s:9:"Firstname";s:4:"name";s:7:"n_given";s:4:"type";s:20:"nextmatch-sortheader";}}i:4;a:2:{s:1:"A";a:4:{s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"name";s:8:"org_name";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:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:4:{s:5:"label";s:9:"Firstname";s:4:"name";s:7:"n_given";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:5:"label";s:11:"own sorting";s:4:"span";s:3:"all";s:4:"name";s:8:"n_fileas";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:6;s:4:"size";s:7:",,,,0,0";}s:1:"C";a:3:{s:5:"label";s:4:"role";s:4:"name";s:4:"role";s:4:"type";s:16:"nextmatch-header";}s:1:"D";a:3:{s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";s:4:"type";s:16:"nextmatch-header";}s:1:"E";a:3:{s:5:"label";s:5:"Photo";s:4:"name";s:5:"photo";s:4:"type";s:16:"nextmatch-header";}s:1:"F";a:3:{s:5:"label";s:8:"Birthday";s:4:"name";s:4:"bday";s:4:"type";s:16:"nextmatch-header";}s:1:"G";a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";s:4:"type";s:16:"nextmatch-header";}i:2;a:4:{s:4:"name";s:19:"adr_one_countrycode";s:4:"size";s:44:"select-country,Country,0,No country selected";s:4:"type";s:22:"nextmatch-customfilter";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:5:"label";s:8:"zip code";s:4:"name";s:18:"adr_one_postalcode";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"H";a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:12:"Home address";s:4:"name";s:4:"home";s:4:"type";s:16:"nextmatch-header";}i:2;a:4:{s:4:"name";s:19:"adr_two_countrycode";s:4:"size";s:44:"select-country,Country,0,No country selected";s:4:"type";s:22:"nextmatch-customfilter";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:5:"label";s:8:"zip code";s:4:"name";s:18:"adr_two_postalcode";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"I";a:6:{s:4:"size";s:6:"4,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:14:"Business phone";s:4:"name";s:8:"tel_work";s:4:"type";s:16:"nextmatch-header";}i:2;a:3:{s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";s:4:"type";s:16:"nextmatch-header";}i:3;a:3:{s:5:"label";s:10:"Home phone";s:4:"name";s:8:"tel_home";s:4:"type";s:16:"nextmatch-header";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}}s:1:"J";a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:3:"Url";s:4:"name";s:3:"url";s:4:"type";s:16:"nextmatch-header";}i:2;a:3:{s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";s:4:"type";s:16:"nextmatch-header";}i:3;a:3:{s:5:"label";s:10:"Home email";s:4:"name";s:10:"email_home";s:4:"type";s:16:"nextmatch-header";}}s:1:"K";a:2:{s:4:"name";s:12:"customfields";s:4:"type";s:22:"nextmatch-customfields";}s:1:"L";a:3:{s:5:"label";s:4:"Note";s:4:"name";s:4:"note";s:4:"type";s:16:"nextmatch-header";}s:1:"M";a:3:{s:5:"label";s:18:"Distribution lists";s:4:"name";s:17:"distribution_list";s:4:"type";s:16:"nextmatch-header";}s:1:"N";a:3:{s:5:"label";s:11:"Addressbook";s:4:"name";s:5:"owner";s:4:"type";s:16:"nextmatch-header";}s:1:"O";a:3:{s:5:"label";s:2:"ID";s:4:"name";s:10:"contact_id";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"P";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:9:"Last date";s:4:"name";s:8:"calendar";s:4:"type";s:16:"nextmatch-header";}i:2;a:3:{s:5:"label";s:9:"Next date";s:4:"name";s:8:"calendar";s:4:"type";s:16:"nextmatch-header";}}s:1:"Q";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:7:"Created";s:4:"name";s:15:"contact_created";s:4:"type";s:20:"nextmatch-sortheader";}i:2;a:3:{s:5:"label";s:13:"Last modified";s:4:"name";s:16:"contact_modified";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"R";a:6:{s:5:"align";s:6:"center";s:5:"class";s:7:"noPrint";s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:5:"align";s:6:"center";s:5:"label";s:7:"Actions";s:4:"name";s:14:"legacy_actions";s:4:"type";s:16:"nextmatch-header";}i:2;a:8:{s:5:"align";s:5:"right";s:5:"label";s:9:"Check all";s:6:"needed";s:1:"1";s:7:"onclick";s:98:"egw_globalObjectManager.getObjectById(\'addressbook.index.rows\').toggleAllSelected(); return false;";s:4:"name";s:9:"check_all";s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:4:"help";s:9:"Check all";}}}i:2;a:18:{s:1:"A";a:5:{s:5:"align";s:6:"center";s:5:"label";s:21:"$row_cont[type_label]";s:7:"no_lang";s:1:"1";s:4:"type";s:5:"image";s:4:"name";s:12:"${row}[type]";}s:1:"B";a:8:{s:4:"name";s:10:"${row}[id]";s:4:"size";s:6:"5,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[line1]";s:4:"type";s:5:"label";}i:2;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[line2]";s:4:"type";s:5:"label";}i:3;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[org_unit]";s:4:"type";s:5:"label";}i:4;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[title]";s:4:"type";s:5:"label";}i:5;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:17:"${row}[first_org]";s:4:"type";s:5:"label";}}s:1:"C";a:2:{s:4:"name";s:12:"${row}[role]";s:4:"type";s:5:"label";}s:1:"D";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"size";s:1:"2";}s:1:"E";a:3:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";s:4:"span";s:7:",iphoto";}s:1:"F";a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:12:"${row}[bday]";s:4:"size";s:5:"Y-m-d";s:4:"type";s:4:"date";}s:1:"G";a:7:{s:4:"size";s:6:"5,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:27:"${row}[adr_one_countryname]";s:4:"type";s:5:"label";}i:2;a:3:{s:4:"type";s:14:"select-country";s:8:"readonly";s:4:"true";s:4:"name";s:27:"${row}[adr_one_countrycode]";}i:3;a:6:{s:6:"orient";s:1:"0";s:4:"size";s:7:"3,0,0,0";s:4:"type";s:4:"hbox";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";s:4:"type";s:5:"label";}i:2;a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_region]";s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:7:"no_lang";s:1:"1";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"type";s:5:"label";s:5:"label";s:1:" ";s:4:"span";s:9:",leftPad5";}}i:4;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";s:4:"type";s:5:"label";}i:5;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:23:"${row}[adr_one_street2]";s:4:"type";s:5:"label";}}s:1:"H";a:7:{s:4:"size";s:6:"5,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:27:"${row}[adr_two_countryname]";s:4:"type";s:5:"label";}i:2;a:3:{s:4:"type";s:14:"select-country";s:8:"readonly";s:4:"true";s:4:"name";s:27:"${row}[adr_two_countrycode]";}i:3;a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"hbox";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";s:4:"type";s:5:"label";}i:2;a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_region]";s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:7:"no_lang";s:1:"1";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"type";s:5:"label";s:5:"label";s:1:" ";s:4:"span";s:9:",leftPad5";}}i:4;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";s:4:"type";s:5:"label";}i:5;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:23:"${row}[adr_two_street2]";s:4:"type";s:5:"label";}}s:1:"I";a:7:{s:4:"size";s:6:"5,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:16:"${row}[tel_work]";s:4:"type";s:9:"url-phone";s:4:"span";s:11:",telNumbers";}i:2;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:16:"${row}[tel_cell]";s:4:"type";s:9:"url-phone";s:4:"span";s:11:",telNumbers";}i:3;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:16:"${row}[tel_home]";s:4:"type";s:9:"url-phone";s:4:"span";s:11:",telNumbers";}i:4;a:3:{s:8:"readonly";s:4:"true";s:4:"name";s:15:"${row}[tel_fax]";s:4:"type";s:9:"url-phone";}i:5;a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[tel_prefered]";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";s:4:"type";s:5:"label";}}s:1:"J";a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:11:"${row}[url]";s:4:"type";s:3:"url";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[email]";s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";}i:3;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:18:"${row}[email_home]";s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";}}s:1:"K";a:5:{s:4:"cols";s:1:"1";s:4:"rows";s:1:"1";s:4:"name";s:4:"$row";s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";}s:1:"L";a:4:{s:7:"no_lang";s:1:"1";s:8:"readonly";s:4:"true";s:4:"name";s:12:"${row}[note]";s:4:"type";s:8:"textarea";}s:1:"M";a:2:{s:4:"name";s:21:"${row}[distrib_lists]";s:4:"type";s:5:"label";}s:1:"N";a:3:{s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[owner]";s:4:"type";s:6:"select";}s:1:"O";a:3:{s:4:"name";s:10:"${row}[id]";s:4:"type";s:5:"label";s:4:"span";s:10:",contactid";}s:1:"P";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:2:{s:4:"name";s:17:"${row}[last_link]";s:4:"type";s:4:"link";}i:2;a:2:{s:4:"name";s:17:"${row}[next_link]";s:4:"type";s:4:"link";}}s:1:"Q";a:6:{s:4:"size";s:6:"4,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:15:"${row}[created]";s:4:"type";s:9:"date-time";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:14:"select-account";s:8:"readonly";s:4:"true";s:4:"name";s:15:"${row}[creator]";}i:3;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:16:"${row}[modified]";s:4:"type";s:9:"date-time";s:4:"span";s:8:",noBreak";}i:4;a:3:{s:4:"type";s:14:"select-account";s:8:"readonly";s:4:"true";s:4:"name";s:16:"${row}[modifier]";}}s:1:"R";a:5:{s:5:"class";s:7:"noPrint";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:5:"label";s:4:"View";s:4:"size";s:56:"addressbook.addressbook_ui.view&contact_id=$row_cont[id]";s:4:"type";s:5:"image";s:4:"name";s:4:"view";}i:2;a:5:{s:5:"label";s:4:"Edit";s:7:"onclick";s:193:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=870,height=460,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:4:"edit";}i:3;a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:4:"help";s:19:"Delete this contact";}i:4;a:5:{s:5:"align";s:5:"right";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"type";s:8:"checkbox";s:4:"help";s:45:"Select multiple contacts for a further action";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:5:{s:5:"label";s:18:"Insert in document";s:4:"name";s:23:"document[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:15:"etemplate/merge";s:4:"span";s:8:",image16";}i:2;a:5:{s:5:"label";s:11:"Filemanager";s:4:"size";s:91:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/addressbook/$row_cont[id]";s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"span";s:8:",image16";}i:3;a:6:{s:5:"label";s:15:"Add appointment";s:7:"onclick";s:195:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&participants=c$row_cont[id]\'),\'_blank\',\'dependent=yes,width=750,height=410,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:8:"calendar";s:4:"type";s:6:"button";s:4:"size";s:15:"calendar/navbar";s:4:"span";s:8:",image16";}}}}}s:4:"cols";i:18;s:4:"rows";i:2;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1307033727',);
+$templ_data[] = array('name' => 'addressbook.index.rows','template' => '','lang' => '','group' => '0','version' => '1.9.005','data' => 'a:1:{i:0;a:5:{s:4:"type";s:4:"grid";s:4:"data";a:3:{i:0;a:9:{s:1:"C";s:9:",@no_role";s:1:"E";s:12:"60,@no_photo";s:1:"K";s:17:",@no_customfields";s:1:"L";s:9:",@no_note";s:1:"M";s:22:",@no_distribution_list";s:1:"R";s:2:"75";s:2:"c1";s:2:"th";s:2:"c2";s:38:"$row_cont[cat_id] $row_cont[class],top";s:1:"H";s:48:",@no_home_adr_two_countrycode_adr_two_postalcode";}i:1;a:18:{s:1:"A";a:3:{s:4:"size";s:1:"1";s:4:"type";s:16:"nextmatch-header";s:4:"name";s:4:"icon";}s:1:"B";a:5:{s:4:"type";s:4:"grid";s:4:"data";a:7:{i:0;a:5:{s:2:"h1";s:17:",!@order=n_fileas";s:2:"h2";s:16:",!@order=n_given";s:2:"h3";s:17:",!@order=n_family";s:2:"h5";s:85:",!@order=/^(org_name|n_fileas|adr_one_postalcode|contact_modified|contact_created|#)/";s:2:"h6";s:16:",@order=n_fileas";}i:1;a:2:{s:1:"A";a:4:{s:5:"label";s:11:"own sorting";s:4:"span";s:3:"all";s:4:"name";s:8:"n_fileas";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:3:{s:5:"label";s:9:"Firstname";s:4:"name";s:7:"n_given";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:3:{s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";s:4:"type";s:20:"nextmatch-sortheader";}}i:3;a:2:{s:1:"A";a:3:{s:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:3:{s:5:"label";s:9:"Firstname";s:4:"name";s:7:"n_given";s:4:"type";s:20:"nextmatch-sortheader";}}i:4;a:2:{s:1:"A";a:4:{s:5:"label";s:12:"Organisation";s:4:"span";s:3:"all";s:4:"name";s:8:"org_name";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:5:"label";s:4:"Name";s:4:"name";s:8:"n_family";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:4:{s:5:"label";s:9:"Firstname";s:4:"name";s:7:"n_given";s:4:"type";s:20:"nextmatch-sortheader";s:4:"span";s:9:",leftPad5";}}i:6;a:2:{s:1:"A";a:4:{s:5:"label";s:11:"own sorting";s:4:"span";s:3:"all";s:4:"name";s:8:"n_fileas";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"cols";i:2;s:4:"rows";i:6;s:4:"size";s:7:",,,,0,0";}s:1:"C";a:3:{s:5:"label";s:4:"role";s:4:"name";s:4:"role";s:4:"type";s:16:"nextmatch-header";}s:1:"D";a:3:{s:5:"label";s:8:"Category";s:4:"name";s:6:"cat_id";s:4:"type";s:16:"nextmatch-header";}s:1:"E";a:3:{s:5:"label";s:5:"Photo";s:4:"name";s:5:"photo";s:4:"type";s:16:"nextmatch-header";}s:1:"F";a:3:{s:5:"label";s:8:"Birthday";s:4:"name";s:4:"bday";s:4:"type";s:16:"nextmatch-header";}s:1:"G";a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:16:"Business address";s:4:"name";s:8:"business";s:4:"type";s:16:"nextmatch-header";}i:2;a:4:{s:4:"name";s:19:"adr_one_countrycode";s:4:"size";s:44:"select-country,Country,0,No country selected";s:4:"type";s:22:"nextmatch-customfilter";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:5:"label";s:8:"zip code";s:4:"name";s:18:"adr_one_postalcode";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"H";a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:12:"Home address";s:4:"name";s:4:"home";s:4:"type";s:16:"nextmatch-header";}i:2;a:4:{s:4:"name";s:19:"adr_two_countrycode";s:4:"size";s:44:"select-country,Country,0,No country selected";s:4:"type";s:22:"nextmatch-customfilter";s:4:"span";s:14:",countrySelect";}i:3;a:3:{s:5:"label";s:8:"zip code";s:4:"name";s:18:"adr_two_postalcode";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"I";a:6:{s:4:"size";s:6:"4,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:14:"Business phone";s:4:"name";s:8:"tel_work";s:4:"type";s:16:"nextmatch-header";}i:2;a:3:{s:5:"label";s:12:"Mobile phone";s:4:"name";s:8:"tel_cell";s:4:"type";s:16:"nextmatch-header";}i:3;a:3:{s:5:"label";s:10:"Home phone";s:4:"name";s:8:"tel_home";s:4:"type";s:16:"nextmatch-header";}i:4;a:2:{s:4:"type";s:5:"label";s:5:"label";s:3:"Fax";}}s:1:"J";a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:3:"Url";s:4:"name";s:3:"url";s:4:"type";s:16:"nextmatch-header";}i:2;a:3:{s:5:"label";s:14:"Business email";s:4:"name";s:5:"email";s:4:"type";s:16:"nextmatch-header";}i:3;a:3:{s:5:"label";s:10:"Home email";s:4:"name";s:10:"email_home";s:4:"type";s:16:"nextmatch-header";}}s:1:"K";a:2:{s:4:"name";s:12:"customfields";s:4:"type";s:22:"nextmatch-customfields";}s:1:"L";a:3:{s:5:"label";s:4:"Note";s:4:"name";s:4:"note";s:4:"type";s:16:"nextmatch-header";}s:1:"M";a:3:{s:5:"label";s:18:"Distribution lists";s:4:"name";s:17:"distribution_list";s:4:"type";s:16:"nextmatch-header";}s:1:"N";a:3:{s:5:"label";s:11:"Addressbook";s:4:"name";s:5:"owner";s:4:"type";s:16:"nextmatch-header";}s:1:"O";a:3:{s:5:"label";s:2:"ID";s:4:"name";s:10:"contact_id";s:4:"type";s:20:"nextmatch-sortheader";}s:1:"P";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:9:"Last date";s:4:"name";s:8:"calendar";s:4:"type";s:16:"nextmatch-header";}i:2;a:3:{s:5:"label";s:9:"Next date";s:4:"name";s:8:"calendar";s:4:"type";s:16:"nextmatch-header";}}s:1:"Q";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:5:"label";s:7:"Created";s:4:"name";s:15:"contact_created";s:4:"type";s:20:"nextmatch-sortheader";}i:2;a:3:{s:5:"label";s:13:"Last modified";s:4:"name";s:16:"contact_modified";s:4:"type";s:20:"nextmatch-sortheader";}}s:1:"R";a:6:{s:5:"align";s:6:"center";s:5:"class";s:7:"noPrint";s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:5:"align";s:6:"center";s:5:"label";s:7:"Actions";s:4:"name";s:14:"legacy_actions";s:4:"type";s:16:"nextmatch-header";}i:2;a:8:{s:5:"align";s:5:"right";s:5:"label";s:9:"Check all";s:6:"needed";s:1:"1";s:7:"onclick";s:98:"egw_globalObjectManager.getObjectById(\'addressbook.index.rows\').toggleAllSelected(); return false;";s:4:"name";s:9:"check_all";s:4:"type";s:6:"button";s:4:"size";s:5:"check";s:4:"help";s:9:"Check all";}}}i:2;a:18:{s:1:"A";a:5:{s:5:"align";s:6:"center";s:5:"label";s:21:"$row_cont[type_label]";s:7:"no_lang";s:1:"1";s:4:"type";s:5:"image";s:4:"name";s:12:"${row}[type]";}s:1:"B";a:8:{s:4:"name";s:10:"${row}[id]";s:4:"size";s:6:"5,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[line1]";s:4:"type";s:5:"label";}i:2;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[line2]";s:4:"type";s:5:"label";}i:3;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:16:"${row}[org_unit]";s:4:"type";s:5:"label";}i:4;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:13:"${row}[title]";s:4:"type";s:5:"label";}i:5;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:17:"${row}[first_org]";s:4:"type";s:5:"label";}}s:1:"C";a:2:{s:4:"name";s:12:"${row}[role]";s:4:"type";s:5:"label";}s:1:"D";a:4:{s:4:"type";s:10:"select-cat";s:8:"readonly";s:1:"1";s:4:"name";s:14:"${row}[cat_id]";s:4:"size";s:1:"2";}s:1:"E";a:3:{s:4:"type";s:5:"image";s:4:"name";s:13:"${row}[photo]";s:4:"span";s:7:",iphoto";}s:1:"F";a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:12:"${row}[bday]";s:4:"size";s:5:"Y-m-d";s:4:"type";s:4:"date";}s:1:"G";a:7:{s:4:"size";s:6:"5,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:27:"${row}[adr_one_countryname]";s:4:"type";s:5:"label";}i:2;a:3:{s:4:"type";s:14:"select-country";s:8:"readonly";s:4:"true";s:4:"name";s:27:"${row}[adr_one_countrycode]";}i:3;a:6:{s:6:"orient";s:1:"0";s:4:"size";s:7:"3,0,0,0";s:4:"type";s:4:"hbox";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_one_locality]";s:4:"type";s:5:"label";}i:2;a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_region]";s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:7:"no_lang";s:1:"1";s:4:"name";s:26:"${row}[adr_one_postalcode]";s:4:"type";s:5:"label";s:5:"label";s:1:" ";s:4:"span";s:9:",leftPad5";}}i:4;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_one_street]";s:4:"type";s:5:"label";}i:5;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:23:"${row}[adr_one_street2]";s:4:"type";s:5:"label";}}s:1:"H";a:7:{s:4:"size";s:6:"5,,0,0";s:4:"type";s:4:"vbox";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:27:"${row}[adr_two_countryname]";s:4:"type";s:5:"label";}i:2;a:3:{s:4:"type";s:14:"select-country";s:8:"readonly";s:4:"true";s:4:"name";s:27:"${row}[adr_two_countrycode]";}i:3;a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"hbox";i:1;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:24:"${row}[adr_two_locality]";s:4:"type";s:5:"label";}i:2;a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_region]";s:4:"type";s:5:"label";s:4:"span";s:9:",leftPad5";}i:3;a:5:{s:7:"no_lang";s:1:"1";s:4:"name";s:26:"${row}[adr_two_postalcode]";s:4:"type";s:5:"label";s:5:"label";s:1:" ";s:4:"span";s:9:",leftPad5";}}i:4;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:22:"${row}[adr_two_street]";s:4:"type";s:5:"label";}i:5;a:3:{s:7:"no_lang";s:1:"1";s:4:"name";s:23:"${row}[adr_two_street2]";s:4:"type";s:5:"label";}}s:1:"I";a:7:{s:4:"size";s:6:"5,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:16:"${row}[tel_work]";s:4:"type";s:9:"url-phone";s:4:"span";s:11:",telNumbers";}i:2;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:16:"${row}[tel_cell]";s:4:"type";s:9:"url-phone";s:4:"span";s:11:",telNumbers";}i:3;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:16:"${row}[tel_home]";s:4:"type";s:9:"url-phone";s:4:"span";s:11:",telNumbers";}i:4;a:3:{s:8:"readonly";s:4:"true";s:4:"name";s:15:"${row}[tel_fax]";s:4:"type";s:9:"url-phone";}i:5;a:4:{s:7:"no_lang";s:1:"1";s:4:"name";s:20:"${row}[tel_prefered]";s:4:"size";s:57:",$row_cont[tel_prefered_link],,,calling,$cont[call_popup]";s:4:"type";s:5:"label";}}s:1:"J";a:5:{s:4:"size";s:6:"3,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:11:"${row}[url]";s:4:"type";s:3:"url";s:4:"span";s:12:",fixedHeight";}i:2;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[email]";s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";}i:3;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:18:"${row}[email_home]";s:4:"type";s:9:"url-email";s:4:"span";s:12:",fixedHeight";}}s:1:"K";a:5:{s:4:"cols";s:1:"1";s:4:"rows";s:1:"1";s:4:"name";s:4:"$row";s:4:"type";s:17:"customfields-list";s:4:"span";s:13:",customfields";}s:1:"L";a:4:{s:7:"no_lang";s:1:"1";s:8:"readonly";s:4:"true";s:4:"name";s:12:"${row}[note]";s:4:"type";s:8:"textarea";}s:1:"M";a:2:{s:4:"name";s:21:"${row}[distrib_lists]";s:4:"type";s:5:"label";}s:1:"N";a:3:{s:8:"readonly";s:4:"true";s:4:"name";s:13:"${row}[owner]";s:4:"type";s:6:"select";}s:1:"O";a:3:{s:4:"name";s:10:"${row}[id]";s:4:"type";s:5:"label";s:4:"span";s:10:",contactid";}s:1:"P";a:4:{s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:2:{s:4:"name";s:17:"${row}[last_link]";s:4:"type";s:4:"link";}i:2;a:2:{s:4:"name";s:17:"${row}[next_link]";s:4:"type";s:4:"link";}}s:1:"Q";a:6:{s:4:"size";s:6:"4,,0,0";s:4:"type";s:4:"vbox";i:1;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:15:"${row}[created]";s:4:"type";s:9:"date-time";s:4:"span";s:7:",noWrap";}i:2;a:3:{s:4:"type";s:14:"select-account";s:8:"readonly";s:4:"true";s:4:"name";s:15:"${row}[creator]";}i:3;a:4:{s:8:"readonly";s:4:"true";s:4:"name";s:16:"${row}[modified]";s:4:"type";s:9:"date-time";s:4:"span";s:8:",noBreak";}i:4;a:3:{s:4:"type";s:14:"select-account";s:8:"readonly";s:4:"true";s:4:"name";s:16:"${row}[modifier]";}}s:1:"R";a:5:{s:5:"class";s:7:"noPrint";s:4:"size";s:6:"2,,0,0";s:4:"type";s:4:"vbox";i:1;a:6:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"4";i:1;a:4:{s:5:"label";s:4:"View";s:4:"size";s:56:"addressbook.addressbook_ui.view&contact_id=$row_cont[id]";s:4:"type";s:5:"image";s:4:"name";s:4:"view";}i:2;a:5:{s:5:"label";s:4:"Edit";s:7:"onclick";s:193:"window.open(egw::link(\'/index.php\',\'menuaction=addressbook.addressbook_ui.edit&contact_id=$row_cont[id]\'),\'_blank\',\'dependent=yes,width=870,height=460,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:19:"edit[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:4:"edit";}i:3;a:6:{s:5:"label";s:6:"Delete";s:7:"onclick";s:38:"return confirm(\'Delete this contact\');";s:4:"name";s:21:"delete[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:6:"delete";s:4:"help";s:19:"Delete this contact";}i:4;a:5:{s:5:"align";s:5:"right";s:4:"name";s:9:"checked[]";s:4:"size";s:13:"$row_cont[id]";s:4:"type";s:8:"checkbox";s:4:"help";s:45:"Select multiple contacts for a further action";}}i:2;a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"3";i:1;a:5:{s:5:"label";s:18:"Insert in document";s:4:"name";s:23:"document[$row_cont[id]]";s:4:"type";s:6:"button";s:4:"size";s:15:"etemplate/merge";s:4:"span";s:8:",image16";}i:2;a:5:{s:5:"label";s:11:"Filemanager";s:4:"size";s:91:"/index.php?menuaction=filemanager.filemanager_ui.index&path=/apps/addressbook/$row_cont[id]";s:4:"type";s:5:"image";s:4:"name";s:18:"filemanager/navbar";s:4:"span";s:8:",image16";}i:3;a:6:{s:5:"label";s:15:"Add appointment";s:7:"onclick";s:195:"window.open(egw::link(\'/index.php\',\'menuaction=calendar.calendar_uiforms.edit&participants=c$row_cont[id]\'),\'_blank\',\'dependent=yes,width=750,height=410,scrollbars=yes,status=yes\'); return false;";s:4:"name";s:8:"calendar";s:4:"type";s:6:"button";s:4:"size";s:15:"calendar/navbar";s:4:"span";s:8:",image16";}}}}}s:4:"cols";i:18;s:4:"rows";i:2;s:4:"size";s:4:"100%";}}','size' => '100%','style' => '','modified' => '1307033727',);
 
 $templ_data[] = array('name' => 'addressbook.search','template' => '','lang' => '','group' => '0','version' => '1.8.001','data' => 'a:1:{i:0;a:4:{s:4:"type";s:4:"grid";s:4:"data";a:4:{i:0;a:0:{}i:1;a:2:{s:1:"A";a:2:{s:4:"type";s:8:"template";s:4:"name";s:16:"addressbook.edit";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:2;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:6:"select";s:5:"label";s:8:"Operator";s:4:"name";s:8:"operator";s:7:"no_lang";s:1:"1";}i:2;a:3:{s:4:"type";s:6:"select";s:4:"name";s:11:"meth_select";s:7:"no_lang";s:1:"1";}s:4:"span";s:3:"all";}s:1:"B";a:1:{s:4:"type";s:5:"label";}}i:3;a:2:{s:1:"A";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:1:"2";s:4:"span";s:3:"all";i:1;a:4:{s:4:"type";s:6:"button";s:5:"label";s:6:"Search";s:4:"name";s:14:"button[search]";s:7:"onclick";s:37:"xajax_eT_wrapper(this); return false;";}i:2;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:37:"xajax_eT_wrapper(this); return false;";}}s:1:"B";a:1:{s:4:"type";s:5:"label";}}}s:4:"rows";i:3;s:4:"cols";i:2;}}','size' => '','style' => '','modified' => '1161707411',);
 
diff --git a/addressbook/templates/default/edit.xet b/addressbook/templates/default/edit.xet
index 22caa80363..10b725149f 100644
--- a/addressbook/templates/default/edit.xet
+++ b/addressbook/templates/default/edit.xet
@@ -27,23 +27,23 @@
 			</columns>
 			<rows>
 				<row>
-					<description value="prefix" for="n_prefix"/>
+					<description for="n_prefix" value="prefix"/>
 					<textbox id="n_prefix" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/>
 				</row>
 				<row>
-					<description value="first name" for="n_given"/>
+					<description for="n_given" value="first name"/>
 					<textbox id="n_given" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/>
 				</row>
 				<row>
-					<description value="middle name" for="n_middle"/>
+					<description for="n_middle" value="middle name"/>
 					<textbox id="n_middle" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/>
 				</row>
 				<row>
-					<description value="last name" for="n_family"/>
+					<description for="n_family" value="last name"/>
 					<textbox id="n_family" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/>
 				</row>
 				<row>
-					<description value="suffix" for="n_suffix"/>
+					<description for="n_suffix" value="suffix"/>
 					<textbox id="n_suffix" onchange="check_value(this,'$cont[id]');" size="35" maxlength="64"/>
 				</row>
 				<row>
@@ -72,7 +72,6 @@
 							<column/>
 							<column/>
 							<column/>
-							<column/>
 						</columns>
 						<rows>
 							<row>
@@ -86,12 +85,12 @@
 								<description/>
 							</row>
 							<row>
-								<description value="Title" for="title"/>
+								<description for="title" value="Title"/>
 								<textbox id="title" size="36" maxlength="64" span="2"/>
 								<description/>
 							</row>
 							<row>
-								<description value="Role" for="role"/>
+								<description for="role" value="Role"/>
 								<textbox id="role" size="20" maxlength="64"/>
 								<textbox label="Room" id="room" size="5"/>
 								<description/>
@@ -106,12 +105,12 @@
 				</row>
 				<row>
 					<description/>
-					<description value="department" for="org_unit"/>
+					<description for="org_unit" value="department"/>
 					<textbox id="org_unit" onchange="check_value(this,'$cont[id]');" size="45" maxlength="64"/>
 				</row>
 				<row>
 					<image src="gohome"/>
-					<description value="street" for="adr_one_street"/>
+					<description for="adr_one_street" value="street"/>
 					<textbox id="adr_one_street" size="45" maxlength="64"/>
 				</row>
 				<row>
@@ -121,7 +120,7 @@
 				</row>
 				<row disabled="@addr_format=city_state_postcode">
 					<description/>
-					<description value="city" for="adr_one_locality"/>
+					<description for="adr_one_locality" value="city"/>
 					<hbox options="0,0">
 						<textbox statustext="ZIP Code" id="adr_one_postalcode" size="5" maxlength="64"/>
 						<textbox statustext="City" id="adr_one_locality" size="35" maxlength="64" class="leftPad5"/>
@@ -129,10 +128,10 @@
 				</row>
 				<row disabled="@addr_format=city_state_postcode">
 					<description/>
-					<description value="country" for="adr_one_countryname"/>
+					<description for="adr_one_countryname" value="country"/>
 					<hbox options="0,0">
-						<menulist class="countrySelect">
-							<menupopup type="select-country" id="adr_one_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
+						<menulist>
+							<menupopup type="select-country" class="countrySelect" id="adr_one_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
 						</menulist>
 						<textbox id="adr_one_countryname" class="custom_country"/>
 						<textbox statustext="State" id="adr_one_region" size="19" maxlength="64" class="leftPad5"/>
@@ -149,10 +148,10 @@
 				</row>
 				<row disabled="!@addr_format=city_state_postcode">
 					<description/>
-					<description value="country" for="adr_one_countryname"/>
+					<description for="adr_one_countryname" value="country"/>
 					<hbox options="0,0">
-						<menulist class="countrySelect">
-							<menupopup type="select-country" id="adr_one_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
+						<menulist>
+							<menupopup type="select-country" class="countrySelect" id="adr_one_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
 						</menulist>
 						<textbox id="adr_one_countryname" class="custom_country"/>
 					</hbox>
@@ -160,8 +159,8 @@
 				<row valign="bottom" height="25">
 					<image src="private.png"/>
 					<description value="Addressbook"/>
-					<menulist class="owner">
-						<menupopup statustext="Addressbook the contact should be saved to" id="owner" no_lang="1"/>
+					<menulist>
+						<menupopup class="owner" statustext="Addressbook the contact should be saved to" id="owner" no_lang="1"/>
 					</menulist>
 				</row>
 			</rows>
@@ -195,7 +194,7 @@
 			<rows>
 				<row>
 					<image src="accounts"/>
-					<description value="street" for="adr_two_street"/>
+					<description for="adr_two_street" value="street"/>
 					<textbox id="adr_two_street" size="45" maxlength="64"/>
 				</row>
 				<row>
@@ -205,7 +204,7 @@
 				</row>
 				<row disabled="@addr_format2=city_state_postcode">
 					<description/>
-					<description value="city" for="adr_two_locality"/>
+					<description for="adr_two_locality" value="city"/>
 					<hbox options="0,0">
 						<textbox statustext="ZIP Code" id="adr_two_postalcode" size="5" maxlength="64"/>
 						<textbox statustext="City" id="adr_two_locality" size="35" maxlength="64" class="leftPad5"/>
@@ -213,10 +212,10 @@
 				</row>
 				<row disabled="@addr_format2=city_state_postcode">
 					<description/>
-					<description value="country" for="adr_two_countryname"/>
+					<description for="adr_two_countryname" value="country"/>
 					<hbox options="0,0">
-						<menulist class="countrySelect">
-							<menupopup type="select-country" id="adr_two_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
+						<menulist>
+							<menupopup type="select-country" class="countrySelect" id="adr_two_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
 						</menulist>
 						<textbox id="adr_two_countryname" class="custom_country"/>
 						<textbox statustext="State" id="adr_two_region" size="19" maxlength="64" class="leftPad5"/>
@@ -224,7 +223,7 @@
 				</row>
 				<row disabled="!@addr_format2=city_state_postcode">
 					<description/>
-					<description value="city" for="adr_two_locality"/>
+					<description for="adr_two_locality" value="city"/>
 					<hbox options="0,0">
 						<textbox statustext="City" id="adr_two_locality" size="30" maxlength="64"/>
 						<textbox statustext="State" id="adr_two_region" size="3" maxlength="64" class="leftPad5"/>
@@ -235,15 +234,15 @@
 					<description/>
 					<description value="Country"/>
 					<hbox options="0,0">
-						<menulist class="countrySelect">
-							<menupopup type="select-country" id="adr_two_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
+						<menulist>
+							<menupopup type="select-country" class="countrySelect" id="adr_two_countrycode" onchange="show_custom_country(this);" options="Select one,0,1"/>
 						</menulist>
 						<textbox id="adr_two_countryname" class="custom_country"/>
 					</hbox>
 				</row>
 				<row height="30">
 					<image src="gear"/>
-					<description value="Birthday" for="bday"/>
+					<description for="bday" value="Birthday"/>
 					<hbox options="0,0">
 						<date id="bday" options="Y-m-d"/>
 						<menulist>
@@ -253,7 +252,7 @@
 				</row>
 				<row valign="top">
 					<image src="private.png"/>
-					<description value="Public key" for="pubkey"/>
+					<description for="pubkey" value="Public key"/>
 					<textbox multiline="true" id="pubkey" rows="4" cols="40"/>
 				</row>
 			</rows>
@@ -405,12 +404,16 @@
 				<column/>
 				<column/>
 				<column/>
+				<column/>
+				<column/>
 			</columns>
 			<rows>
 				<row>
 					<description align="center" value="Edit Phonenumbers - " id="fn" no_lang="1" span="all" class="windowheader"/>
 					<description/>
 					<description/>
+					<description/>
+					<description/>
 				</row>
 				<row class="th">
 					<description value="Description"/>
@@ -418,27 +421,27 @@
 					<description value="pref"/>
 				</row>
 				<row>
-					<description value="business" for="tel_work2" class="bold"/>
+					<description for="tel_work2" value="business" class="bold"/>
 					<url-phone id="tel_work2" options="30"/>
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_work,&amp;hearts;"/>
 				</row>
 				<row>
-					<description value="mobile phone" for="tel_cell2"/>
+					<description for="tel_cell2" value="mobile phone"/>
 					<url-phone id="tel_cell2" options="30"/>
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_cell,&amp;hearts;"/>
 				</row>
 				<row>
-					<description value="fax" for="tel_fax"/>
+					<description for="tel_fax" value="fax"/>
 					<url-phone id="tel_fax2" options="30"/>
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_fax,&amp;hearts;"/>
 				</row>
 				<row>
-					<description value="car phone" for="tel_car"/>
+					<description for="tel_car" value="car phone"/>
 					<url-phone id="tel_car" options="30"/>
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_car,&amp;hearts;"/>
 				</row>
 				<row>
-					<description value="pager" for="tel_pager"/>
+					<description for="tel_pager" value="pager"/>
 					<url-phone id="tel_pager" options="30"/>
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_pager,&amp;hearts;"/>
 				</row>
@@ -446,11 +449,11 @@
 					<hrule span="all"/>
 				</row>
 				<row>
-					<description value="Assistent" for="assistent" class="bold"/>
+					<description for="assistent" value="Assistent" class="bold"/>
 					<textbox id="assistent" size="35" span="2"/>
 				</row>
 				<row>
-					<description value="number" for="tel_assistent"/>
+					<description for="tel_assistent" value="number"/>
 					<url-phone id="tel_assistent" options="30"/>
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_assistent,&amp;hearts;"/>
 				</row>
@@ -458,17 +461,17 @@
 					<hrule span="all"/>
 				</row>
 				<row>
-					<description value="Private" for="tel_home2" class="bold"/>
+					<description for="tel_home2" value="Private" class="bold"/>
 					<url-phone id="tel_home2" options="30"/>
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_home,&amp;hearts;"/>
 				</row>
 				<row>
-					<description value="mobile phone" for="tel_cell_private"/>
+					<description for="tel_cell_private" value="mobile phone"/>
 					<url-phone id="tel_cell_private" options="30"/>
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_cell_private,&amp;hearts;"/>
 				</row>
 				<row>
-					<description value="fax" for="tel_fax_home"/>
+					<description for="tel_fax_home" value="fax"/>
 					<url-phone id="tel_fax_home" options="30"/>
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_fax_home,&amp;hearts;"/>
 				</row>
@@ -476,7 +479,7 @@
 					<hrule span="all"/>
 				</row>
 				<row>
-					<description value=" Other Phone" for="tel_other"/>
+					<description for="tel_other" value=" Other Phone"/>
 					<url-phone id="tel_other" options="30"/>
 					<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_other,&amp;hearts;"/>
 				</row>
@@ -498,8 +501,8 @@
 					<description/>
 				</row>
 				<row>
-					<menulist class="fileas">
-						<menupopup blur="Name" statustext="own sorting" id="fileas_type" no_lang="1"/>
+					<menulist>
+						<menupopup blur="Name" class="fileas" statustext="own sorting" id="fileas_type" no_lang="1"/>
 					</menulist>
 					<grid>
 						<columns>
@@ -508,8 +511,8 @@
 						</columns>
 						<rows>
 							<row disabled="@no_tid">
-								<menulist class="leftPad5">
-									<menupopup label="Type" id="tid" no_lang="1" onchange="1"/>
+								<menulist>
+									<menupopup class="leftPad5" label="Type" id="tid" no_lang="1" onchange="1"/>
 								</menulist>
 								<html label=" " id="typegfx" needed="1" no_lang="1" readonly="true" class="space"/>
 							</row>
@@ -517,17 +520,17 @@
 					</grid>
 				</row>
 				<row valign="top">
-					<tabbox id="tabs">
+					<tabbox id="addressbook.edit.general|addressbook.edit.cats|addressbook.edit.home|addressbook.edit.details|addressbook.edit.links|addressbook.edit.distribution_list|addressbook.edit.custom|addressbook.edit.custom_private|addressbook.edit.history">
 						<tabs>
-							<tab id="general" label="General" statustext="Name, Address"/>
-							<tab id="cats" label="Categories" statustext="Categories"/>
-							<tab id="home" label="Private" statustext="Home address, Birthday, ..."/>
-							<tab id="details" label="Details" statustext="Categories, Notes, ..."/>
-							<tab id="links" label="Links" statustext="Links"/>
-							<tab id="distribution_list" label="Distribution lists" statustext="Distribution lists, ..."/>
-							<tab id="custom" label="Extra" statustext="Custom fields"/>
-							<tab id="custom_private" label="Extra private" statustext="Private custom fields"/>
-							<tab id="history" label="History"/>
+							<tab id="addressbook.edit.general" label="General" statustext="Name, Address"/>
+							<tab id="addressbook.edit.cats" label="Categories" statustext="Categories"/>
+							<tab id="addressbook.edit.home" label="Private" statustext="Home address, Birthday, ..."/>
+							<tab id="addressbook.edit.details" label="Details" statustext="Categories, Notes, ..."/>
+							<tab id="addressbook.edit.links" label="Links" statustext="Links"/>
+							<tab id="addressbook.edit.distribution_list" label="Distribution lists" statustext="Distribution lists, ..."/>
+							<tab id="addressbook.edit.custom" label="Extra" statustext="Custom fields"/>
+							<tab id="addressbook.edit.custom_private" label="Extra private" statustext="Private custom fields"/>
+							<tab id="addressbook.edit.history" label="History"/>
 						</tabs>
 						<tabpanels>
 							<template id="addressbook.edit.general"/>
@@ -555,19 +558,19 @@
 								<rows>
 									<row>
 										<image src="phone"/>
-										<description value="business" for="tel_work"/>
+										<description for="tel_work" value="business"/>
 										<url-phone id="tel_work" options="24,40" class="telNumbers"/>
 										<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_work,&amp;hearts;"/>
 									</row>
 									<row>
 										<description/>
-										<description value="mobile phone" for="tel_cell"/>
+										<description for="tel_cell" value="mobile phone"/>
 										<url-phone id="tel_cell" options="24,40" class="telNumbers"/>
 										<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_cell,&amp;hearts;"/>
 									</row>
 									<row>
 										<description/>
-										<description value="Private" for="tel_home"/>
+										<description for="tel_home" value="Private"/>
 										<url-phone id="tel_home" options="24,40" class="telNumbers"/>
 										<radio statustext="select phone number as prefered way of contact" id="tel_prefer" options="tel_home,&amp;hearts;"/>
 									</row>
@@ -597,22 +600,22 @@
 								<rows>
 									<row>
 										<image src="internet"/>
-										<description value="url" for="url"/>
+										<description for="url" value="url"/>
 										<url id="url" options="28,128"/>
 									</row>
 									<row>
 										<description/>
-										<description value="Private" for="url_home"/>
+										<description for="url_home" value="Private"/>
 										<url id="url_home" options="28,128"/>
 									</row>
 									<row>
 										<image src="email.png"/>
-										<description value="email" for="email"/>
+										<description for="email" value="email"/>
 										<url-email id="email" onchange="check_value(this,'$cont[id]');" options="28,128"/>
 									</row>
 									<row>
 										<description/>
-										<description value="Private" for="email_home"/>
+										<description for="email_home" value="Private"/>
 										<url-email id="email_home" onchange="check_value(this,'$cont[id]');" options="28,128"/>
 									</row>
 								</rows>
@@ -627,7 +630,7 @@
 						<button statustext="download this contact as vCard file" label="vCard" id="button[vcard]"/>
 						<button accesskey="s" label="Save" id="button[save]"/>
 						<button label="Apply" id="button[apply]"/>
-						<button label="Cancel" id="button[cancel]" onclick="if($cont[view]0) return true; self.close(); return false;"/>
+						<button label="Cancel" id="button[cancel]" onclick="if($cont[view] || false) return true; self.close(); return false;"/>
 						<checkbox statustext="Apply changes to all members, whose fields have the same previous content" label="change all organisation members" id="change_org" span="all"/>
 					</hbox>
 					<button align="right" label="Delete" id="button[delete]" onclick="return confirm('Are you shure you want to delete this contact?');" tabindex="25"/>