diff --git a/doc/ChangeLog b/doc/ChangeLog
index 68d99fe2..8ecaaf78 100755
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,16 @@
+Version 3.1.1, released August 4th, 2015
+========================================
+
+- Updated CKEditor to version 4.5.1
+- Implemented "Date/Time format <attribute> = ..."
+- Implemented "Use Email Subject Edit = ..."
+- Replaced "Back" by "Delete" button
+- Fixed many issues with Draft Messages
+- CSS file is now in *addition* to the default file elog.css
+- Added LDAP documentation
+- Added "Logout to URL = ..." option
+- Added description of Apacher server authentication
+
 Version 3.1.0, released April 1st, 2015
 =======================================
 
diff --git a/doc/config.html b/doc/config.html
index 64de7928..f917aade 100755
--- a/doc/config.html
+++ b/doc/config.html
@@ -2286,6 +2286,9 @@ Options Location = Main Building{a}, New Building{b}, Old Building{c}
       <li>
         <b><code>Use Email Subject = &lt;string&gt;</code></b>
       </li>
+      <li>
+        <b><code>Use Email Subject Edit = &lt;string&gt;</code></b>
+      </li>
       <li>
         <b><code>Use Email From = &lt;string&gt;</code></b>
       </li>
diff --git a/doc/index.html b/doc/index.html
index e60959ae..24b2ded4 100755
--- a/doc/index.html
+++ b/doc/index.html
@@ -29,7 +29,7 @@
             &nbsp;[<a class="nav" href="#links">Links</a>]&nbsp; *&nbsp;</div>
       <P class="Sub">Home of the <i>Electronic Logbook</i> package by <a href="mailto:Stefan.Ritt&#64;psi.ch">
             Stefan Ritt</a></P>
-      <div class="version">Current version is : 3.1.0</div>
+      <div class="version">Current version is : 3.1.1</div>
 
       <hr>
       <a name="whatis">
diff --git a/src/elogd.c b/src/elogd.c
index 8da3a79f..61ce6722 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -22381,7 +22381,12 @@ int compose_email(LOGBOOK * lbs, char *rcpt_to, char *mail_to, int message_id,
    retrieve_email_from(lbs, mail_from, mail_from_name, attrib);
 
    /* compose subject from attributes */
-   if (getcfg(lbs->name, "Use Email Subject", subject, sizeof(subject))) {
+   if (old_mail && getcfg(lbs->name, "Use Email Subject Edit", subject, sizeof(subject))) {
+      i = build_subst_list(lbs, slist, svalue, attrib, TRUE);
+      sprintf(str, "%d", message_id);
+      add_subst_list(slist, svalue, "message id", str, &i);
+      strsubst_list(subject, sizeof(subject), slist, svalue, i);
+   } else if (getcfg(lbs->name, "Use Email Subject", subject, sizeof(subject))) {
       i = build_subst_list(lbs, slist, svalue, attrib, TRUE);
       sprintf(str, "%d", message_id);
       add_subst_list(slist, svalue, "message id", str, &i);