diff --git a/ChangeLog b/ChangeLog
index 72c73f6d4..4ed71bc00 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2010-03-31  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/SchedulerUIDnD.js (onDragStart): don't
+	start the dragging when the target element has a scrollbar.
+
 2010-03-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* SoObjects/Contacts/SOGoContactSourceFolder.m
diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js
index 79c73fc8e..822e0307e 100644
--- a/UI/WebServerResources/SchedulerUI.js
+++ b/UI/WebServerResources/SchedulerUI.js
@@ -1099,9 +1099,11 @@ function scrollDayView(scrollEvent) {
 }
 
 function onClickableCellsDblClick(event) {
-    newEventFromWidget(this, 'event');
-
-    Event.stop(event);
+    var target = getTarget(event);
+    if (target.hasClassName("dayHeader") || this.clientHeight >= this.scrollHeight) {
+        newEventFromWidget(this, 'event');
+        Event.stop(event);
+    }
 }
 
 function refreshCalendarEvents(scrollEvent) {
diff --git a/UI/WebServerResources/SchedulerUIDnD.js b/UI/WebServerResources/SchedulerUIDnD.js
index 6494f0977..3ea4cce89 100644
--- a/UI/WebServerResources/SchedulerUIDnD.js
+++ b/UI/WebServerResources/SchedulerUIDnD.js
@@ -980,7 +980,8 @@ SOGoEventDragController.prototype = {
         if (target.nodeType == 1) {
             if ((!this.eventCells
                  && (target.hasClassName("clickableHourCell")
-                     || target.hasClassName("day")))
+                     || target.hasClassName("day"))
+                 && (target.clientHeight >= target.scrollHeight))
                 || (this.eventCells && this.eventCells[0].editable
                     && !this.eventIsInvitation)) {
                 var utilities = SOGoEventDragUtilities();