diff --git a/ChangeLog b/ChangeLog
index 12d5eb98f..26ba62df4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-04-14  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/MailerUI/UIxMailAccountActions.m (-composeAction): properly decode
+	submitted recipients and subjects (URL-encoded).
+
 	* SoObjects/SOGo/SOGoUserManager.m (-getImapLoginForUID:): we now
 	consider the source parameter IMAPLoginFieldName. We continue to support
 	SOGoForceIMAPLoginWithEmail at the domain/system level.
diff --git a/UI/MailerUI/UIxMailAccountActions.m b/UI/MailerUI/UIxMailAccountActions.m
index f596c0c88..f8d3f582f 100644
--- a/UI/MailerUI/UIxMailAccountActions.m
+++ b/UI/MailerUI/UIxMailAccountActions.m
@@ -30,6 +30,7 @@
 #import <NGObjWeb/WOResponse.h>
 #import <NGImap4/NGImap4Connection.h>
 #import <NGImap4/NGImap4Client.h>
+#import <NGExtensions/NSString+misc.h>
 
 #import <Mailer/SOGoMailAccount.h>
 #import <Mailer/SOGoDraftObject.h>
@@ -170,7 +171,7 @@
   value = [[self request] formValueForKey: @"mailto"];
   if ([value length] > 0)
     {
-      mailTo = [value componentsSeparatedByString: @","];
+      mailTo = [[value stringByUnescapingURL] componentsSeparatedByString: @","];
       [headers setObject: mailTo forKey: @"to"];
       save = YES;
     }
@@ -178,7 +179,7 @@
   value = [[self request] formValueForKey: @"subject"];
   if ([value length] > 0)
     {
-      [headers setObject: value forKey: @"subject"];
+      [headers setObject: [value stringByUnescapingURL] forKey: @"subject"];
       save = YES;
     }