diff --git a/ChangeLog b/ChangeLog
index d42ae509f..0ba503a8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,9 @@
 
 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/Documentation/SOGo Installation Guide.odt b/Documentation/SOGo Installation Guide.odt
index b8bce7e52..bc7314678 100644
Binary files a/Documentation/SOGo Installation Guide.odt and b/Documentation/SOGo Installation Guide.odt differ
diff --git a/Documentation/SOGo Mobile Devices Configuration.odt b/Documentation/SOGo Mobile Devices Configuration.odt
index 421f394c7..ca48e5318 100644
Binary files a/Documentation/SOGo Mobile Devices Configuration.odt and b/Documentation/SOGo Mobile Devices Configuration.odt differ
diff --git a/Documentation/SOGo Mozilla Thunderbird Configuration.odt b/Documentation/SOGo Mozilla Thunderbird Configuration.odt
index 23e33335f..c17d4ce80 100644
Binary files a/Documentation/SOGo Mozilla Thunderbird Configuration.odt and b/Documentation/SOGo Mozilla Thunderbird Configuration.odt differ
diff --git a/NEWS b/NEWS
index a627d4def..2ea4451e2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,10 +1,12 @@
-1.3-201104XX (1.3.7)
+1.3-20110503 (1.3.7)
 ---------------------
 New Features
  - IMAP namespaces are now translated and the full name of the
    mailbox owner is extracted under "Other Users" 
  - added the "authenticationFilter" parameter for SQL-based
    sources to limit who can authenticate to a local SOGo instance
+ - added the "IMAPLoginFieldName" parameter in authentication sources to
+   specify a different value for IMAP authentication
  - added support for resources like projectors, conference rooms
    and more which allows SOGo to avoid double-booking of them
    and also allows SOGo to automatically accept invitations for them
@@ -14,6 +16,8 @@ Enhancements
  - the recipients selection works more like Thunderbird when
    composing emails
  - improved the documentation regarding groups in LDAP
+ - minor improvements to the webmail module
+ - minor improvements to the contacts web module
 
 Bug Fixes
  - selection problems with Chrome under OS X in the webmail interface
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() {
diff --git a/Version b/Version
index 54ad3cc29..8f67b736a 100644
--- a/Version
+++ b/Version
@@ -4,4 +4,4 @@
 
 MAJOR_VERSION=1
 MINOR_VERSION=3
-SUBMINOR_VERSION=6
+SUBMINOR_VERSION=7