diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css
index cd251ed85..c22ddea34 100644
--- a/UI/WebServerResources/UIxMailEditor.css
+++ b/UI/WebServerResources/UIxMailEditor.css
@@ -92,10 +92,8 @@ div#attachmentsArea
 { display: none;
   float: right;
   width: 120px;
-  height: 100%;
+  padding: 2px 5px 0;
   margin: auto;
-  padding-right: 5px;
-  padding-left: 5px;
   border-left: 1px solid #888; }
 
 hr
@@ -133,7 +131,7 @@ UL#attachments
 { cursor: default;
   margin: 0px;
   padding: 0px;
-  height: 9em;
+  height: 100%;
   border-bottom: 1px solid #fff;
   border-right: 1px solid #fff;
   border-top: 2px solid #222;
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index 0a34402d7..0f626f9e0 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -103,40 +103,7 @@ function insertContact(inputNode, contactName, contactEmail) {
     inputNode.value = value;
 }
 
-function toggleAttachments() {
-    var div = $("attachmentsArea");
-    var style = "" + div.getStyle("display");
-    if (style.length)
-        div.setStyle({ display: "" });
-    else
-        div.setStyle({ display: "block" });
 
-    return false;
-}
-
-function updateInlineAttachmentList(sender, attachments) {
-    var count = 0;
-
-    var div = $("attachmentsArea");
-    if (attachments)
-        count = attachments.length;
-
-    if (count) {
-        var text  = "";
-        for (var i = 0; i < count; i++) {
-            text = text + attachments[i];
-            text = text + '<br />';
-        }
-
-        var e = $('compose_attachments_list');
-        e.innerHTML = text;
-        var style = "" + div.getStyle("display");
-        if (!style.length)
-            div.setStyle({display: "block"});
-    }
-    else
-        div.setStyle({display: ""});
-}
 /* mail editor */
 
 function validateEditorInput(sender) {
@@ -218,10 +185,6 @@ function clickedEditorAttach(sender) {
     return false;
 }
 
-function onAddAttachment() {
-    return clickedEditorAttach(null);
-}
-
 function onAttachmentChange(event) {
     if (this.value == "")
         this.parentNode.removeChild(this);
@@ -618,7 +581,7 @@ function getMenus() {
     return { "attachmentsMenu": new Array(null, onRemoveAttachments,
                                           onSelectAllAttachments,
                                           "-",
-                                          onAddAttachment, null) };
+                                          clickedEditorAttach, null) };
 }
 
 function onRemoveAttachments() {
@@ -720,7 +683,6 @@ function onWindowResize(event) {
             $("attachments").setStyle({ height: (height-9) + 'px' });
         else
             $("attachments").setStyle({ height: height + 'px' });
-
     }
     var subjectfield = headerarea.down("div#subjectRow span.headerField");
     var subjectinput = headerarea.down("div#subjectRow input.textField");