diff --git a/ChangeLog b/ChangeLog
index d820fe0c0..dee38e597 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-06-28  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/Contacts/UIxContactEditor.m (-initSnapshot, -_saveSnapshot):
+	added support for "extended" work/home addresses.
+
 2010-06-25  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/MailerUI/UIxMailMainFrame.m (-inboxData): new method used to
diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m
index 16ea53716..e4a1d4755 100644
--- a/UI/Contacts/UIxContactEditor.m
+++ b/UI/Contacts/UIxContactEditor.m
@@ -427,6 +427,8 @@
   if (elements && [elements count] > 0)
     {
       element = [elements objectAtIndex: 0];
+      [self _setSnapshotValue: @"workExtendedAddress"
+            to: [element value: 1]];
       [self _setSnapshotValue: @"workStreetAddress"
             to: [element value: 2]];
       [self _setSnapshotValue: @"workCity"
@@ -444,6 +446,8 @@
   if (elements && [elements count] > 0)
     {
       element = [elements objectAtIndex: 0];
+      [self _setSnapshotValue: @"homeExtendedAddress"
+            to: [element value: 1]];
       [self _setSnapshotValue: @"homeStreetAddress"
             to: [element value: 2]];
       [self _setSnapshotValue: @"homeCity"
@@ -602,6 +606,7 @@
   [card setTz: [snapshot objectForKey: @"tz"]];
 
   element = [self _elementWithTag: @"adr" ofType: @"home"];
+  [element setValue: 1 to: [snapshot objectForKey: @"homeExtendedAddress"]];
   [element setValue: 2 to: [snapshot objectForKey: @"homeStreetAddress"]];
   [element setValue: 3 to: [snapshot objectForKey: @"homeCity"]];
   [element setValue: 4 to: [snapshot objectForKey: @"homeState"]];
@@ -609,6 +614,7 @@
   [element setValue: 6 to: [snapshot objectForKey: @"homeCountry"]];
 
   element = [self _elementWithTag: @"adr" ofType: @"work"];
+  [element setValue: 1 to: [snapshot objectForKey: @"workExtendedAddress"]];
   [element setValue: 2 to: [snapshot objectForKey: @"workStreetAddress"]];
   [element setValue: 3 to: [snapshot objectForKey: @"workCity"]];
   [element setValue: 4 to: [snapshot objectForKey: @"workState"]];
diff --git a/UI/Templates/ContactsUI/UIxContactEditor.wox b/UI/Templates/ContactsUI/UIxContactEditor.wox
index dcb130995..ff8e69cb9 100644
--- a/UI/Templates/ContactsUI/UIxContactEditor.wox
+++ b/UI/Templates/ContactsUI/UIxContactEditor.wox
@@ -181,6 +181,15 @@
                 </label>
               </td>
             </tr>
+            <tr>
+              <td colspan="2">
+                <label>
+                  <input type="text" class="textField" name="homeExtendedAddress"
+                    id="homeExtendedAddress"
+                    var:value="snapshot.homeExtendedAddress" />
+                </label>
+              </td>
+            </tr>
             <tr>
               <td colspan="2">
                 <label><var:string label:value="City:" />
@@ -267,6 +276,15 @@
                 </label>
               </td>
             </tr>
+            <tr>
+              <td colspan="2">
+                <label>
+                  <input type="text" class="textField" name="workExtendedAddress"
+                    id="workExtendedAddress"
+                    var:value="snapshot.workExtendedAddress" />
+                </label>
+              </td>
+            </tr>
             <tr>
               <td colspan="2">
                 <label><var:string label:value="City:" />
diff --git a/UI/Templates/ContactsUI/UIxContactView.wox b/UI/Templates/ContactsUI/UIxContactView.wox
index dffe956c3..9584b86de 100644
--- a/UI/Templates/ContactsUI/UIxContactView.wox
+++ b/UI/Templates/ContactsUI/UIxContactView.wox
@@ -61,8 +61,8 @@
             /><var:string value="workService" escapeHTML="NO"
             /><var:string value="workCompany" escapeHTML="NO"
             /><var:string value="workPobox" escapeHTML="NO"
-            /><var:string value="workExtendedAddress" escapeHTML="NO"
             /><var:string value="workStreetAddress" escapeHTML="NO"
+            /><var:string value="workExtendedAddress" escapeHTML="NO"
             /><var:string value="workCityAndProv" escapeHTML="NO"
             /><var:string value="workPostalCodeAndCountry" escapeHTML="NO"
             /><var:string value="workUrl" escapeHTML="NO"