diff --git a/ChangeLog b/ChangeLog
index 23b3aa597..bae537113 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-07-21  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Mailer/SOGoMailBodyPart.m ([SOGoMailBodyPart
+	-stringByEscapingURL]): the UTF-8 encoding is now specified for the
+	filename of an attachment.
+
 2009-07-20  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/SoObjects/Mailer/SOGoMailBodyPart.m b/SoObjects/Mailer/SOGoMailBodyPart.m
index c874d41a4..82b5ec385 100644
--- a/SoObjects/Mailer/SOGoMailBodyPart.m
+++ b/SoObjects/Mailer/SOGoMailBodyPart.m
@@ -31,6 +31,7 @@
 #import <NGObjWeb/WOResponse.h>
 #import <NGExtensions/NSNull+misc.h>
 #import <NGExtensions/NSObject+Logs.h>
+#import <NGExtensions/NSString+misc.h>
 #import <NGExtensions/NGBase64Coding.h>
 #import <NGExtensions/NGQuotedPrintableCoding.h>
 #import <NGImap4/NGImap4Connection.h>
@@ -401,8 +402,9 @@ static BOOL debugOn = NO;
 	    {
 	      fileName = [self filename];
 	      if ([fileName length])
-		[response setHeader: [NSString stringWithFormat: @"attachment; filename=%@", fileName]
-			  forKey: @"content-disposition"];
+		[response setHeader: [NSString stringWithFormat: @"attachment; filename*=\"utf-8''%@\"",
+					       [fileName stringByEscapingURL]]
+			     forKey: @"content-disposition"];
 	    }
 
 	  etag = [self davEntityTag];