diff --git a/ChangeLog b/ChangeLog
index c7e288412..e13080f39 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/MailerUI/UIxMailMainFrame.m (-_setupContext): if
+	"moduleSettings" is non-nil, we don't reset it in the user
+	defaults.
+	(-composeAction): autorelease "addresses" to avoid a leak.
+
 2009-09-29  Cyril Robert <crobert@inverse.ca>
 
 	* SoObjects/Mailer/SOGoMailFolder.m (PUTAction:, _appendMessageData:usingId:):
diff --git a/UI/MailerUI/UIxMailMainFrame.m b/UI/MailerUI/UIxMailMainFrame.m
index 320b828f0..d09b1d8df 100644
--- a/UI/MailerUI/UIxMailMainFrame.m
+++ b/UI/MailerUI/UIxMailMainFrame.m
@@ -78,10 +78,9 @@
   moduleSettings = [ud objectForKey: module];
   if (!moduleSettings)
     {
-      moduleSettings = [NSMutableDictionary new];
-      [moduleSettings autorelease];
+      moduleSettings = [NSMutableDictionary dictionary];
+      [ud setObject: moduleSettings forKey: module];
     }
-  [ud setObject: moduleSettings forKey: module];
 }
 
 /* accessors */
@@ -212,7 +211,7 @@
           uids = [contactsId objectEnumerator];
           uid = [uids nextObject];
 
-          addresses = [NSMutableArray new];
+          addresses = [NSMutableArray array];
 
           while (uid)
             {