diff --git a/ChangeLog b/ChangeLog
index a55921e4c..09dfa23c2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-10-19  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Contacts/UIxContactEditor.m ([UIxContactEditor
+	-writeAction]): updated method to fetch the card before initing
+	the snapshot.
+
 	* OGoContentStore/OCSiCalFieldExtractor.m ([OCSiCalFieldExtractor
 	-extractQuickFieldsFromTodo:_task]): fixed to use NSNull instead
 	of NSNotFound.
diff --git a/UI/Contacts/UIxContactEditor.m b/UI/Contacts/UIxContactEditor.m
index 364e1537f..a49cd19d8 100644
--- a/UI/Contacts/UIxContactEditor.m
+++ b/UI/Contacts/UIxContactEditor.m
@@ -492,8 +492,13 @@
 {
   NSString *email, *url;
 
+  card = [[self clientObject] vCard];
   [self initSnapshot];
-  email = [snapshot objectForKey: @"mail"];
+  if ([preferredEmail isEqualToString: @"home"])
+    email = [snapshot objectForKey: @"homeMail"];
+  else
+    email = [snapshot objectForKey: @"workMail"];
+
   if (email)
     url = [NSString stringWithFormat: @"Mail/compose?mailto=%@", email];
   else