diff --git a/ChangeLog b/ChangeLog
index 2c0094e50..151c9b858 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2008-12-30  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* SoObjects/Appointments/SOGoAppointmentFolder.m
+	([SOGoAppointmentFolder
+	-fixupCycleRecord:cycleRange:firstInstanceCalendarDateRange:forViewRange:]):
+	Fixed the start/end dates and recurrence id of events that span a
+	time period where the daylight saving time changes.
+	([SOGoAppointmentFolder
+	-_appendCycleException:firstInstanceCalendarDateRange:fromRow:forRange:toArray:]):
+	idem.
+
+	* UI/Scheduler/UIxAppointmentEditor.m ([UIxAppointmentEditor
+	-defaultAction]): idem.
+	([UIxAppointmentEditor -viewAction]): idem. 
+
 2008-12-23  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.{h,m}
diff --git a/UI/MailPartViewers/UIxMailPartICalViewer.m b/UI/MailPartViewers/UIxMailPartICalViewer.m
index e90bb1692..5ee210d4c 100644
--- a/UI/MailPartViewers/UIxMailPartICalViewer.m
+++ b/UI/MailPartViewers/UIxMailPartICalViewer.m
@@ -257,19 +257,19 @@
 {
   NSCalendarDate *recurrenceId;
   NSString *recurrenceTime;
-  BOOL inCalendar;
+  BOOL isInCalendar;
 
   recurrenceId = [[self inEvent] recurrenceId];
 
   if (recurrenceId)
     {
       recurrenceTime = [NSString stringWithFormat: @"%f", [recurrenceId timeIntervalSince1970]];
-      inCalendar = ([[self storedEventObject] lookupOccurence: recurrenceTime] != nil);
+      isInCalendar = ([[self storedEventObject] lookupOccurence: recurrenceTime] != nil);
     }
   else
-    inCalendar = ([self storedEventObject] != nil);
+    isInCalendar = ([self storedEventObject] != nil);
 
-  return inCalendar;
+  return isInCalendar;
 }
 
 - (iCalEvent *) storedEvent