diff --git a/ChangeLog b/ChangeLog
index 61d987866..688cdf298 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-12  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* SoObjects/Mailer/SOGoDraftObject.m
+	(-bodyPartForAttachmentWithName:): don't choose "quoted-printable"
+	if the mimetype is anything else than "text/plain" or "text/html",
+	to avoid issues with filenames attached with a wrong mime type.
+
 2011-04-12  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 6937fc9ef..b2804c824 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -1141,7 +1141,7 @@ static NSString    *userAgent      = nil;
 
   if ((s = [self contentTypeForAttachmentWithName:_name]) != nil) {
     [map setObject:s forKey: @"content-type"];
-    if ([s hasPrefix: @"text/"])
+    if ([s hasPrefix: @"text/plain"] || [s hasPrefix: @"text/html"])
       attachAsString = YES;
     else if ([s hasPrefix: @"message/rfc822"])
       is7bit = YES;