X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2Freplgroupcomps;h=210a3e00fb792ec7fe430803cb92d72db2069c3b;hp=3226af7425efc4195fc515cdfe3509471f016407;hb=0aef47ae5c03e1d9e3f225efe5ae362e7cf5ee35;hpb=aae44c933a5b035e0b23abf4dd4247cd37e4d041

diff --git a/etc/replgroupcomps b/etc/replgroupcomps
index 3226af7..210a3e0 100644
--- a/etc/replgroupcomps
+++ b/etc/replgroupcomps
@@ -28,10 +28,18 @@
 %(lit)%(formataddr{to})%(formataddr{cc})%(formataddr(me))\
 %<(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\
-%<{message-id}References: %<{references} %{references}%> %{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})%>."
 --------