diff --git a/src/elogd.c b/src/elogd.c
index 47c07f57..fbc002c8 100755
--- a/src/elogd.c
+++ b/src/elogd.c
@@ -8822,7 +8822,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
             if (isparam(str)) {
                if (n == 0) {
                   size = TEXT_SIZE;
-                  el_retrieve(lbs, message_id, date, attr_list, attrib, lbs->n_attr,
+                  el_retrieve(lbs, atoi(getparam(str)), date, attr_list, attrib, lbs->n_attr,
                               text, &size, orig_tag, reply_tag, att, encoding, locked_by);
 
                }
@@ -20777,6 +20777,15 @@ void submit_elog(LOGBOOK * lbs)
       }
    }
 
+   /* check for attributes to keep */
+   if (bmultiedit) {
+      sprintf(str, "- %s -", loc("keep original values"));    
+      for (i = 0; i < n_attr; i++) {
+         if (strieq(str, attrib[i]))
+            strlcpy(attrib[i], "<keep>", NAME_LENGTH);
+      }
+   }
+
    message_id = 0;
    reply_to[0] = 0;
    in_reply_to[0] = 0;