diff --git a/UI/Scheduler/UIxCalDayTable.m b/UI/Scheduler/UIxCalDayTable.m
index 4d0ebbc8a..854c9031e 100644
--- a/UI/Scheduler/UIxCalDayTable.m
+++ b/UI/Scheduler/UIxCalDayTable.m
@@ -183,14 +183,6 @@
   return classes;
 }
 
-- (NSString *) currentAppointmentDay
-{
-  return [NSString stringWithFormat: @"%d%.2d%.2d",
-                   [currentTableDay yearOfCommonEra],
-                   [currentTableDay monthOfYear],
-                   [currentTableDay dayOfMonth]];
-}
-
 - (void) setCurrentTableHour: (NSString *) aTableHour
 {
   currentTableHour = aTableHour;
diff --git a/UI/Scheduler/UIxCalMonthOverview.h b/UI/Scheduler/UIxCalMonthOverview.h
index e6c536723..374a50438 100644
--- a/UI/Scheduler/UIxCalMonthOverview.h
+++ b/UI/Scheduler/UIxCalMonthOverview.h
@@ -21,11 +21,11 @@
 // $Id: UIxCalMonthOverview.h 181 2004-08-11 15:13:25Z helge $
 
 
-#import "UIxCalMonthView.h"
+#import "UIxCalMonthViewOld.h"
 
 @class NSCalendarDate, NSString, NSDictionary, NSArray;
 
-@interface UIxCalMonthOverview : UIxCalMonthView
+@interface UIxCalMonthOverview : UIxCalMonthViewOld
 {
     int dayIndex;
     int dayOfWeek;
diff --git a/UI/Scheduler/UIxCalView.m b/UI/Scheduler/UIxCalView.m
index ffadf1999..7ed1b94a8 100644
--- a/UI/Scheduler/UIxCalView.m
+++ b/UI/Scheduler/UIxCalView.m
@@ -425,6 +425,7 @@ static BOOL shouldDisplayWeekend = NO;
 {
   return [self selectedDate];
 }
+
 - (NSCalendarDate *) endDate
 {
   return [[self startDate] tomorrow];
@@ -432,15 +433,9 @@ static BOOL shouldDisplayWeekend = NO;
 
 - (NSArray *) _fetchCoreInfosForComponent: (NSString *) component
 {
-  SOGoAppointmentFolder *folder;
-  NSCalendarDate *sd, *ed;
-
-  folder = [self clientObject];
-  sd = [self startDate];
-  ed = [self endDate];
-
-  return [folder fetchCoreInfosFrom: sd to: ed
-                 component: component];
+  return [[self clientObject] fetchCoreInfosFrom: [[self startDate] beginOfDay]
+                              to: [[self endDate] endOfDay]
+                              component: component];
 }
 
 - (NSArray *) fetchCoreAppointmentsInfos
diff --git a/UI/Scheduler/product.plist b/UI/Scheduler/product.plist
index 272b3b1a8..a9329d6c5 100644
--- a/UI/Scheduler/product.plist
+++ b/UI/Scheduler/product.plist
@@ -64,42 +64,6 @@
           protectedBy = "View";
           pageName    = "UIxCalMonthView"; 
         };
-        dayoverview = {
-          protectedBy = "View";
-          pageName    = "UIxCalDayOverview"; 
-        };
-        daychartview = { 
-          protectedBy = "View";
-          pageName    = "UIxCalDayChartview"; 
-        };
-        daylistview = { 
-          protectedBy = "View";
-          pageName    = "UIxCalDayListview"; 
-        };
-        weekoverview = { 
-          protectedBy = "View";
-          pageName    = "UIxCalWeekOverview"; 
-        };
-        weekchartview = { 
-          protectedBy = "View";
-          pageName    = "UIxCalWeekChartview"; 
-        };
-        weeklistview = { 
-          protectedBy = "View";
-          pageName    = "UIxCalWeekListview"; 
-        };
-        weekcolumnsview = { 
-          protectedBy = "View";
-          pageName    = "UIxCalWeekColumnsview"; 
-        };
-        monthoverview = { 
-          protectedBy = "View";
-          pageName    = "UIxCalMonthOverview"; 
-        };
-        yearoverview = { 
-          protectedBy = "View";
-          pageName    = "UIxCalYearOverview"; 
-        };
         newevent = { 
           protectedBy = "View";
           pageName    = "UIxAppointmentEditor"; 
@@ -138,6 +102,44 @@
           protectedBy = "View";
           pageName    = "UIxFreeBusyUserSelectorTable";
         };
+
+/* TODO: delete the following components */
+        dayoverview = {
+          protectedBy = "View";
+          pageName    = "UIxCalDayOverview"; 
+        };
+        daychartview = { 
+          protectedBy = "View";
+          pageName    = "UIxCalDayChartview"; 
+        };
+        daylistview = { 
+          protectedBy = "View";
+          pageName    = "UIxCalDayListview"; 
+        };
+        weekoverview = { 
+          protectedBy = "View";
+          pageName    = "UIxCalWeekOverview"; 
+        };
+        weekchartview = { 
+          protectedBy = "View";
+          pageName    = "UIxCalWeekChartview"; 
+        };
+        weeklistview = { 
+          protectedBy = "View";
+          pageName    = "UIxCalWeekListview"; 
+        };
+        weekcolumnsview = { 
+          protectedBy = "View";
+          pageName    = "UIxCalWeekColumnsview"; 
+        };
+        monthoverview = { 
+          protectedBy = "View";
+          pageName    = "UIxCalMonthOverview"; 
+        };
+        yearoverview = { 
+          protectedBy = "View";
+          pageName    = "UIxCalYearOverview"; 
+        };
       };
     };
 
diff --git a/UI/Templates/SchedulerUI/UIxCalDayTable.wox b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
index d3504a157..e05666ff7 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayTable.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayTable.wox
@@ -5,9 +5,7 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label">
-    <table
-      var:class="cssClass"
-      var:id="cssId">
+    <table var:class="cssClass" var:id="cssId">
       <tr>
         <td class="nullHeader">
         </td>
@@ -56,7 +54,7 @@
             ><td var:class="dayCellClasses"
               onclick="onCalendarSelectDay(event, this);"
               ondblclick="return newEvent(this, 'event');"
-              var:day="currentAppointmentDay"
+              var:day="currentTableDay.shortDateString"
               var:hour="currentAppointmentHour"
               ><var:foreach
                 list="aptsForCurrentDate"
diff --git a/UI/Templates/SchedulerUI/UIxCalDayView.wox b/UI/Templates/SchedulerUI/UIxCalDayView.wox
index 12765d5a8..821d803ba 100644
--- a/UI/Templates/SchedulerUI/UIxCalDayView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalDayView.wox
@@ -5,7 +5,6 @@
     xmlns:const="http://www.skyrix.com/od/constant"
     xmlns:rsrc="OGo:url"
     xmlns:label="OGo:label">
-
     <a href="#"
       class="leftNavigationArrow"
       var:date="prevDayQueryParameters.day"