diff --git a/ChangeLog b/ChangeLog
index 0d50a23a6..8c4361def 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2011-05-03  Francis Lachapelle  <flachapelle@inverse.ca>
 
+	* UI/WebServerResources/UIxMailEditor.js (createAttachment): show
+	the attachment name as the list entry's title.
+
 	* UI/WebServerResources/generic.js (onRowClick): in some cases
 	under ID,	the event is trigger on the dragging identifier
 	and must be ignored.
diff --git a/UI/Templates/MailerUI/UIxMailEditor.wox b/UI/Templates/MailerUI/UIxMailEditor.wox
index da2e513ab..15abf5513 100644
--- a/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -58,7 +58,7 @@
       <var:string label:value="Attachments:" />
       <ul id="attachments">
 	<var:foreach list="attachmentNames" item="attachmentName"
-	  ><li><img rsrc:src="attachment.gif"
+	  ><li var:title="attachmentName"><img rsrc:src="attachment.gif"
 	      /><var:string value="attachmentName"
 	      /></li></var:foreach>
       </ul>
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index a479fe482..2d4893268 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -251,6 +251,7 @@ function createAttachment(node, list) {
     var fileArray = filename.split(separator);
     var attachmentName = document.createTextNode(fileArray[fileArray.length-1]);
     attachment.appendChild(attachmentName);
+    attachment.writeAttribute("title", fileArray[fileArray.length-1]);
 }
 
 function clickedEditorSave() {