diff --git a/ChangeLog b/ChangeLog
index 0a10ffc98..a2d9c0d68 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,16 @@
 	* SoObjects/SOGo/NSDictionary+URL.m (-asURLParameters): escaped
 	keys and values using [NSString+misc stringByEscapingURL] from SOPE.
 
+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
+	"Options" menu.
+
 2010-09-01  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* Tests/Unit/SOGoTest.m (-run): fixed build on GNUstep >= 1.20.
diff --git a/SoObjects/Mailer/SOGoMailAccount.m b/SoObjects/Mailer/SOGoMailAccount.m
index f956c5bd7..08ef11d39 100644
--- a/SoObjects/Mailer/SOGoMailAccount.m
+++ b/SoObjects/Mailer/SOGoMailAccount.m
@@ -521,16 +521,13 @@ static NSString *sieveScriptName = @"sogo";
 
   mailAccount = [self _mailAccount];
   encryption = [mailAccount objectForKey: @"encryption"];
-  defaultPort = [[mailAccount objectForKey: @"port"] intValue];
+  defaultPort = 143;
+  protocol = @"imaps";
 
-  if (!defaultPort)
-    defaultPort = 143;
-
-  if ([encryption isEqualToString: @"ssl"] ||
-      [encryption isEqualToString: @"tls"])
-      protocol = @"imaps";
-  else
-      protocol = @"imap";
+  if ([encryption isEqualToString: @"ssl"])
+    defaultPort = 993;
+  else if (![encryption isEqualToString: @"tls"])
+    protocol = @"imap";
 
   username = [mailAccount objectForKey: @"userName"];
   escUsername
@@ -542,8 +539,9 @@ static NSString *sieveScriptName = @"sogo";
   port = [[mailAccount objectForKey: @"port"] intValue];
   if (port && port != defaultPort)
     [imap4URLString appendFormat: @":%d", port];
+
   [imap4URLString appendString: @"/"];
-  
+
   return imap4URLString;
 }
 
diff --git a/SoObjects/Mailer/SOGoMailBaseObject.m b/SoObjects/Mailer/SOGoMailBaseObject.m
index be239344a..a0ebd65c9 100644
--- a/SoObjects/Mailer/SOGoMailBaseObject.m
+++ b/SoObjects/Mailer/SOGoMailBaseObject.m
@@ -198,7 +198,7 @@ static BOOL debugOn = YES;
         urlString = [NSString stringWithFormat: @"%@?tls=YES",
                               [self imap4URLString]];
       else
-        urlString = [self imap4URLString];
+	urlString = [self imap4URLString];
       imap4URL = [[NSURL alloc] initWithString: urlString];
     }
 
diff --git a/SoObjects/SOGo/SOGoUser.m b/SoObjects/SOGo/SOGoUser.m
index 1485ab28e..cc903dd05 100644
--- a/SoObjects/SOGo/SOGoUser.m
+++ b/SoObjects/SOGo/SOGoUser.m
@@ -534,22 +534,17 @@
   port = [url port];
 
   encryption = @"none";
-  port = @"143";
 
   if ([url query] && [[url query] caseInsensitiveCompare: @"tls=YES"] == NSOrderedSame)
     encryption = @"tls";
   
-  if ([port intValue] == 0)
+  if ([scheme caseInsensitiveCompare: @"imaps"] == NSOrderedSame && 
+      ![encryption isEqualToString: @"tls"])
     {
-      if (scheme)
-	{
-	  if ([scheme caseInsensitiveCompare: @"imaps"] == NSOrderedSame && 
-	      ![encryption isEqualToString: @"tls"])
-	    {
-	      encryption = @"ssl";	      
-	      port = @"993";
-	    }
-	}
+      encryption = @"ssl";
+      
+      if ([port intValue] == 0)
+	port = @"993";
     }
     
   if ([url host])
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;
 }
diff --git a/UI/PreferencesUI/UIxPreferences.h b/UI/PreferencesUI/UIxPreferences.h
index 1ef64f6c0..a724635e2 100644
--- a/UI/PreferencesUI/UIxPreferences.h
+++ b/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>
  *
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index ef971add9..4873546d9 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/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;