diff --git a/ChangeLog b/ChangeLog
index 1a65ad0c4..25c35dec2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-03-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
+
+	* UI/Scheduler/UIxCalMainView.m: if the module settings key
+	exists, do not reset it.
+
 2009-03-24  Ludovic Marcotte <lmarcotte@inverse.ca>
 
 	* UI/MailerUI/UIxMailListView.m
diff --git a/SoObjects/SOGo/SOGoObject.m b/SoObjects/SOGo/SOGoObject.m
index 2858b14d3..44b613c87 100644
--- a/SoObjects/SOGo/SOGoObject.m
+++ b/SoObjects/SOGo/SOGoObject.m
@@ -561,8 +561,8 @@ SEL SOGoSelectorForPropertySetter (NSString *property)
 				 [self _davPrivilegesFromRoles: roles]);
       [currentAce addObject: currentGrant];
       [aces addObject: davElementWithContent (@"ace", @"DAV:", currentAce)];
-      [currentAce release];
     }
+  [currentAce release];
 }
 
 - (void) _fillAcesWithRolesForPseudoPrincipals: (NSMutableArray *) aces
diff --git a/UI/Scheduler/UIxCalMainView.m b/UI/Scheduler/UIxCalMainView.m
index 86cd931ce..f1c56ee87 100644
--- a/UI/Scheduler/UIxCalMainView.m
+++ b/UI/Scheduler/UIxCalMainView.m
@@ -40,9 +40,6 @@
 
 #import <Appointments/SOGoAppointmentFolder.h>
 
-static NSMutableArray *monthMenuItems = nil;
-static NSMutableArray *yearMenuItems = nil;
-
 @implementation UIxCalMainView
 
 - (void) _setupContext
@@ -60,24 +57,22 @@ static NSMutableArray *yearMenuItems = nil;
   moduleSettings = [ud objectForKey: module];
   if (!moduleSettings)
     {
-      moduleSettings = [NSMutableDictionary new];
-      [moduleSettings autorelease];
+      moduleSettings = [NSMutableDictionary dictionary];
+      [ud setObject: moduleSettings forKey: module];
     }
-  [ud setObject: moduleSettings forKey: module];
 }
 
 - (NSArray *) monthMenuItems
 {
+  static NSMutableArray *monthMenuItems = nil;
   unsigned int count;
  
   if (!monthMenuItems)
     {
-      monthMenuItems = [NSMutableArray arrayWithCapacity: 12];
-      
+      monthMenuItems = [[NSMutableArray alloc] initWithCapacity: 12];
       for (count = 1; count < 13; count++)
         [monthMenuItems addObject:
                           [NSString stringWithFormat: @"%.2d", count]];
-      [monthMenuItems retain];
     }
 
   return monthMenuItems;
@@ -100,15 +95,15 @@ static NSMutableArray *yearMenuItems = nil;
 
 - (NSArray *) yearMenuItems
 {
+  static NSMutableArray *yearMenuItems = nil;
   int count, year;
  
   if (!yearMenuItems)
     {
       year = [[NSCalendarDate date] yearOfCommonEra];
-      yearMenuItems = [NSMutableArray arrayWithCapacity: 11];
+      yearMenuItems = [[NSMutableArray alloc] initWithCapacity: 11];
       for (count = -5; count < 6; count++)
         [yearMenuItems addObject: [NSNumber numberWithInt: year + count]];
-      [yearMenuItems retain];
     }
 
   return yearMenuItems;
diff --git a/UI/Scheduler/UIxRecurrenceEditor.m b/UI/Scheduler/UIxRecurrenceEditor.m
index 6fc576fe5..cdc4ba4e1 100644
--- a/UI/Scheduler/UIxRecurrenceEditor.m
+++ b/UI/Scheduler/UIxRecurrenceEditor.m
@@ -29,13 +29,6 @@
 
 @implementation UIxRecurrenceEditor
 
-- (id) defaultAction
-{
-  [[self parent] setToolbar: @""];
-
-  return self;
-}
-
 - (NSArray *) monthlyRepeatList
 {
   static NSArray *monthlyRepeatList = nil;
@@ -43,7 +36,7 @@
   if (!monthlyRepeatList)
     {
       monthlyRepeatList = [NSArray arrayWithObjects: @"First", @"Second", @"Third",
-				  @"Fourth", @"Fift", @"Last", nil];
+				   @"Fourth", @"Fift", @"Last", nil];
       [monthlyRepeatList retain];
     }