diff --git a/NEWS b/NEWS
index 109b0360f..9af1866f0 100644
--- a/NEWS
+++ b/NEWS
@@ -11,8 +11,6 @@ New Features
 
 Enhancements
  - bundled a shell script to perform and manage backups using sogo-tool
- - increased the delay before starting drag and drop in Mail and Contacts module
-  to improve the user experience with cheap mouses
 
 Bug Fixes
  - fixed escaping issue with PostgreSQL 8.1
@@ -20,12 +18,6 @@ Bug Fixes
  - fixed Spanish (Argentina) templates for mail reply and forward
  - we don't show public address books (from SOGoUserSources) on iOS 5.0.1
 
-1.3.12c (2012-02-15)
--------------------
-
-Bug Fixes
- - fixed a possible crash when using a SQL source
-
 1.3.12b (2012-02-14)
 -------------------
 
diff --git a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
index f4373310d..33e935c7b 100644
--- a/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
+++ b/UI/Templates/SchedulerUI/UIxCalendarSelector.wox
@@ -41,7 +41,7 @@ div.colorBox.calendarFolder<var:string value="currentCalendar.folder" />
             <input type="checkbox" class="checkBox"
               const:disabled="disabled"
               var:checked="currentCalendar.active" />
-            <div var:class="currentCalendarClass"><!-- space --></div
+            <div var:class="currentCalendarClass">OO</div
             ><var:string value="currentCalendar.displayName"
               /></li>
         </var:foreach>
diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css
index a1ef1dc4a..ecea7053f 100644
--- a/UI/WebServerResources/ContactsUI.css
+++ b/UI/WebServerResources/ContactsUI.css
@@ -27,8 +27,7 @@ DIV#rightPanel
   right: 0px;
   bottom: 0px;
   overflow: hidden;
-  -moz-user-select: none;
-  -khtml-user-select: none; }
+}
 
 /* top list */
 DIV#contactsListContent
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 53bfdfff1..a2f5967dd 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -768,7 +768,6 @@ function onAddressBookExport(event) {
     window.location.href = url;
 
     event.stop();
-    hideMenu(document.currentPopupMenu);
 }
 
 function onAddressBookImport(event) {
@@ -1481,19 +1480,19 @@ function configureDraggables() {
         Draggables.empty();
     
         if (mainElement == null) {
-            mainElement = new Element("div", {id: "dragDropVisual"});
+            mainElement = new Element ("div", {id: "dragDropVisual"});
             document.body.appendChild(mainElement);
             mainElement.absolutize();
         }
         mainElement.hide();
     
-        new Draggable("dragDropVisual", 
-                      { handle: "contactsList", 
-                        onStart: startDragging,
-                        onEnd: stopDragging,
-                        onDrag: whileDragging,
-                        scroll: window,
-                        delay: 250 }); 
+        new Draggable ("dragDropVisual", 
+                       { handle: "contactsList", 
+                               onStart: startDragging,
+                               onEnd: stopDragging,
+                               onDrag: whileDragging,
+                               scroll: window
+                           }); 
     }
 }
 
@@ -1524,8 +1523,7 @@ function startDragging (itm, e) {
     var target = Event.element(e);
     if (target.up().up().tagName != "TBODY")
         return false;
-
-    $("contactsListContent").setStyle({ overflow: "visible" });
+    
     var handle = $("dragDropVisual");
     var contacts = $('contactsList').getSelectedRowsId();
     var count = contacts.length;
@@ -1553,7 +1551,6 @@ function whileDragging (itm, e) {
 }
 
 function stopDragging () {
-    $("contactsListContent").setStyle({ overflow: "auto" });
     var handle = $("dragDropVisual");
     handle.hide();
     if (handle.hasClassName ("copy"))
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index 43e9b20d8..7e4bbf453 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -40,9 +40,7 @@ DIV#rightPanel
   margin: 0px;
   margin-left: 5px;
   padding: 0px;
-  overflow: hidden;
-  -moz-user-select: none;
-  -khtml-user-select: none; }
+  overflow: hidden; }
 
 /* top list */
 DIV#mailboxContent
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 156e70d1d..6e6f414a9 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2928,7 +2928,7 @@ function configureDraggables() {
                     onEnd: stopDragging,
                     onDrag: whileDragging,
                     scroll: "folderTreeContent",
-                    delay: 250 });
+                    delay: 100 });
 }
 
 function configureDroppables() {
@@ -2961,9 +2961,6 @@ function startDragging (itm, e) {
     if (target.up('TBODY') == undefined)
         return;
 
-    console.info("start dragging");
-    $("mailboxList").setStyle({ overflow: "visible" });
-
     var row = target.up('TR');
     var handle = $("dragDropVisual");
     var selectedIds = $("messageListBody").getSelectedRowsId();
@@ -2999,9 +2996,7 @@ function whileDragging (itm, e) {
     }
 }
 
-function stopDragging() {
-    console.info("stop dragging");
-    $("mailboxList").setStyle({ overflow: "auto" });
+function stopDragging () {
     var handle = $("dragDropVisual");
     handle.hide();
     if (handle.hasClassName("copy"))
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index 712ab2d22..584626baa 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -38,18 +38,13 @@ DIV#calendarsList
 { height: 100%; }
 
 DIV.colorBox
-{ n0display: inline-block;
-  display: inline-block;
-  n0float: left;
-  background: transparent url("event-gradient.png") repeat-x scroll left center;
-  n0border: 1px solid #333;
-  border-radius: 50%;
-  n0vertical-align: text-bottom;
+{ display: inline;
+  border: 1px solid #333;
+  font-weight: normal;
   margin-right: 3px;
-  n0margin: auto;
-  n0margin: 5px;
-  width: 11px;
-  height: 11px; }
+  font-size: 80%;
+  width: 1em;
+  height: .75em; }
 
 UL#tasksList, UL#calendarList
 { cursor: default;
@@ -71,6 +66,10 @@ UL#calendarList
 { clear: left;
   height: 115px; }
 
+UL#calendarList LI
+{ cursor: pointer;
+  white-space: nowrap; }
+
 UL#tasksList
 { position: absolute;
   top: 2em;
@@ -78,10 +77,9 @@ UL#tasksList
   right: 0px;
   bottom: .25em; }
 
-UL#calendarList LI, UL#tasksList LI
+UL#tasksList LI
 { cursor: pointer;
   width: 100%;
-  line-height: 2em;
   white-space: nowrap; }
 
 UL#tasksList LI.overdue
@@ -1296,10 +1294,8 @@ DIV.event > DIV.eventInside
   padding: 1px;
   top: 0px;
   bottom: 0px;
-  left: 2px;
-  right: 1px;
-  -webkit-border-radius: 2px;
-  border-radius: 2px; }
+  left: 0px;
+  right: 0px; }
 
 DIV.eventInside SPAN.location
 { font-size: smaller; }
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 72f37f6fd..f3422017e 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -529,20 +529,12 @@ DIV.dTreeNode A._selected SPAN.nodeName
   color: #fff;
 }
 
-/* drag'n'drop */
-
 DIV.dTreeNode SPAN._dragOver
 { 
   background-color: #9ABCD8;
   color: #fff;
 }
 
-.genericHoverClass
-{
-  background-color: #9ABCD8 !important;
-  color: #fff !important;
-}
-
 /* resizable columns */
 
 TABLE TD.resize-handle-active,
@@ -557,6 +549,12 @@ DIV.resize-handle
   top: 0px;
   left: 0px; }
 
+.genericHoverClass
+{
+  background-color: #9ABCD8 !important;
+  color: #fff !important;
+}
+
 DIV.dialog
 { position: absolute;
   width: 350px;