diff --git a/ChangeLog b/ChangeLog
index 6b9e347a0..bb7a8289c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-10-23  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/MailerUI/UIxMailMainFrame.m (-formattedMailtoString:): fixed
+	the case when dealing with a NGVCardReference (from a list) with
+	no FN attribute and no N attribute.
+
 	* UI/Scheduler/UIxComponentEditor.m (-calendarList): added proper
 	verification of deletion rights on the current calendar and
 	creation rights on other calendars.
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index d09b1d8df..6e79f6c41 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -279,7 +279,8 @@
 
       // We append the contact's name
       fn = [NSMutableString stringWithString: [card fn]];
-      if ([fn length] == 0)
+      if ([fn length] == 0
+	  && [card isKindOfClass: [NGVCard class]])
         {
           n = [card n];
           if (n)
@@ -294,7 +295,7 @@
                 }
             }
         }
-      if (fn)
+      if ([fn length] > 0)
         {
           [fn appendFormat: @" %@", email];
           rc = fn;