diff --git a/elogd.c b/elogd.c
index 8998c186..e8865c21 100755
--- a/elogd.c
+++ b/elogd.c
@@ -6,6 +6,9 @@
   Contents:     Web server program for Electronic Logbook ELOG
 
   $Log$
+  Revision 2.7  2002/06/10 11:22:41  midas
+  Added 'Subst on reply' option
+
   Revision 2.6  2002/06/10 10:38:22  midas
   Added 'top level only' flag
 
@@ -3344,6 +3347,21 @@ time_t now;
         }
     }
 
+  /* subst attributes for replies */
+  if (message_id && !bedit)
+    {
+    for (index = 0 ; index < n_attr ; index++)
+      {
+      sprintf(str, "Subst on reply %s", attr_list[index]);
+      if (getcfg(lbs->name, str, preset))
+        {
+        i = build_subst_list(lbs, slist, svalue, attrib);
+        strsubst(preset, slist, svalue, i);
+        strcpy(attrib[index], preset);
+        }
+      }
+    }
+
   /* header */
   rsprintf("HTTP/1.1 200 Document follows\r\n");
   rsprintf("Server: ELOG HTTP %s\r\n", VERSION);
diff --git a/elogd_fancy.cfg b/elogd_fancy.cfg
index 52ed63e4..63393d8a 100755
--- a/elogd_fancy.cfg
+++ b/elogd_fancy.cfg
@@ -186,15 +186,21 @@ Preset Author = Entered by $long_name from $remote_host on $date
 # Attribute substitution after submission
 Subst Subject = $subject, entered from $remote_host
 
+# Attribute substituiton for replies. Replace current subject by
+# "Re: <old subject>"
+Subst on reply subject = RE: $subject
+
 # Attribute "author" cannot be changed to ensure it's correct
 Locked Attributes = author
 
 # Attribute "type" cannot be changed via "Edit" button
 Fixed Attributes = Type
 
-# Attributes displayed in find page. Items "#", "Date" are always
-# displayed
-Display search = Author, Subject
+# Items displayed in find page. In addition to all attributes,
+# items "#" (for message ID), "Logbook" and "Date" can be used.
+# Display of message body is controlled by "Summary on default" 
+# flag and "Summary lines"
+Display search = #, Date, Author, Subject
 
 # Main body text preset
 Preset text = Change this...
@@ -203,6 +209,22 @@ Preset text = Change this...
 # Makes sense for author field when author is not preset
 #Remove on reply = author
 
+# Default mode for search display can be "full", "summary"
+# and "threaded". On the find entry form, the checkboxes
+# are set accordingly. The "Last xxx" page used this setting
+# directly.
+Display mode = full
+
+# If a logbook uses some icons for an attribute, these icons
+# can be displayed in the search result page instead of the
+# default icons defined in the themes.cfg file.
+#Thread icon = Icon
+
+# The text line in the threaded display can be defined here
+# All standard substitutions as described in the documentation
+# might be used
+Thread display = $author; $subject
+
 #---------------------------
 # Email notification
 #---------------------------
@@ -227,9 +249,6 @@ Show text = 1
 # Display attachments
 Show attachments = 1
 
-# If 1, "Last x" queries display on a few lines message body
-Summary on default = 1
-
 # Number of message body lines displayed, can be zero for no text at all
 Summary lines = 3
 
@@ -280,6 +299,8 @@ Back to main = 0
 # If on, messages can only be edited by the original author
 Restrict edit = 0
 
+# For threaded display, only display top level messages (no replies)
+Top level only = 0
 
 #############################
 # Section for second logbook