diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index 97c87337f..213e48b01 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -8,39 +8,40 @@
     xmlns:label="OGo:label"
     className="UIxPageFrame"
     title="panelTitle"
-    const:popup="YES"
-    >
-    <div id="headerArea">
-      <div id="attachmentsArea">
-        <var:string label:value="Attachments:" />
-        <div id="compose_attachments_list"
-          onclick="clickedEditorAttach(this);"
-          ><var:foreach list="attachmentNames" item="attachmentName">
+    const:popup="YES">
+    <form name="pageform">
+      <div id="headerArea">
+        <div id="attachmentsArea">
+          <var:string label:value="Attachments:" />
+          <div id="compose_attachments_list"
+            onclick="clickedEditorAttach(this);"
+            ><var:foreach list="attachmentNames" item="attachmentName">
             <var:string value="attachmentName" /><br />
-          </var:foreach>
+            </var:foreach>
+          </div>
         </div>
+        <span class="headerField"><var:string label:value="From" />:</span>
+        <var:popup const:name="from"
+          list="fromEMails"
+          item="item"
+          selection="from"
+          /><br />
+        <div>
+          <var:component className="UIxMailToSelection"
+            to="to" cc="cc" bcc="bcc" />
+        </div>
+        <div class="addressListElement" id="subjectRow"
+          ><span class="headerField"><var:string label:value="Subject"
+              />:</span
+            ><span class="headerInput"
+            ><input name="subject"
+              type="text"
+              class="textField"
+              var:value="subject"
+              /></span></div>
       </div>
-      <span class="headerField"><var:string label:value="From" />:</span>
-      <var:popup const:name="from"
-        list="fromEMails"
-        item="item"
-        selection="from"
-        /><br />
-      <div>
-        <var:component className="UIxMailToSelection"
-          to="to" cc="cc" bcc="bcc" />
-      </div>
-      <div class="addressListElement" id="subjectRow"
-        ><span class="headerField"><var:string label:value="Subject"
-            />:</span
-          ><span class="headerInput"
-          ><input name="subject"
-            type="text"
-            class="textField"
-            var:value="subject"
-            /></span></div>
-    </div>
     <!-- separator line -->
-    <textarea name="content" var:value="text" />
+      <textarea name="content" var:value="text" />
     <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
+    </form>
   </var:component>
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 3c150cfbb..b526b960e 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -398,11 +398,13 @@ function onMenuDeleteMessage(event) {
 }
 
 function onMailboxTreeItemClick(event) {
-  var topNode = $('d');
+  var topNode = $("d");
   var mailbox = this.parentNode.getAttribute("dataname");
 
-  if (topNode.selectedEntry)
+  if (topNode.selectedEntry) {
+    log ("deselecting");
     topNode.selectedEntry.deselect();
+  }
   this.select();
   topNode.selectedEntry = this;
 
@@ -532,8 +534,8 @@ function onFolderMenuClick(event)
   var onhide, menuName;
   
   var menutype = this.parentNode.getAttribute("datatype");
-  log("parentNode: " + this.parentNode.tagName);
-  log("menutype: " + menutype);
+//   log("parentNode: " + this.parentNode.tagName);
+//   log("menutype: " + menutype);
   if (menutype) {
     if (menutype == "inbox") {
       menuName = "inboxIconMenu";
@@ -813,7 +815,7 @@ function expandUpperTree(node)
 function initMailboxSelection(mailboxName)
 {
   currentMailbox = mailboxName;
-
+  log("initMailboxSelection: " + mailboxName);
   var tree = $("d");
   var treeNodes = document.getElementsByClassName("dTreeNode", tree);
   var i = 0;
@@ -821,6 +823,7 @@ function initMailboxSelection(mailboxName)
          && treeNodes[i].getAttribute("dataname") != currentMailbox)
     i++;
   if (i < treeNodes.length) {
+    log ("found mailbox");
     var links = document.getElementsByClassName("node", treeNodes[i]);
     if (tree.selectedEntry)
       tree.selectedEntry.deselect();
@@ -924,7 +927,7 @@ var messageListGhost = function () {
 }
 
 var messageListData = function(type) {
-  var rows = this.getSelectedRowsId();
+  var rows = this.parentNode.parentNode.getSelectedRowsId();
   var msgIds = new Array();
   for (var i = 0; i < rows.length; i++)
     msgIds.push(rows[i].substr(4));
@@ -985,7 +988,7 @@ function configureDragHandles() {
 
 /* dnd */
 function initDnd() {
-  log ("MailerUI initDnd");
+//   log ("MailerUI initDnd");
 
   var tree = $("d");
   if (tree) {
@@ -1017,6 +1020,8 @@ function refreshContacts() {
 function openInbox(node) {
   var done = false;
   openMailbox(node.parentNode.getAttribute("dataname"));
+  var tree = $("d");
+  tree.selectedEntry = node;
   node.select();
   var currentNode = node.parentNode.parentNode;
   while (!done) {
diff --git a/UI/WebServerResources/SOGoDragAndDrop.js b/UI/WebServerResources/SOGoDragAndDrop.js
index e0773d1e3..be68c9cb2 100644
--- a/UI/WebServerResources/SOGoDragAndDrop.js
+++ b/UI/WebServerResources/SOGoDragAndDrop.js
@@ -23,7 +23,7 @@ var SOGODragAndDropSourceInterface = {
     }
   },
   dragGestureMouseUpHandler: function (event) {
-    log("mouseup");
+//     log("mouseup");
     document._currentMouseGestureObject._removeGestureHandlers();
   },
   dragGestureMouseMoveHandler: function (event) {
@@ -160,13 +160,19 @@ document.DNDManager = {
                                  document.DNDManager.destinationExit, false);
       if (operation.destination == event.target) {
 //         log("drag / drop: " + operation.source + " to " + operation.destination);
-        if (operation.destination.dndExit)
-          event.target.dndExit();
+        if (operation.destination.dndExit) {
+//           log ("destination.dndExit...");
+          operation.destination.dndExit();
+        }
         if (operation.destination.dndDrop) {
+//           log ("destination.dndDrop...");
           var data = null;
+//           log ("optype: " + operation.type);
           if (operation.source.dndDataForType)
             data = operation.source.dndDataForType(operation.type);
-          var result = event.target.dndDrop(data);
+//           log ("data: " + data);
+          var result = operation.destination.dndDrop(data);
+//           log ("result: " + result);
           if (operation.ghost) {
             if (result)
               operation.bustGhost();
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 479b08d08..2d55e455e 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -901,11 +901,13 @@ function disableAnchor(anchor) {
 
 function d2h(d) {
   var hD = "0123456789abcdef";
-  var h = hD.substr(d&15,1);
-  while (d>15) {
-    d>>=4;
-    h=hD.substr(d&15,1)+h;
+  var h = hD.substr(d & 15, 1);
+
+  while (d > 15) {
+    d >>= 4;
+    h = hD.substr(d & 15, 1) + h;
   }
+
   return h;
 }