diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 90d2bf49e..d0df7cf52 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -1079,7 +1079,8 @@ function configureDragAndDrop () {
                    handle: "contactsList", 
                    onStart: startDragging,
                    onEnd: stopDragging,
-                   onDrag: whileDragging
+                   onDrag: whileDragging,
+                   scroll: window
                  });
 
   var drops = $$("ul#contactFolders li");
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index c30133144..cecbba7a7 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2163,7 +2163,8 @@ function configureDragAndDrop () {
                    handle: "messageList", 
                    onStart: startDragging,
                    onEnd: stopDragging,
-                   onDrag: whileDragging
+                   onDrag: whileDragging,
+                   scroll: "folderTreeContent"
                  });
 
   var drops = $$("div#dmailboxTree1 div.dTreeNode a.node span.nodeName");
diff --git a/UI/WebServerResources/scriptaculous/dragdrop.js b/UI/WebServerResources/scriptaculous/dragdrop.js
index 9e4ac5920..d71896d05 100644
--- a/UI/WebServerResources/scriptaculous/dragdrop.js
+++ b/UI/WebServerResources/scriptaculous/dragdrop.js
@@ -349,6 +349,7 @@ var Draggable = Class.create({
     }
 
     if(this.options.scroll) {
+      Position.includeScrollOffsets = true;
       if (this.options.scroll == window) {
         var where = this._getWindowScroll(this.options.scroll);
         this.originalScrollLeft = where.left;
@@ -358,6 +359,8 @@ var Draggable = Class.create({
         this.originalScrollTop = this.options.scroll.scrollTop;
       }
     }
+    else
+      Position.includeScrollOffsets = false;
 
     Draggables.notify('onStart', this, event);
 
@@ -468,6 +471,7 @@ var Draggable = Class.create({
     this.stopScrolling();
     this.finishDrag(event, true);
     Event.stop(event);
+    Position.includeScrollOffsets = false;
   },
 
   draw: function(point) {