diff --git a/ChangeLog b/ChangeLog
index a40fd100e..db9aa8026 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2008-09-17  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailPartViewers/UIxMailPartViewer.m ([UIxMailPartViewer
+	-decodedFlatContent]): same as below...
+
+	* SoObjects/Mailer/NSData+Mail.m ([NSData
+	-bodyDataFromEncoding:encoding]): invoke
+	"dataByDecodingQuotedPrintableTransferEncoding" on the NSData
+	instance to avoid decoding "_" chars.
+
 2008-09-17  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/MailerUI/UIxMailAccountActions.m ([WOResponse
diff --git a/SoObjects/Mailer/NSData+Mail.m b/SoObjects/Mailer/NSData+Mail.m
index 56273bed7..56a30e954 100644
--- a/SoObjects/Mailer/NSData+Mail.m
+++ b/SoObjects/Mailer/NSData+Mail.m
@@ -44,7 +44,7 @@
   else if ([realEncoding isEqualToString: @"base64"])
     decodedData = [self dataByDecodingBase64];
   else if ([realEncoding isEqualToString: @"quoted-printable"])
-    decodedData = [self dataByDecodingQuotedPrintable];
+    decodedData = [self dataByDecodingQuotedPrintableTransferEncoding];
   else
     {
       decodedData = nil;
diff --git a/UI/MailPartViewers/UIxMailPartViewer.m b/UI/MailPartViewers/UIxMailPartViewer.m
index 9b5a9ff87..596fb3198 100644
--- a/UI/MailPartViewers/UIxMailPartViewer.m
+++ b/UI/MailPartViewers/UIxMailPartViewer.m
@@ -112,6 +112,7 @@
   return flatContent;
 }
 
+#warning we should use NSData+Mail's bodyDataFromEncoding: instead
 - (NSData *) decodedFlatContent
 {
   NSString *enc;
@@ -128,7 +129,7 @@
     return [[self flatContent] dataByDecodingBase64];
 
   if ([enc isEqualToString:@"quoted-printable"])
-    return [[self flatContent] dataByDecodingQuotedPrintable];
+    return [[self flatContent] dataByDecodingQuotedPrintableTransferEncoding];
   
   [self errorWithFormat:@"unsupported MIME encoding: %@", enc];