diff --git a/ChangeLog b/ChangeLog
index 3c0ae8d13..01a314f7a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,8 @@
 	no FN attribute and no N attribute.
 	(-composeAction): fixed the case when dealing with a contact with
 	no email address.
+	(-composeAction): fixed the case when dealing with a contact from
+	an LDAP source.
 
 	* UI/Scheduler/UIxComponentEditor.m (-calendarList): added proper
 	verification of deletion rights on the current calendar and
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index b367f9a02..4f8064cb1 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -37,6 +37,7 @@
 #import <Contacts/SOGoContactGCSList.h>
 #import <Contacts/SOGoContactGCSEntry.h>
 #import <Contacts/SOGoContactFolders.h>
+#import <Contacts/SOGoContactLDIFEntry.h>
 
 #import <SoObjects/Mailer/SOGoMailObject.h>
 #import <SoObjects/Mailer/SOGoMailAccount.h>
@@ -230,7 +231,8 @@
 			[addresses addObject: formattedMail];
 		    }
                 }
-              else if ([contact isKindOfClass: [SOGoContactGCSEntry class]])
+              else if ([contact isKindOfClass: [SOGoContactGCSEntry class]]
+		       || [contact isKindOfClass: [SOGoContactLDIFEntry class]])
                 {
                   // We fetch the preferred email address of the contact or
                   // the first defined email address
@@ -239,6 +241,7 @@
 		  if (formattedMail)
 		    [addresses addObject: formattedMail];
                 }
+	      
               uid = [uids nextObject];
             }