X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2Freplgroupcomps;h=09d6360627a922cfdc05aa9cfdc906101f0f0225;hp=3226af7425efc4195fc515cdfe3509471f016407;hb=5cb46b33551f28e4168989e752e09bd927e993f9;hpb=aae44c933a5b035e0b23abf4dd4247cd37e4d041

diff --git a/etc/replgroupcomps b/etc/replgroupcomps
index 3226af7..09d6360 100644
--- a/etc/replgroupcomps
+++ b/etc/replgroupcomps
@@ -16,22 +16,33 @@
 %;
 %; AND
 %;
-%; cc: To              (and)
-%;     cc              (and)
+%; Cc: To              (and)
+%;     Cc              (and)
 %;     personal address
 %;
 %(lit)%(formataddr{mail-followup-to})\
-%<(nonnull)%(void(width))%(putaddr To: )\n\
+%<(nonnull)%(void(width))%(void(decode))%(putaddr To: )\n\
 %|\
 %(lit)%(formataddr %<{mail-reply-to}%?{reply-to}%?{from}%?{sender}%?{return-path}%>)\
-%<(nonnull)%(void(width))%(putaddr To: )\n%>\
+%<(nonnull)%(void(width))%(void(decode))%(putaddr To: )\n%>\
 %(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%>\
+%<(nonnull)%(void(width))%(void(decode))%(putaddr Cc: )\n%>%>\
+%;
+Fcc: +sent
+Subject: %<{subject}Re: %(putstr(trim(decode{subject})))%>
+%;
+%; Make References: and In-reply-to: fields for threading.
+%; Use (trim) to eat trailing whitespace.
+%;
+%<{message-id}In-reply-to: %{message-id}\n%>\
+%<{message-id}References: \
+%<{references}%(trim{references})%(putstr) %>\
+%(trim{message-id})%(putstr)\n%>\
+Comments: In-reply-to \
+%<{from}%(void{from})%?(void{apparently-from})%|%(void{sender})%>\
+%(putstr(trim(decode)))\n\
+   message dated "%<(nodate{date})%{date}%|%(tws{date})%>."
 --------
+[%4(year{date})-%02(mon{date})-%02(mday{date}) \
+%02(hour{date}):%02(min{date})] %(decode{from})
+>