diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index a020c54ee..e57ac41ec 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -1,6 +1,6 @@
 <?xml version='1.0' standalone='yes'?>
 <!DOCTYPE table>
-<table multiselect="yes" id="messageList"
+<table id="messageList"
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:var="http://www.skyrix.com/od/binding"
   xmlns:const="http://www.skyrix.com/od/constant"
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index a8cad3cd4..97813396c 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -488,7 +488,7 @@ TABLE#messageList TH
 
 TD#messageFlagHeader,
 TABLE#messageList TD.messageFlagColumn
-{ width: 1em;
+{ width: 22px;
   text-align: center; }
 
 TD#subjectHeader,
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index d6aa43819..2bd42c5aa 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -637,7 +637,7 @@ function storeCachedMessage(cachedMessage) {
   cachedMessages[oldest] = cachedMessage;
 }
 
-function onMessageSelectionChange() {
+function onMessageSelectionChange() { log("onMessageSelectionChange");
   var rows = this.getSelectedRowsId();
 
   if (rows.length == 1) {
@@ -965,10 +965,10 @@ var messageListData = function(type) {
 
 function configureMessageListEvents(table) {
   if (table) {
+    table.multiselect = true;
     // Each body row can load a message
     Event.observe(table, "mousedown",
-    		  onMessageSelectionChange.bindAsEventListener(table));
-    
+    		  onMessageSelectionChange.bindAsEventListener(table));    
     // Sortable columns
     configureSortableTableHeaders(table);
   }
diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css
index 94b5f0a8f..26f7793b4 100644
--- a/UI/WebServerResources/UIxMailEditor.css
+++ b/UI/WebServerResources/UIxMailEditor.css
@@ -75,7 +75,8 @@ input.currentAttachment
   right: 1em; }
 
 input.attachment
-{ display: none; }
+{ position: absolute;
+  left: -1000px; }
 
 div#compose_attachments_list
 { background-color: #ffffff;
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index bddc2b238..78fecff32 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -9,7 +9,6 @@ function onContactAdd() {
     urlstr += '/';
   urlstr += ("../../" + UserLogin + "/Contacts/"
              + contactSelectorAction + selectorURL);
-//   log (urlstr);
   var w = window.open(urlstr, "Addressbook",
                       "width=640,height=400,resizable=1,scrollbars=0");
   w.selector = selector;
@@ -159,6 +158,13 @@ function clickedEditorAttach(sender) {
   }  
 
   var inputs = area.getElementsByTagName("input");
+
+  // Verify if there's already a visible file input field
+  for (var i = 0; i < inputs.length; i++)
+    if ($(inputs[i]).hasClassName("currentAttachment"))
+      return false;
+  
+  // Add new file input field
   var attachmentName = "attachment" + inputs.length;
   var newAttachment = createElement("input", attachmentName,
 				    "currentAttachment", null,
@@ -172,16 +178,7 @@ function clickedEditorAttach(sender) {
 }
 
 function onAddAttachment() {
-  var area = $("attachmentsArea");
-  var inputs = area.getElementsByTagName("input");
-  var attachmentName = "attachment" + inputs.length;
-  var newAttachment = createElement("input", attachmentName,
-				    "currentAttachment", null,
-				    { type: "file",
-				      name: attachmentName },
-				    area);
-  Event.observe(newAttachment, "change",
-		onAttachmentChange.bindAsEventListener(newAttachment));
+  return clickedEditorAttach(null);
 }
 
 function onAttachmentChange(event) {
@@ -336,11 +333,12 @@ function onMailEditorClose(event) {
     var parts = url.split("/");
     parts[parts.length-1] = "delete";
     url = parts.join("/");
-
     http = createHTTPClient();
     http.open("POST", url, false /* not async */);
     http.send("");
   }
+  
+  Event.stopObserving(window, "beforeunload", onMailEditorClose);
 }
 
 addEvent(window, 'load', initMailEditor);