From 0b57a9d8e0a25d2a4cfa602093fac1406317f883 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Thu, 2 Sep 2010 16:39:31 +0000 Subject: [PATCH] Monotone-Parent: 85562e3494ccd15c1f10a3a0bbdfeb11ff54430d Monotone-Revision: 94879e006105e5001a0e4598b69f35c8117ab394 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-09-02T16:39:31 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 3 +++ UI/MailerUI/UIxMailView.m | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index eef7f1fe2..3871e10f6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2010-09-02 Wolfgang Sourdeau + * 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; }