diff --git a/ChangeLog b/ChangeLog
index b4af5aa39..617c3cf9c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2006-10-31  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/Scheduler/UIxCalDayTable.m ([UIxCalDayTable
+	-dayCellClasses]): new method that returns a string containing the
+	css classes applicable to the current cell, depending on the
+	position of the day in the week, the day of today and the
+	requested day.
+
 	* UI/Scheduler/UIxCalCalendarsListView.m ([UIxCalCalendarsListView
 	-currentContactAptBorder]): new method that returns the
 	appropriate border color for the specified user.
diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m
index 750db8e6e..4d0ebbc8a 100644
--- a/UI/Scheduler/UIxCalDayTable.m
+++ b/UI/Scheduler/UIxCalDayTable.m
@@ -161,6 +161,28 @@
   return currentTableDay;
 }
 
+- (NSString *) dayCellClasses
+{
+  NSMutableString *classes;
+  int dayOfWeek;
+
+  classes = [NSMutableString new];
+  [classes autorelease];
+  [classes appendString: @"contentOfDay"];
+  if (numberOfDays > 1)
+    {
+      dayOfWeek = [currentTableDay dayOfWeek];
+      if (dayOfWeek == 0 || dayOfWeek == 6)
+        [classes appendString: @" weekEndDay"];
+      if ([currentTableDay isToday])
+        [classes appendString: @" dayOfToday"];
+      if ([[self selectedDate] isDateOnSameDay: currentTableDay])
+        [classes appendString: @" selectedDay"];
+    }
+
+  return classes;
+}
+
 - (NSString *) currentAppointmentDay
 {
   return [NSString stringWithFormat: @"%d%.2d%.2d",
diff --git a/UI/Templates/SchedulerUI/UIxCalDayTable.wox b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
index 95bcef871..d3504a157 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayTable.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
@@ -41,7 +41,6 @@
                 referenceDate="selectedDate"
                 canAccess="canAccessApt"
                 />
-              <br />
             </var:foreach>
           </td>
         </tr>
@@ -54,7 +53,7 @@
               />:00
           </td>
           <var:foreach list="daysToDisplay" item="currentTableDay"
-            ><td class="contentOfDay"
+            ><td var:class="dayCellClasses"
               onclick="onCalendarSelectDay(event, this);"
               ondblclick="return newEvent(this, 'event');"
               var:day="currentAppointmentDay"
@@ -70,10 +69,9 @@
                   url="appointmentViewURL"
                   const:style="dayoverview"
                   queryDictionary="currentDayQueryParameters"
-                  referenceDate="currentDate"
+                  referenceDate="currentTableDay"
                   canAccess="canAccessApt"
                   />
-                <br />
               </var:foreach
             ></td>
           </var:foreach>