diff --git a/ChangeLog b/ChangeLog
index bd1c2c991..842e1cd04 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2009-03-24  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
+	-_loadAttendees]): make use of autoreleased strings to avoid a leak.
+	([UIxComponentEditor -dealloc]): release componentCalendar.
+
 	* SoObjects/SOGo/SOGoUser.m ([SOGoUser
 	-_prepareDefaultMailAccounts]): return an autoreleased array to
 	avoid a leak.
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index a8375cfe0..ea2cb6077 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -104,6 +104,7 @@ iRANGE(2);
       dateFormat = [datePicker dateFormat];
       
       component = nil;
+      componentCalendar = nil;
       [self setPrivacy: @"PUBLIC"];
       [self setIsCycleEndNever];
       componentOwner = @"";
@@ -168,6 +169,7 @@ iRANGE(2);
   [range2 release];
   
   [component release];
+  [componentCalendar release];
 
   [super dealloc];
 }
@@ -180,10 +182,10 @@ iRANGE(2);
   NSString *uid;
   LDAPUserManager *um;
 
-  names = [NSMutableString new];
-  uids = [NSMutableString new];
-  emails = [NSMutableString new];
-  states = [NSMutableString new];
+  names = [NSMutableString string];
+  uids = [NSMutableString string];
+  emails = [NSMutableString string];
+  states = [NSMutableString string];
   um = [LDAPUserManager sharedUserManager];
 
   attendees = [[component attendees] objectEnumerator];
@@ -212,9 +214,6 @@ iRANGE(2);
 	      [emails substringToIndex: [emails length] - 1]);
       ASSIGN (attendeesStates, [states substringToIndex: [states length] - 1]);
     }
-
-  [names release];
-  [emails release];
 }
 
 - (void) _loadCategories
@@ -397,7 +396,7 @@ iRANGE(2);
 	  [self _loadAttendees];
 	  [self _loadRRules];
 
-	  [componentCalendar release];
+ 	  [componentCalendar release];
 	  componentCalendar = [co container];
 	  if ([componentCalendar isKindOfClass: [SOGoCalendarComponent class]])
 	    componentCalendar = [componentCalendar container];