diff --git a/ChangeLog b/ChangeLog
index 6bf488158..516357d9a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-02-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Contacts/UIxContactEditor.m: display and handle the new
+	Freebusy URL entry.
+
 	* SoObjects/Contacts/SOGoContactLDAPFolder.m
 	([SOGoContactLDAPFolder -_searchAttributes]): retrieve "calFBURL"
 	from the server.
diff --git a/UI/Contacts/English.lproj/Localizable.strings b/UI/Contacts/English.lproj/Localizable.strings
index ec1cc675a..739f2a1db 100644
--- a/UI/Contacts/English.lproj/Localizable.strings
+++ b/UI/Contacts/English.lproj/Localizable.strings
@@ -76,6 +76,7 @@
 "Note: " = "Note: ";
 "Timezone: " = "Timezone: ";
 "Birthday: " = "Birthday: ";
+"Freebusy URL: " = "Freebusy URL: ";
 
 "Add as..." = "Add as...";
 "Recipient" = "Recipient";
diff --git a/UI/Contacts/French.lproj/Localizable.strings b/UI/Contacts/French.lproj/Localizable.strings
index ae004fa63..4892982f7 100644
--- a/UI/Contacts/French.lproj/Localizable.strings
+++ b/UI/Contacts/French.lproj/Localizable.strings
@@ -76,6 +76,7 @@
 "Note: " = "Commentaires : ";
 "Timezone: " = "Fuseau horaire : ";
 "Birthday: " = "D. de naissance : ";
+"Freebusy URL: " = "Adresse du FreeBusy : ";
 
 "Add as..." = "Ajouter...";
 "Recipient" = "Destinataire";
diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m
index 275e68a25..ead9c8f32 100644
--- a/UI/Contacts/UIxContactEditor.m
+++ b/UI/Contacts/UIxContactEditor.m
@@ -36,7 +36,7 @@
 {
   if ((self = [super init]))
     {
-      snapshot = [[NSMutableDictionary alloc] initWithCapacity:16];
+      snapshot = [[NSMutableDictionary alloc] initWithCapacity: 16];
       preferredEmail = nil;
     }
 
@@ -330,6 +330,8 @@
         to: [self _simpleValueForType: @"work" inArray: elements]];
   [self _setSnapshotValue: @"homeURL"
         to: [self _simpleValueForType: @"home" inArray: elements]];
+  [self _setSnapshotValue: @"calFBURL"
+        to: [[card uniqueChildWithTag: @"FBURL"] value: 0]];
 
   [self _setSnapshotValue: @"title" to: [card title]];
   [self _setupOrgFields];
@@ -338,10 +340,10 @@
   [self _setSnapshotValue: @"tz" to: [card tz]];
   [self _setSnapshotValue: @"note" to: [card note]];
 
-  [self  _retrieveQueryParameter: @"contactEmail"
-         intoSnapshotValue: @"workMail"];
-  [self  _retrieveQueryParameter: @"contactFN"
-         intoSnapshotValue: @"fn"];
+  [self _retrieveQueryParameter: @"contactEmail"
+        intoSnapshotValue: @"workMail"];
+  [self _retrieveQueryParameter: @"contactFN"
+        intoSnapshotValue: @"fn"];
 }
 
 - (id <WOActionResults>) defaultAction
@@ -455,6 +457,10 @@
   [element setValue: 5 to: [snapshot objectForKey: @"workPostalCode"]];
   [element setValue: 6 to: [snapshot objectForKey: @"workCountry"]];
 
+  element = [CardElement simpleElementWithTag: @"fburl"
+                         value: [snapshot objectForKey: @"calFBURL"]];
+  [card setUniqueChild: element];
+
   [self _savePhoneValues];
   [self _saveEmails];
 }
diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox
index 9309fa4a0..6e3f0f94a 100644
--- a/UI/Templates/ContactsUI/UIxContactEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditor.wox
@@ -329,6 +329,14 @@
                 </label>
               </td>
             </tr>
+            <tr>
+              <td colspan="2">
+                <label><var:string label:value="Freebusy URL: " const:escapeHTML="NO" />
+                  <input type="text" class="textField" name="calFBURL" id="calFBURL"
+                    var:value="snapshot.calFBURL" />
+                </label>
+              </td>
+            </tr>
             <tr>
               <td colspan="2">
                 <label><var:string label:value="Note: " const:escapeHTML="NO" />