diff --git a/addressbook/add.php b/addressbook/add.php
index 7281abaa72..5e115668dd 100755
--- a/addressbook/add.php
+++ b/addressbook/add.php
@@ -80,7 +80,7 @@
 		$fields["tz"]				= $timezone;
 		$fields["bday"]				= $bday;
 		$fields["url"]				= $url;
-		$fields["notes"]			= $notes;
+		$fields["note"]				= $notes;
 	
 		addressbook_add_entry($phpgw_info["user"]["account_id"],$fields);
 		$ab_id = addressbook_get_lastid();
diff --git a/addressbook/edit.php b/addressbook/edit.php
index e0e4e084ea..20f6dafeeb 100755
--- a/addressbook/edit.php
+++ b/addressbook/edit.php
@@ -41,7 +41,6 @@
 			"mphone" => "mphone",
 			"ophone" => "ophone",
 			"address2" => "address2",
-			"notes" => "notes"
 		);
 		$qfields = $this->stock_contact_fields + $extrafields;
 		$fields = addressbook_read_entry($ab_id,$qfields);
@@ -85,7 +84,7 @@
 		$fields["tz"]				= $timezone;
 		$fields["bday"]				= $bday;
 		$fields["url"]				= $url;
-		$fields["notes"]			= $notes;
+		$fields["note"]				= $notes;
 
 		// this is now in functions.inc.php and will handle acl soon
 		//if (!$userid) { 
diff --git a/addressbook/inc/class.contacts_sql.inc.php b/addressbook/inc/class.contacts_sql.inc.php
index bb0b19fd3a..50163467fa 100644
--- a/addressbook/inc/class.contacts_sql.inc.php
+++ b/addressbook/inc/class.contacts_sql.inc.php
@@ -78,6 +78,7 @@
 				"geo"             => "geo",
 				"url"             => "url",
 				"bday"            => "bday",
+				"note"            => "note",
 				"a_tel"           => "a_tel",
 				"a_tel_work"      => "a_tel_work",   //yn
 				"a_tel_home"      => "a_tel_home",   //yn
diff --git a/addressbook/inc/functions.inc.php b/addressbook/inc/functions.inc.php
index 6db89a50bb..f6dbec51a1 100755
--- a/addressbook/inc/functions.inc.php
+++ b/addressbook/inc/functions.inc.php
@@ -87,7 +87,7 @@
 			"address2"			=> "address2",
 			"bday"				=> "birthday",
 			"url"				=> "url",
-			"notes"				=> "notes"
+			"note"				=> "notes"
 		);
 
 		while($name = each($abc) ) {
@@ -165,7 +165,7 @@
 		$country      = $fields["adr_countryname"];
 		$timezone     = $fields["tz"];
 		$bday         = $fields["bday"];
-		$notes        = stripslashes($fields["notes"]);
+		$notes        = stripslashes($fields["note"]);
 		$company      = $fields["org_name"];
 		$department   = $fields["org_unit"];
 		$url          = $fields["url"];
diff --git a/addressbook/index.php b/addressbook/index.php
index 504bde5036..f00fd58330 100755
--- a/addressbook/index.php
+++ b/addressbook/index.php
@@ -33,7 +33,6 @@
 		"mphone"   => "mphone",
 		"ophone"   => "ophone",
 		"address2" => "address2",
-		"notes"    => "notes"
 	);
 	$qfields = $this->stock_contact_fields + $extrafields;
 
diff --git a/addressbook/preferences.php b/addressbook/preferences.php
index 5acf72df93..75f656cb62 100644
--- a/addressbook/preferences.php
+++ b/addressbook/preferences.php
@@ -27,9 +27,6 @@
 		"mphone"   => "mphone",
 		"ophone"   => "ophone",
 		"address2" => "address2",
-		"bday"     => "bday",
-		"url"      => "url",
-		"notes"    => "notes"
 	);
 	$qfields = $this->stock_contact_fields + $extrafields;
 
diff --git a/addressbook/vcardout.php b/addressbook/vcardout.php
index 04c8b263fb..6b7c6ae67d 100644
--- a/addressbook/vcardout.php
+++ b/addressbook/vcardout.php
@@ -64,7 +64,7 @@
 	$company      = $fields["org_name"];
 	$dept         = $fields["org_unit"];
 	$bday         = $fields["bday"];
-	$notes        = $fields["notes"];
+	$notes        = $fields["note"];
 	$access       = $fields["access"];
 	$url          = $fields["url"];
 
diff --git a/addressbook/view.php b/addressbook/view.php
index c42d6b2ed0..1776da8a30 100755
--- a/addressbook/view.php
+++ b/addressbook/view.php
@@ -48,7 +48,6 @@
 		"mphone"   => "mphone",
 		"ophone"   => "ophone",
 		"address2" => "address2",
-		"notes"    => "notes",
 	);
 	$qfields = $this->stock_contact_fields + $extrafields;
 	$fields  = addressbook_read_entry($ab_id,$qfields);