diff --git a/UI/Templates/SchedulerUI/UIxCalMonthView.wox b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
index f72736a8a..27b8d96aa 100644
--- a/UI/Templates/SchedulerUI/UIxCalMonthView.wox
+++ b/UI/Templates/SchedulerUI/UIxCalMonthView.wox
@@ -82,7 +82,9 @@
                   <span class=""><var:string value="currentTableDay.dayOfMonth"/></span> <var:string value="dayHeaderMonth"/>
                 </var:if>
                 </div>
-                <md-content sg-draggable-calendar-block="sg-draggable-calendar-block">
+                <md-content
+                    sg-draggable-calendar-block="sg-draggable-calendar-block"
+                    class="clickableDayCell">
                   <sg-calendar-month-day
                       sg-blocks="calendar.views[0].blocks"
                       sg-click="list.openEvent(event, component)"
diff --git a/UI/WebServerResources/js/Scheduler/CalendarListController.js b/UI/WebServerResources/js/Scheduler/CalendarListController.js
index bc053e494..e107b92ce 100644
--- a/UI/WebServerResources/js/Scheduler/CalendarListController.js
+++ b/UI/WebServerResources/js/Scheduler/CalendarListController.js
@@ -154,6 +154,8 @@
 
       if (component.isNew) {
         coordinates = pointerHandler.currentEventCoordinates;
+        if (component.isAllDay)
+          coordinates.duration -= 96;
         component.setDelta(coordinates.duration * 15);
         newComponent(null, component).finally(function() {
           $timeout(function() {
diff --git a/UI/WebServerResources/js/Scheduler/sgCalendarDayTable.directive.js b/UI/WebServerResources/js/Scheduler/sgCalendarDayTable.directive.js
index a41d3930c..30394cab4 100644
--- a/UI/WebServerResources/js/Scheduler/sgCalendarDayTable.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgCalendarDayTable.directive.js
@@ -30,6 +30,7 @@
       },
       template: [
         '<sg-calendar-day-block',
+        '  class="sg-draggable-calendar-block"',
         '  ng-repeat="block in blocks[day]"',
         '  sg-block="block"',
         '  sg-click="clickBlock({event: clickEvent, component: clickComponent})"/>'
diff --git a/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js b/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
index 74d1dc26c..90aad86eb 100644
--- a/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
+++ b/UI/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
@@ -73,6 +73,8 @@
       function onDragDetect(ev) {
         var block, dragMode, eventType, startDate, newData, newComponent, pointerHandler;
 
+        ev.stopPropagation();
+
         dragMode = 'move-event';
         
         if (scope.block && scope.block.component) {
@@ -104,9 +106,11 @@
       }
 
       function dragStart(ev) {
-        var block, dragMode, eventType, startDate, newData, newComponent, pointerHandler;
+        var block, dragMode, eventType, isHourCell, isMonthly, startDate, newData, newComponent, pointerHandler;
 
-        eventType = 'multiday';
+        isHourCell = element.hasClass('clickableHourCell');
+        isMonthly = (element[0].parentNode.tagName == 'SG-CALENDAR-MONTH-DAY') ||
+          element.hasClass('clickableDayCell');
 
         if (scope.block && scope.block.component) {
           // Move or resize existing component
@@ -121,26 +125,30 @@
             type: 'appointment',
             pid: 'personal',  // TODO respect SOGoDefaultCalendar
             summary: l('New Event'),
-            startDate: startDate
+            startDate: startDate,
+            isAllDay: isHourCell? 0 : 1
           };
           newComponent = new Component(newData);
           block = {
             component: newComponent,
+            dayNumber: calendarDayCtrl.dayNumber,
             length: 0
           };
           block.component.blocks = [block];
         }
 
+        // Determine event type
+        eventType = 'multiday';
+        if (isMonthly)
+          eventType = 'monthly';
+        else if (block.component.c_isallday)
+          eventType = 'multiday-allday';
+
         // Mark all blocks as being dragged
         _.forEach(block.component.blocks, function(b) {
           b.dragging = true;
         });
 
-        if (element[0].parentNode.tagName === 'SG-CALENDAR-MONTH-DAY')
-          eventType = 'monthly';
-        else if (block.component.c_isallday)
-          eventType = 'multiday-allday';
-
         // Update pointer handler
         pointerHandler = Component.$ghost.pointerHandler;
         pointerHandler.prepareWithEventType(eventType);
@@ -239,19 +247,18 @@
         },
 
         initFromBlock: function(block) {
-          if (this.eventType === 'monthly')
+          if (this.eventType === 'monthly') {
             this.start = 0;
-          else
-            // Get the start (first quarter) from the event's first block
-            this.start = block.component.blocks[0].start;
-
-          // Compute overall length
-          if (this.eventType === 'monthly')
             this.duration = block.component.blocks.length * 96;
-          else
+          }
+          else {
+            // Get the start (first quarter) from the event's first block
+            // Compute overall length
+            this.start = block.component.blocks[0].start;
             this.duration = _.sum(block.component.blocks, function(b) {
               return b.length;
             });
+          }
 
           // Get the dayNumber from the event's first block
           this.dayNumber = block.component.blocks[0].dayNumber;
diff --git a/UI/WebServerResources/scss/views/SchedulerUI.scss b/UI/WebServerResources/scss/views/SchedulerUI.scss
index d420b339a..2233ac2a2 100644
--- a/UI/WebServerResources/scss/views/SchedulerUI.scss
+++ b/UI/WebServerResources/scss/views/SchedulerUI.scss
@@ -424,7 +424,7 @@ $block_radius: 3px;
       overflow-y: auto;
     }
     .sg-event {
-      position: static;
+      position: relative;
       padding: 3px 1%;
       margin: $block_margin;
       overflow: hidden;