diff --git a/ChangeLog b/ChangeLog
index a651500de..0e2cb181e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-08-06  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailEditor.m (-fromEmails): the list of
+	identities is now taken from the corresponding mail account dict.
+
 	* SoObjects/Mailer/SOGoMailForward.m (-signature): same as below.
 
 	* UI/MailerUI/UIxMailAccountActions.m (-composeAction): same as below.
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index 87420f393..04c4e7446 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -347,19 +347,21 @@ static NSArray *infoKeys = nil;
 
 - (NSArray *) fromEMails
 {
-  NSArray *allIdentities;
+  NSArray *identities;
   int count, max;
   NSString *email;
+  SOGoMailAccount *account;
 
   if (!fromEMails)
     { 
-      allIdentities = [[context activeUser] allIdentities];
-      fromEMails = [NSMutableArray new];
-      max = [allIdentities count];
+      account = [[self clientObject] mailAccountFolder];
+      identities = [account identities];
+      max = [identities count];
+      fromEMails = [[NSMutableArray alloc] initWithCapacity: max];
       for (count = 0; count < max; count++)
         {
           email
-            = [self _emailFromIdentity: [allIdentities objectAtIndex: count]];
+            = [self _emailFromIdentity: [identities objectAtIndex: count]];
           [fromEMails addObjectUniquely: email];
         }
     }