diff --git a/ChangeLog b/ChangeLog
index 8f2a1aec8..406902c8e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-10-13  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentObject.m (-
+	_handleAttendee:withDelegate:ownerUser:statusChange:inEvent:):
+	added proper initialization of variable.
+
 2009-10-12  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Updated patchset to support properly windows-1250
@@ -20,6 +26,20 @@
 	* Main/SOGo.m (-init): released "rm" when no longer needed.
 	(-dispatchRequest:): simplified leak catching code.
 
+2009-10-09  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/PreferencesUI/UIxPreferences.m (+initialize, -init,
+	-isVacationEnabled, -setEnableVacation:, -enableVacation,
+	-setAutoReplyText:, -autoReplyText, -setAutoReplyEmailAddresses:,
+	-autoReplyEmailAddresses, -daysBetweenResponsesList,
+	-setDaysBetweenResponses:, -daysBetweenResponses,
+	-setIgnoreLists:. -ignoreLists, -isForwardEnabled,
+	-setEnableForward:, -enableForward, -setForwardAddress:,
+	-forwardAddress, -setForwardKeepCopy:, -forwardKeepCopy): added
+	web elements to set an auto-reply message and forward address in
+	the preferences window.
+	(-inTheOffice, setInTheOffice:): removed useless methods.
+
 2009-10-08  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* Added filters support (Vacation and Forward) which
diff --git a/SoObjects/Appointments/SOGoAppointmentObject.m b/SoObjects/Appointments/SOGoAppointmentObject.m
index 6cbc3dc5a..252cc0b2e 100644
--- a/SoObjects/Appointments/SOGoAppointmentObject.m
+++ b/SoObjects/Appointments/SOGoAppointmentObject.m
@@ -808,7 +808,7 @@
  
       [attendee setDelegatedTo: [delegate email]];
 
-      NSString *delegatedUID;
+      NSString *delegatedUID = nil;
       NSMutableArray *delegates;
       
       if (removeDelegate)