diff --git a/ChangeLog b/ChangeLog
index 65f8b33d5..487929d13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2009-07-07  Cyril Robert <crobert@inverse.ca>
+
+	* UI/WebServerResources/MailerUI.js: Fixed Drag&Drop issue (header was
+	draggable)
+	* UI/WebServerResources/ContactsUI.js: Fixed Drag&Drop issue (header was
+	draggable)
+
 2009-07-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Scheduler/UIxCalListingActions.m (-eventsBlocksAction): added
diff --git a/UI/Templates/ContactsUI/UIxContactsListView.wox b/UI/Templates/ContactsUI/UIxContactsListView.wox
index 01136fc88..fd458b5d6 100644
--- a/UI/Templates/ContactsUI/UIxContactsListView.wox
+++ b/UI/Templates/ContactsUI/UIxContactsListView.wox
@@ -23,7 +23,7 @@
 	    ><var:string label:value="Preferred Phone" /></td
 	    ></tr>
       </thead>
-      <tbody>
+      <tbody id="contactsListTbody">
         <var:foreach list="contactInfos" item="currentContact">
           <tr class="tableview"
             var:id="currentContact.c_name"
diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js
index 540167649..568522363 100644
--- a/UI/WebServerResources/ContactsUI.js
+++ b/UI/WebServerResources/ContactsUI.js
@@ -106,8 +106,8 @@ function contactsListCallback(http) {
 				table.observe("mousedown", onContactSelectionChange);
 				configureSortableTableHeaders(table);
 				TableKit.Resizable.init(table, {'trueResize' : true, 'keepWidth' : true});
-        configureDragAndDrop ();
       }
+      configureDragAndDrop ();
       
 			var rows = table.tBodies[0].rows;
 			for (var i = 0; i < rows.length; i++) {
@@ -1076,7 +1076,7 @@ function configureDragAndDrop () {
 
   new Draggable ("dragDropVisual", 
                  { 
-                   handle: "contactsList", 
+                   handle: "contactsListTbody", 
                    onStart: startDragging,
                    onEnd: stopDragging,
                    onDrag: whileDragging
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 486ae86d8..412abdcaa 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -2240,9 +2240,11 @@ function configureDragAndDrop () {
   mainElement.absolutize ();
   mainElement.style.display = "none";
 
+  var tbody = $$("TABLE#messageList tbody").first ();
+
   new Draggable ("dragDropVisual", 
                  { 
-                   handle: "messageList", 
+                   handle: tbody.identify (), 
                    onStart: startDragging,
                    onEnd: stopDragging,
                    onDrag: whileDragging