diff --git a/ChangeLog b/ChangeLog
index 899503d72..bde4bfba5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 2011-02-01  Francis Lachapelle  <flachapelle@inverse.ca>
 
-	* SoObjects/Mailer/SOGoSieveConverter.m (_extractSieveAction:):
+	* UI/WebServerResources/scriptaculous/dragdrop.js (-updateDrag:):
+	fixed JavaScript error with Offset object. This object is now
+	casted as an array.
+
+	* UI/WebServerResources/MailerUI.js (-startDragging): improved
+	behavior of drag and drop.
+
+	* SoObjects/Mailer/SOGoSieveConverter.m (-_extractSieveAction:):
 	now encodes the mailbox name for IMAP.
 
 2011-01-28  Francis Lachapelle  <flachapelle@inverse.ca>
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 26fc81ee8..120b7908d 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2801,8 +2801,20 @@ function startDragging (itm, e) {
     if (target.up('TBODY') == undefined)
         return;
 
+    if (target.tagName != 'TD')
+        target = target.up('TD');
+    var row = target.up('TR');
+
     var handle = $("dragDropVisual");
-    var count = $("messageListBody").getSelectedRowsId().length;
+    var selectedIds = $("messageListBody").getSelectedRowsId();
+    var count = selectedIds.length;
+    var rowId = row.id;
+
+    if (count == 0 || selectedIds.indexOf(rowId) < 0) {
+        onRowClick(e, target);
+        selectedIds = $("messageListBody").getSelectedRowsId();
+        count = selectedIds.length;
+    }
 
     handle.update(count);
     if (Mailer.currentMailbox) {
diff --git a/UI/WebServerResources/scriptaculous/dragdrop.js b/UI/WebServerResources/scriptaculous/dragdrop.js
index 9aaa31163..5f2678872 100644
--- a/UI/WebServerResources/scriptaculous/dragdrop.js
+++ b/UI/WebServerResources/scriptaculous/dragdrop.js
@@ -388,7 +388,7 @@ var Draggable = Class.create({
             p = [ left, top, left+width, top+height ]; 
         }
       } else {
-        p = Position.page(this.options.scroll);
+        p = Position.page(this.options.scroll).toArray();
         p[0] += this.options.scroll.scrollLeft + Position.deltaX;
         p[1] += this.options.scroll.scrollTop + Position.deltaY;
         p.push(p[0]+this.options.scroll.offsetWidth);