diff --git a/ChangeLog b/ChangeLog
index e99b6bf79..8c65fa5f8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-08-21  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailAccountActions.m ([UIxMailAccountActions
+	-composeAction]): the address fields should be arrays and not
+	simple strings.
+
 	* UI/Common/UIxPageFrame.m ([UIxPageFrame -buildDate]): new method
 	that returns the build date of SOGo in the template.
 
diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m
index f7cb0be53..004c3a634 100644
--- a/UI/MailerUI/UIxMailAccountActions.m
+++ b/UI/MailerUI/UIxMailAccountActions.m
@@ -123,15 +123,17 @@
 {
   SOGoDraftsFolder *drafts;
   SOGoDraftObject *newDraftMessage;
-  NSString *urlBase, *url;
-  NSString *mailTo;
+  NSString *urlBase, *url, *value;
+  NSArray *mailTo;
+  
 
   drafts = [[self clientObject] draftsFolderInContext: context];
   newDraftMessage = [drafts newDraft];
 
-  mailTo = [[self request] formValueForKey: @"mailto"];
-  if ([mailTo length] > 0)
+  value = [[self request] formValueForKey: @"mailto"];
+  if ([value length] > 0)
     {
+      mailTo = [NSArray arrayWithObject: value];
       [newDraftMessage setHeaders: [NSDictionary dictionaryWithObject: mailTo
 						 forKey: @"to"]];
       [newDraftMessage storeInfo];