diff --git a/ChangeLog b/ChangeLog
index c1a31efa0..342b26bcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-01-04  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxComponentEditor.m ([UIxComponentEditor
+	-newStartDate]): fix the handling of the component start date
+	depending on the "hm" and the "day" parameters.
+
 	* SoObjects/SOGo/SOGoUserFolder.m ([SOGoUserFolder
 	-roleOfUser:uidinContext:context]): set role of current user to
 	"Assistant" if the object that is accessed is "freebusy.ifb".
diff --git a/UI/Scheduler/UIxComponentEditor.m b/UI/Scheduler/UIxComponentEditor.m
index 689053f6b..2b958f1aa 100644
--- a/UI/Scheduler/UIxComponentEditor.m
+++ b/UI/Scheduler/UIxComponentEditor.m
@@ -604,7 +604,7 @@
     {
       now = [NSCalendarDate calendarDate];
       [now setTimeZone: [[self clientObject] userTimeZone]];
-      if (!([[now hour: 8 minute: 0] earlierDate: newStartDate] == newStartDate))
+      if ([now isDateOnSameDay: newStartDate])
         {
           hour = [now hourOfDay];
           if (hour < 8)
@@ -614,6 +614,8 @@
           else
             newStartDate = now;
         }
+      else
+        newStartDate = [newStartDate hour: 8 minute: 0];
     }
 
   return newStartDate;