diff --git a/ChangeLog b/ChangeLog
index eef7f1fe2..3871e10f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2010-09-02  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailView.m (_receiptMessageHeaderTo:): properly
+	escape the message subject in QP when needed.
+
 	* UI/WebServerResources/UIxMailEditor.js:
 	(onMenuCheckReturnReceipt): the function has an event parameter
 	which we need. This fixes an exception occurring when clicking the
diff --git a/UI/MailerUI/UIxMailView.m b/UI/MailerUI/UIxMailView.m
index 7d812270d..e49fee405 100644
--- a/UI/MailerUI/UIxMailView.m
+++ b/UI/MailerUI/UIxMailView.m
@@ -447,7 +447,8 @@ static NSString *mailETag = nil;
   subject = [NSString stringWithFormat:
                      [self labelForKey: @"Return Receipt (displayed) - %@"],
                       [self messageSubject]];
-  [map setObject: subject forKey: @"subject"];
+  [map setObject: [subject asQPSubjectString: @"utf-8"]
+          forKey: @"subject"];
 
   return map;
 }