merge of '1f2eaa372e3ae66a929fc22a568735d95ec1f67f'

and '1f953cea64fc6c840758f4cc35550f91b6aa07af'

Monotone-Parent: 1f2eaa372e3ae66a929fc22a568735d95ec1f67f
Monotone-Parent: 1f953cea64fc6c840758f4cc35550f91b6aa07af
Monotone-Revision: e3f12e7b1f3dbd033f9a9644cb66aff2e1661704

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2010-09-02T19:17:20
Monotone-Branch: ca.inverse.sogo

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;
 }

UI/PreferencesUI/UIxPreferences.h

@@ -1,6 +1,6 @@
 /* UIxPreferences.h - this file is part of SOGo
  *
- * Copyright (C) 2007 Inverse inc.
+ * Copyright (C) 2007-2010 Inverse inc.
  *
  * Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
  *

UI/WebServerResources/UIxMailEditor.js

@@ -450,7 +450,7 @@ function initializePriorityMenu() {
     $(chosenNode).addClassName("_chosen");
 }
 
-function onMenuCheckReturnReceipt() {
+function onMenuCheckReturnReceipt(event) {
     event.cancelBubble = true;
 
     this.enabled = !this.enabled;