diff --git a/ChangeLog b/ChangeLog
index 05b50abf4..37540a66c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-02-03  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/UIxMailEditor.js (onRemoveAttachments):
+	instead of extracting the filename from the text nodes under the
+	list element, we now use the title attribute. This fixes an issue
+	with IE that would append an extra space to the filename.
+
 2012-02-02  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/MailerUI/UIxMailMainFrame.m (-composeAction): recipient
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index ab9ebe038..bab879bd0 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -424,7 +424,7 @@ function initMailEditor() {
                                'BulletedList', '-', 'Link', 'Unlink', 'Image', 
                                'JustifyLeft','JustifyCenter','JustifyRight',
                                'JustifyBlock','Font','FontSize','-','TextColor',
-                               'BGColor','-','SpellChecker']
+                               'BGColor','-','SpellChecker','Scayt']
                              ],
                              language : localeCode,
 			     scayt_sLang : localeCode
@@ -513,12 +513,7 @@ function onRemoveAttachments() {
             list.removeChild(nodes[i]);
         }
         else {
-            var filename = "";
-            var childNodes = nodes[i].childNodes;
-            for (var j = 0; j < childNodes.length; j++) {
-                if (childNodes[j].nodeType == 3)
-                    filename += childNodes[j].nodeValue;
-            }
+            var filename = nodes[i].title;
             var url = "" + window.location;
             var parts = url.split("/");
             parts[parts.length-1] = "deleteAttachment?filename=" + encodeURIComponent(filename);