From ec751d9bbebd843215896b299712728eed0ea76c Mon Sep 17 00:00:00 2001
From: Glenn Burkhardt <glenn@aoi.ultranet.com>
Date: Mon, 30 Jun 2003 16:40:09 +0000
Subject: [PATCH] made RFC 2822 compliant, using an "In-reply-to:" format
 supplied by Jerry Peek.

---
 etc/replcomps      |   20 ++++++++++++++------
 etc/replgroupcomps |   20 ++++++++++++++------
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/etc/replcomps b/etc/replcomps
index 5b6f4bf..21282fc 100644
--- a/etc/replcomps
+++ b/etc/replcomps
@@ -1,6 +1,6 @@
-%; replcomps
+%; $Id$
 %;
-%; default form (components) file for `repl'
+%; replcomps: default form (components) file for `repl'
 %;
 %; Check for the following headers (in this order)
 %; to construct the return address
@@ -23,8 +23,16 @@
 %<(nonnull)%(void(width))%(putaddr cc: )\n%>\
 %<{fcc}Fcc: %{fcc}\n%>\
 %<{subject}Subject: Re: %{subject}\n%>\
-%<{date}In-Reply-To: Your message of "\
-%<(nodate{date})%{date}%|%(pretty{date})%>."%<{message-id}
-             %{message-id}%>\n%>\
-%<{message-id}References: %<{references} %{references}%> %{message-id}\n%>\
+%;
+%; Make References: and In-reply-to: fields for threading.
+%; Use (void), (trim) and (putstr) to eat trailing whitespace.
+%;
+%<{message-id}In-reply-to: %{message-id}\n%>\
+%<{message-id}References: \
+%<{references}%(void{references})%(trim)%(putstr) %>\
+%(void{message-id})%(trim)%(putstr)\n%>\
+Comments: In-reply-to \
+%<{from}%(void{from})%?(void{apparently-from})%|%(void{sender})%>\
+%(trim)%(putstr)\n\
+   message dated "%<(nodate{date})%{date}%|%(tws{date})%>."
 --------
diff --git a/etc/replgroupcomps b/etc/replgroupcomps
index 3226af7..4a3e3a4 100644
--- a/etc/replgroupcomps
+++ b/etc/replgroupcomps
@@ -1,6 +1,6 @@
-%; replgroupcomps
+%; $Id$
 %;
-%; form (components) file for `repl -group'
+%; replgroupcomps:  form (components) file for `repl -group'
 %;
 %; Check the following headers to create reply addresses.
 %;
@@ -30,8 +30,16 @@
 %;
 %<{fcc}Fcc: %{fcc}\n%>\
 %<{subject}Subject: Re: %{subject}\n%>\
-In-Reply-To: Message from %<{from}%{from}%?{sender}%{sender}%|%{return-path}%>\n\
-   of "%<(nodate{date})%{date}%|%(pretty{date})%>."\
-%<{message-id} %{message-id}%>\n\
-%<{message-id}References: %<{references} %{references}%> %{message-id}\n%>\
+%;
+%; Make References: and In-reply-to: fields for threading.
+%; Use (void), (trim) and (putstr) to eat trailing whitespace.
+%;
+%<{message-id}In-reply-to: %{message-id}\n%>\
+%<{message-id}References: \
+%<{references}%(void{references})%(trim)%(putstr) %>\
+%(void{message-id})%(trim)%(putstr)\n%>\
+Comments: In-reply-to \
+%<{from}%(void{from})%?(void{apparently-from})%|%(void{sender})%>\
+%(trim)%(putstr)\n\
+   message dated "%<(nodate{date})%{date}%|%(tws{date})%>."
 --------
-- 
1.7.10.4