diff --git a/addressbook/inc/class.addressbook_sql.inc.php b/addressbook/inc/class.addressbook_sql.inc.php
index 9f96c36766..12315731f7 100644
--- a/addressbook/inc/class.addressbook_sql.inc.php
+++ b/addressbook/inc/class.addressbook_sql.inc.php
@@ -553,6 +553,14 @@ class addressbook_sql extends so_sql_cf
 		}
 		$contact = parent::read($keys,$extra_cols,$join);
 
+		// Translate country code
+		if($contact['adr_one_countrycode'] != null) {
+			$contact['adr_one_countryname'] = $GLOBALS['egw']->country->get_full_name($contact['adr_one_countrycode'], true);
+		}
+		if($contact['adr_two_countrycode'] != null) {
+			$contact['adr_two_countryname'] = $GLOBALS['egw']->country->get_full_name($contact['adr_two_countrycode'], true);
+		}
+
 		// Change autoinc_id to match $this->db_cols
 		$this->autoinc_id = $this->db_cols[$this->autoinc_id];
 		if(($id = (int)$this->data[$this->autoinc_id]) && $cfs = $this->read_customfields($keys)) {
diff --git a/addressbook/inc/class.addressbook_ui.inc.php b/addressbook/inc/class.addressbook_ui.inc.php
index 7c64a8825b..600a36d873 100644
--- a/addressbook/inc/class.addressbook_ui.inc.php
+++ b/addressbook/inc/class.addressbook_ui.inc.php
@@ -1271,6 +1271,14 @@ class addressbook_ui extends addressbook_bo
 					{
 						unset($content['n_fn']);
 					}
+					// Country codes
+					foreach(array('adr_one', 'adr_two') as $c_prefix)
+					{
+						if ($content[$c_prefix.'_countrycode'] == '-custom-')
+						{
+							$content[$c_prefix.'_countrycode'] = null;
+						}
+					}
 					if ($this->save($content))
 					{
 						$content['msg'] = lang('Contact saved');
@@ -1458,6 +1466,8 @@ class addressbook_ui extends addressbook_bo
 		// how to display addresses
 		$content['addr_format']  = $this->addr_format_by_country($content['adr_one_countryname']);
 		$content['addr_format2'] = $this->addr_format_by_country($content['adr_two_countryname']);
+		$GLOBALS['egw']->js->set_onload('show_custom_country(document.getElementById("exec[adr_one_countrycode]"));');
+		$GLOBALS['egw']->js->set_onload('show_custom_country(document.getElementById("exec[adr_two_countrycode]"));');
 
 		$content['disable_change_org'] = $view || !$content['org_name'];
 		//_debug_array($content);
@@ -2049,6 +2059,28 @@ class addressbook_ui extends addressbook_bo
 				}
 				selbox.value = "";
 			}
+
+		}
+
+		function show_custom_country(selectbox)
+		{
+			custom_field_name = selectbox.name.replace("countrycode", "countryname");
+			custom_field = document.getElementById(custom_field_name);
+			if(custom_field && selectbox.value == "-custom-") {
+				custom_field.style.display = "inline";
+			}
+			else if (custom_field)
+			{
+				if(selectbox.value == "" || selectbox.value == null)
+				{
+					selectbox.value = "-custom-";
+					custom_field.style.display = "inline";
+				}
+				else
+				{
+					custom_field.style.display = "none";
+				}
+			}
 		}
 </script>';
 	}
diff --git a/addressbook/setup/etemplates.inc.php b/addressbook/setup/etemplates.inc.php
index 0c26fc19a9..06684373d4 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() 2010-09-23 13:34
+	* generated by soetemplate::dump4setup() 2010-09-27 17:00
 	*
 	* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
 	* @package addressbook
@@ -38,11 +38,11 @@ $templ_data[] = array('name' => 'addressbook.edit.details','template' => '','lan
 
 $templ_data[] = array('name' => 'addressbook.edit.distribution_list','template' => '','lang' => '','group' => '0','version' => '1.5.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:7:"options";a:0:{}s:4:"data";a:3:{i:0;a:1:{s:2:"c1";s:2:"th";}i:1;a:1:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:18:"Distribution lists";}}i:2;a:1:{s:1:"A";a:5:{s:4:"type";s:4:"grid";s:7:"options";a:0:{}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:4:"span";s:3:"all";s:4:"name";s:13:"distrib_lists";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}}s:4:"rows";i:2;s:4:"cols";i:1;s:4:"size";s:17:"100%,258,,,,,auto";}}','size' => '100%,258,,,,,auto','style' => '','modified' => '1200059576',);
 
-$templ_data[] = array('name' => 'addressbook.edit.general','template' => '','lang' => '','group' => '0','version' => '1.5.002','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:11:{i:0;a:7:{s:2:"c1";s:4:",top";s:3:"c10";s:7:",bottom";s:3:"h10";s:2:"25";s:2:"h9";s:34:",!@addr_format=city_state_postcode";s:2:"h8";s:34:",!@addr_format=city_state_postcode";s:2:"h6";s:33:",@addr_format=city_state_postcode";s:2:"h7";s:33:",@addr_format=city_state_postcode";}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:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:5:"image";s:4:"name";s:5:"photo";s:4:"span";s:6:",photo";s:7:"onclick";s:75:"set_style_by_class(\'table\',\'uploadphoto\',\'display\',\'inline\'); return false;";}i:2;a:2:{s:4:"type";s:8:"template";s:4:"name";s:23:"addressbook.edit.upload";}}s:1:"C";a:49:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:0:{}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:10:{s:4:"type";s:4:"text";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:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:7:"onclick";s:115:"set_style_by_class(\'table\',\'editname\',\'display\',\'inline\'); document.getElementById(form::name(\'n_prefix\')).focus();";s:4:"size";s:3:"-36";s:4:"span";s:12:"2,cursorHand";s:8:"readonly";s:1:"1";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:21:"addressbook.edit.name";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:3;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,title";s:5:"label";s:5:"Title";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"36,64";s:4:"name";s:5:"title";s:4:"span";s:1:"2";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:4;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,role";s:5:"label";s:4:"Role";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,64";s:4:"name";s:4:"role";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:4:"Room";s:4:"name";s:4:"room";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"no_lang";s:1:"1";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";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}i:37;a:1:{s:4:"type";s:5:"label";}i:38;a:1:{s:4:"type";s:5:"label";}i:39;a:1:{s:4:"type";s:5:"label";}i:40;a:1:{s:4:"type";s:5:"label";}i:41;a:1:{s:4:"type";s:5:"label";}i:42;a:1:{s:4:"type";s:5:"label";}i:43;a:1:{s:4:"type";s:5:"label";}i:44;a:1:{s:4:"type";s:5:"label";}i:45;a:1:{s:4:"type";s:5:"label";}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:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Organisation";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:4:"size";s:6:"45,128";s:8:"onchange";s:14:"setName(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: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";}}i:4;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_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";}}i:5;a:3:{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:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:15:"adr_one_street2";s:4:"help";s:14:"address line 2";}}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:4:"city";s:4:"size";s:19:",,,adr_one_locality";}s:1:"C";a:47:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:"5,64";s:4:"name";s:18:"adr_one_postalcode";s:4:"help";s:8:"ZIP Code";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"35,64";s:4:"name";s:16:"adr_one_locality";s:4:"help";s:4:"City";s:4:"span";s:9:",leftPad5";}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";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}i:37;a:1:{s:4:"type";s:5:"label";}i:38;a:1:{s:4:"type";s:5:"label";}i:39;a:1:{s:4:"type";s:5:"label";}i:40;a:1:{s:4:"type";s:5:"label";}i:41;a:1:{s:4:"type";s:5:"label";}i:42;a:1:{s:4:"type";s:5:"label";}i:43;a:1:{s:4:"type";s:5:"label";}i:44;a:1:{s:4:"type";s:5:"label";}i:45;a:1:{s:4:"type";s:5:"label";}}}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:5:"label";s:7:"country";s:4:"size";s:22:",,,adr_one_countryname";}s:1:"C";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;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:14:",countrySelect";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"span";s:9:",leftPad5";s:4:"size";s:5:"19,64";s:4:"name";s:14:"adr_one_region";s:4:"help";s:5:"State";}}}i:8;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"City";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"30,64";s:4:"name";s:16:"adr_one_locality";s:4:"help";s:4:"City";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"span";s:9:",leftPad5";s:4:"size";s:4:"3,64";s:4:"name";s:14:"adr_one_region";s:4:"help";s:5:"State";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:4:"5,64";s:4:"name";s:18:"adr_one_postalcode";s:4:"help";s:8:"ZIP Code";s:4:"span";s:9:",leftPad5";}}}i:9;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_one_countryname";}s:1:"C";a:3:{s:4:"type";s:14:"select-country";s:4:"size";s:12:"Select one,1";s:4:"name";s:19:"adr_one_countryname";}}i:10;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:11:"private.png";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Addressbook";}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:10;s:4:"cols";i:3;s:4:"size";s:4:",286";s:7:"options";a:1:{i:1;s:3:"286";}}}','size' => ',286','style' => '','modified' => '1201776105',);
+$templ_data[] = array('name' => 'addressbook.edit.general','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:11:{i:0;a:7:{s:2:"c1";s:4:",top";s:3:"c10";s:7:",bottom";s:3:"h10";s:2:"25";s:2:"h9";s:34:",!@addr_format=city_state_postcode";s:2:"h8";s:34:",!@addr_format=city_state_postcode";s:2:"h6";s:33:",@addr_format=city_state_postcode";s:2:"h7";s:33:",@addr_format=city_state_postcode";}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:4:{s:4:"type";s:4:"vbox";s:4:"size";s:1:"2";i:1;a:4:{s:4:"type";s:5:"image";s:4:"name";s:5:"photo";s:4:"span";s:6:",photo";s:7:"onclick";s:75:"set_style_by_class(\'table\',\'uploadphoto\',\'display\',\'inline\'); return false;";}i:2;a:2:{s:4:"type";s:8:"template";s:4:"name";s:23:"addressbook.edit.upload";}}s:1:"C";a:49:{s:4:"type";s:4:"grid";s:4:"data";a:5:{i:0;a:0:{}i:1;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"Name";}s:1:"B";a:10:{s:4:"type";s:4:"text";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:"name";s:4:"n_fn";s:7:"no_lang";s:1:"1";s:7:"onclick";s:115:"set_style_by_class(\'table\',\'editname\',\'display\',\'inline\'); document.getElementById(form::name(\'n_prefix\')).focus();";s:4:"size";s:3:"-36";s:4:"span";s:12:"2,cursorHand";s:8:"readonly";s:1:"1";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:2;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:8:"template";s:4:"name";s:21:"addressbook.edit.name";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:3;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:8:",,,title";s:5:"label";s:5:"Title";}s:1:"B";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"36,64";s:4:"name";s:5:"title";s:4:"span";s:1:"2";}s:1:"C";a:1:{s:4:"type";s:5:"label";}}i:4;a:3:{s:1:"A";a:3:{s:4:"type";s:5:"label";s:4:"size";s:7:",,,role";s:5:"label";s:4:"Role";}s:1:"B";a:3:{s:4:"type";s:4:"text";s:4:"size";s:5:"20,64";s:4:"name";s:4:"role";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"size";s:1:"5";s:5:"label";s:4:"Room";s:4:"name";s:4:"room";}}}s:4:"rows";i:4;s:4:"cols";i:3;s:7:"no_lang";s:1:"1";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";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}i:37;a:1:{s:4:"type";s:5:"label";}i:38;a:1:{s:4:"type";s:5:"label";}i:39;a:1:{s:4:"type";s:5:"label";}i:40;a:1:{s:4:"type";s:5:"label";}i:41;a:1:{s:4:"type";s:5:"label";}i:42;a:1:{s:4:"type";s:5:"label";}i:43;a:1:{s:4:"type";s:5:"label";}i:44;a:1:{s:4:"type";s:5:"label";}i:45;a:1:{s:4:"type";s:5:"label";}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:2:{s:4:"type";s:5:"label";s:5:"label";s:12:"Organisation";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"name";s:8:"org_name";s:4:"size";s:6:"45,128";s:8:"onchange";s:14:"setName(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: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";}}i:4;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_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";}}i:5;a:3:{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:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:15:"adr_one_street2";s:4:"help";s:14:"address line 2";}}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:4:"city";s:4:"size";s:19:",,,adr_one_locality";}s:1:"C";a:47:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:"5,64";s:4:"name";s:18:"adr_one_postalcode";s:4:"help";s:8:"ZIP Code";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"35,64";s:4:"name";s:16:"adr_one_locality";s:4:"help";s:4:"City";s:4:"span";s:9:",leftPad5";}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";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}i:37;a:1:{s:4:"type";s:5:"label";}i:38;a:1:{s:4:"type";s:5:"label";}i:39;a:1:{s:4:"type";s:5:"label";}i:40;a:1:{s:4:"type";s:5:"label";}i:41;a:1:{s:4:"type";s:5:"label";}i:42;a:1:{s:4:"type";s:5:"label";}i:43;a:1:{s:4:"type";s:5:"label";}i:44;a:1:{s:4:"type";s:5:"label";}i:45;a:1:{s:4:"type";s:5:"label";}}}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:5:"label";s:7:"country";s:4:"size";s:22:",,,adr_one_countryname";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:5:{s:4:"type";s:14:"select-country";s:4:"size";s:14:"Select one,0,1";s:4:"name";s:19:"adr_one_countrycode";s:4:"span";s:14:",countrySelect";s:8:"onchange";s:26:"show_custom_country(this);";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:19:"adr_one_countryname";s:4:"span";s:15:",custom_country";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"span";s:9:",leftPad5";s:4:"size";s:5:"19,64";s:4:"name";s:14:"adr_one_region";s:4:"help";s:5:"State";}}}i:8;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:4:"City";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"30,64";s:4:"name";s:16:"adr_one_locality";s:4:"help";s:4:"City";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"span";s:9:",leftPad5";s:4:"size";s:4:"3,64";s:4:"name";s:14:"adr_one_region";s:4:"help";s:5:"State";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:4:"5,64";s:4:"name";s:18:"adr_one_postalcode";s:4:"help";s:8:"ZIP Code";s:4:"span";s:9:",leftPad5";}}}i:9;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_one_countryname";}s:1:"C";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-country";s:4:"size";s:14:"Select one,0,1";s:4:"name";s:19:"adr_one_countrycode";s:8:"onchange";s:26:"show_custom_country(this);";s:4:"span";s:14:",countrySelect";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:19:"adr_one_countryname";s:4:"span";s:15:",custom_country";}}}i:10;a:3:{s:1:"A";a:2:{s:4:"type";s:5:"image";s:4:"name";s:11:"private.png";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:11:"Addressbook";}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:10;s:4:"cols";i:3;s:4:"size";s:4:",286";s:7:"options";a:1:{i:1;s:3:"286";}}}','size' => ',286','style' => '','modified' => '1285616408',);
 
 $templ_data[] = array('name' => 'addressbook.edit.history','template' => '','lang' => '','group' => '0','version' => '','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:1:{s:1:"A";a:2:{s:4:"type";s:10:"historylog";s:4:"name";s:7:"history";}}}s:4:"rows";i:1;s:4:"cols";i:1;}}','size' => '','style' => '','modified' => '1265051832',);
 
-$templ_data[] = array('name' => 'addressbook.edit.home','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:9:{i:0;a:6:{s:2:"h5";s:35:",!@addr_format2=city_state_postcode";s:2:"c8";s:4:",top";s:2:"h7";s:2:"30";s:2:"h6";s:35:",!@addr_format2=city_state_postcode";s:2:"h4";s:34:",@addr_format2=city_state_postcode";s:2:"h3";s:34:",@addr_format2=city_state_postcode";}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:2:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,adr_two_street2";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:15:"adr_two_street2";s:4:"help";s:14:"address line 2";}}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:47:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:"5,64";s:4:"name";s:18:"adr_two_postalcode";s:4:"help";s:8:"ZIP Code";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"35,64";s:4:"name";s:16:"adr_two_locality";s:4:"help";s:4:"City";s:4:"span";s:9:",leftPad5";}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";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}i:37;a:1:{s:4:"type";s:5:"label";}i:38;a:1:{s:4:"type";s:5:"label";}i:39;a:1:{s:4:"type";s:5:"label";}i:40;a:1:{s:4:"type";s:5:"label";}i:41;a:1:{s:4:"type";s:5:"label";}i:42;a:1:{s:4:"type";s:5:"label";}i:43;a:1:{s:4:"type";s:5:"label";}i:44;a:1:{s:4:"type";s:5:"label";}i:45;a:1:{s:4:"type";s:5:"label";}}}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:"country";s:4:"size";s:22:",,,adr_two_countryname";}s:1:"C";a:4:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;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:14:",countrySelect";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"span";s:9:",leftPad5";s:4:"size";s:5:"19,64";s:4:"name";s:14:"adr_two_region";s:4:"help";s:5:"State";}}}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:4:"city";s:4:"size";s:19:",,,adr_two_locality";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"30,64";s:4:"name";s:16:"adr_two_locality";s:4:"help";s:4:"City";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"span";s:9:",leftPad5";s:4:"size";s:4:"3,64";s:4:"name";s:14:"adr_two_region";s:4:"help";s:5:"State";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:4:"5,64";s:4:"name";s:18:"adr_two_postalcode";s:4:"help";s:8:"ZIP Code";s:4:"span";s:9:",leftPad5";}}}i:6;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Country";}s:1:"C";a:3:{s:4:"type";s:14:"select-country";s:4:"size";s:12:"Select one,1";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:4:{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:"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:"4,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' => '1178179149',);
+$templ_data[] = array('name' => 'addressbook.edit.home','template' => '','lang' => '','group' => '0','version' => '1.9.001','data' => 'a:1:{i:0;a:6:{s:4:"type";s:4:"grid";s:4:"data";a:9:{i:0;a:6:{s:2:"h5";s:35:",!@addr_format2=city_state_postcode";s:2:"c8";s:4:",top";s:2:"h7";s:2:"30";s:2:"h6";s:35:",!@addr_format2=city_state_postcode";s:2:"h4";s:34:",@addr_format2=city_state_postcode";s:2:"h3";s:34:",@addr_format2=city_state_postcode";}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:2:{s:4:"type";s:5:"label";s:4:"size";s:18:",,,adr_two_street2";}s:1:"C";a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"45,64";s:4:"name";s:15:"adr_two_street2";s:4:"help";s:14:"address line 2";}}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:47:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"2,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:4:"5,64";s:4:"name";s:18:"adr_two_postalcode";s:4:"help";s:8:"ZIP Code";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"size";s:5:"35,64";s:4:"name";s:16:"adr_two_locality";s:4:"help";s:4:"City";s:4:"span";s:9:",leftPad5";}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";}i:26;a:1:{s:4:"type";s:5:"label";}i:27;a:1:{s:4:"type";s:5:"label";}i:28;a:1:{s:4:"type";s:5:"label";}i:29;a:1:{s:4:"type";s:5:"label";}i:30;a:1:{s:4:"type";s:5:"label";}i:31;a:1:{s:4:"type";s:5:"label";}i:32;a:1:{s:4:"type";s:5:"label";}i:33;a:1:{s:4:"type";s:5:"label";}i:34;a:1:{s:4:"type";s:5:"label";}i:35;a:1:{s:4:"type";s:5:"label";}i:36;a:1:{s:4:"type";s:5:"label";}i:37;a:1:{s:4:"type";s:5:"label";}i:38;a:1:{s:4:"type";s:5:"label";}i:39;a:1:{s:4:"type";s:5:"label";}i:40;a:1:{s:4:"type";s:5:"label";}i:41;a:1:{s:4:"type";s:5:"label";}i:42;a:1:{s:4:"type";s:5:"label";}i:43;a:1:{s:4:"type";s:5:"label";}i:44;a:1:{s:4:"type";s:5:"label";}i:45;a:1:{s:4:"type";s:5:"label";}}}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:"country";s:4:"size";s:22:",,,adr_two_countryname";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:5:{s:4:"type";s:14:"select-country";s:4:"size";s:14:"Select one,0,1";s:4:"name";s:19:"adr_two_countrycode";s:4:"span";s:14:",countrySelect";s:8:"onchange";s:26:"show_custom_country(this);";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:19:"adr_two_countryname";s:4:"span";s:15:",custom_country";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"span";s:9:",leftPad5";s:4:"size";s:5:"19,64";s:4:"name";s:14:"adr_two_region";s:4:"help";s:5:"State";}}}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:4:"city";s:4:"size";s:19:",,,adr_two_locality";}s:1:"C";a:5:{s:4:"type";s:4:"hbox";s:4:"size";s:6:"3,,0,0";i:1;a:4:{s:4:"type";s:4:"text";s:4:"size";s:5:"30,64";s:4:"name";s:16:"adr_two_locality";s:4:"help";s:4:"City";}i:2;a:5:{s:4:"type";s:4:"text";s:4:"span";s:9:",leftPad5";s:4:"size";s:4:"3,64";s:4:"name";s:14:"adr_two_region";s:4:"help";s:5:"State";}i:3;a:5:{s:4:"type";s:4:"text";s:4:"size";s:4:"5,64";s:4:"name";s:18:"adr_two_postalcode";s:4:"help";s:8:"ZIP Code";s:4:"span";s:9:",leftPad5";}}}i:6;a:3:{s:1:"A";a:1:{s:4:"type";s:5:"label";}s:1:"B";a:2:{s:4:"type";s:5:"label";s:5:"label";s:7:"Country";}s:1:"C";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-country";s:4:"size";s:14:"Select one,0,1";s:4:"name";s:19:"adr_two_countrycode";s:8:"onchange";s:26:"show_custom_country(this);";s:4:"span";s:14:",countrySelect";}i:2;a:3:{s:4:"type";s:4:"text";s:4:"name";s:19:"adr_two_countryname";s:4:"span";s:15:",custom_country";}}}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:4:{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:"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:"4,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' => '1178179149',);
 
 $templ_data[] = array('name' => 'addressbook.edit.links','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:5:{i:0;a:3:{s:2:"c3";s:2:"th";s:2:"h1";s:6:",@view";s:2:"c1";s:2:"th";}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:7:"link_to";}}}s:4:"rows";i:4;s:4:"cols";i:1;s:4:"size";s:17:"100%,258,,,,,auto";s:7:"options";a:3:{i:0;s:4:"100%";i:1;s:3:"258";i:6;s:4:"auto";}}}','size' => '100%,258,,,,,auto','style' => '','modified' => '1131900825',);
 
diff --git a/addressbook/templates/default/app.css b/addressbook/templates/default/app.css
index ecef6a6959..e8a561a885 100644
--- a/addressbook/templates/default/app.css
+++ b/addressbook/templates/default/app.css
@@ -1,5 +1,6 @@
 .cursorHand { cursor: hand; }
 .countrySelect select { width: 150px; }
+.custom_country input {display: none; }
 .emailCol div { width: 100%; overflow: hidden; }
 .redItalic { color: red; font-style: italic; }
 .fixedHeight,.telNumbers { height: 12px; }