diff --git a/ChangeLog b/ChangeLog
index 54395d776..ebe494a53 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2006-11-15  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/WebServerResources/SchedulerUI.js: the month overview's day
+	cells are now initialized with the DOM event interface methods
+	instead of with html attributes.
+
 	* UI/Templates/MailerUI/UIxMailView.wox: don't display useless
 	headers (should be made configurable at some point)...
 
diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
index b3a15e39d..8113ac0f9 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -81,8 +81,6 @@
           <tr>
             <var:foreach list="currentRangeOf7Days" item="currentTableDay"
               ><td var:class="dayCellClasses"
-                onclick="onCalendarSelectDay(event, this);"
-                ondblclick="return newEvent(this, 'event');"
                 var:day="currentTableDay.shortDateString"
                 ><span class="dayCellLabel"
                   ><var:string value="labelForCurrentDayCell" /></span
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 2dda06bb8..5adec535c 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -61,7 +61,6 @@ function editEvent() {
                    nodes[i].getAttribute("owner"));
   }
 
-
   return false; /* stop following the link */
 }
 
@@ -184,6 +183,8 @@ function displayAppointment(event) {
   _editEventId(this.getAttribute("aptCName"),
                this.getAttribute("owner"));
 
+  event.preventDefault();
+  event.stopPropagation();
   event.cancelBubble = true;
   event.returnValue = false;
 }
@@ -450,6 +451,9 @@ function scrollDayView(hour)
 
 function onClickableCellsDblClick(event) {
   newEvent(this, 'event');
+
+  event.cancelBubble = true;
+  event.returnValue = false;
 }
 
 function calendarDisplayCallback(http)
@@ -471,20 +475,37 @@ function calendarDisplayCallback(http)
     if (currentView != 'monthview')
       scrollDayView(hour);
     var daysView = $("daysView");
-    var appointments = document.getElementsByClassName("appointment", daysView);
-    for (var i = 0; i < appointments.length; i++) {
-      appointments[i].addEventListener("mousedown", listRowMouseDownHandler, true);
-      appointments[i].addEventListener("click", onCalendarSelectAppointment, true);
-      appointments[i].addEventListener("dblclick", displayAppointment, true);
+    if (daysView) {
+      var appointments = document.getElementsByClassName("appointment", daysView);
+      for (var i = 0; i < appointments.length; i++) {
+        appointments[i].addEventListener("mousedown", listRowMouseDownHandler, true);
+        appointments[i].addEventListener("click", onCalendarSelectAppointment, true);
+        appointments[i].addEventListener("dblclick", displayAppointment, true);
+      }
+      var days = document.getElementsByClassName("day", daysView);
+      for (var i = 0; i < days.length; i++) {
+        days[i].addEventListener("click", onCalendarSelectDay, true);
+        var clickableCells = document.getElementsByClassName("clickableHourCell",
+                                                             days[i]);
+        for (var j = 0; j < clickableCells.length; j++) {
+          clickableCells[j].addEventListener("dblclick",
+                                             onClickableCellsDblClick, false);
+        }
+      }
     }
-    var days = document.getElementsByClassName("day", daysView);
-    for (var i = 0; i < days.length; i++) {
-      days[i].addEventListener("click", onCalendarSelectDay, true);
-      var clickableCells = document.getElementsByClassName("clickableHourCell",
-                                                           days[i]);
-      for (var j = 0; j < clickableCells.length; j++) {
-        clickableCells[j].addEventListener("dblclick",
-                                           onClickableCellsDblClick, true);
+    else {
+      var content = $("calendarContent");
+      var appointments = document.getElementsByClassName("appointment", content);
+      for (var i = 0; i < appointments.length; i++) {
+        appointments[i].addEventListener("mousedown", listRowMouseDownHandler, true);
+        appointments[i].addEventListener("click", onCalendarSelectAppointment, true);
+        appointments[i].addEventListener("dblclick", displayAppointment, true);
+      }
+      var days = document.getElementsByClassName("contentOfDay", content);
+      log("days: " + days.length);
+      for (var i = 0; i < days.length; i++) {
+        days[i].addEventListener("click", onCalendarSelectDay, true);
+        days[i].addEventListener("dblclick", onClickableCellsDblClick, false);
       }
     }
   }