X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/1691e80890e5d8ba258c51c214a3e91880e1db2b..0960755b43eeadb9af44c924cf85b39bd2fb78f6:/etc/replgroupcomps

diff --git a/etc/replgroupcomps b/etc/replgroupcomps
index 9295fd0e..5127988a 100644
--- a/etc/replgroupcomps
+++ b/etc/replgroupcomps
@@ -20,17 +20,31 @@
 %;     cc              (and)
 %;     personal address
 %;
+%; Note that addresses should not have %(decode) run on them in case invalid
+%; characters are in the address field.
+%;
+%(void(localmbox))%(void(width))%(putaddr From: )
 %(lit)%(formataddr{mail-followup-to})\
 %<(nonnull)%(void(width))%(putaddr To: )\n\
+%(putaddr Mail-Followup-To: )\n\
 %|\
 %(lit)%(formataddr %<{mail-reply-to}%?{reply-to}%?{from}%?{sender}%?{return-path}%>)\
 %<(nonnull)%(void(width))%(putaddr To: )\n%>\
-%(lit)%(formataddr{to})%(formataddr{cc})%(formataddr(me))\
+%(lit)%(formataddr{to})%(formataddr{cc})%(formataddr(localmbox))\
 %<(nonnull)%(void(width))%(putaddr cc: )\n%>%>\
 %;
-%<{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\
+Fcc: %<{fcc}%{fcc}%|+outbox%>
+Subject: %<{subject}Re: %(void{subject})%(trim)%(putstr)%>
+%;
+%; 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})%>."
 --------