X-Git-Url: http://git.marmaro.de/?p=mmh;a=blobdiff_plain;f=etc%2Freplcomps;h=523070078752b3ce44b27c383c965871be39c01e;hp=87532bac56d7fa80ed5d8ecaf5d04f3dc7c5c15e;hb=31750e8a12eafcd1b8fa81cb12b988e680254f24;hpb=cc274fe6a74f58cfa17dc263d12d9d940e91b934

diff --git a/etc/replcomps b/etc/replcomps
index 87532ba..5230700 100644
--- a/etc/replcomps
+++ b/etc/replcomps
@@ -11,27 +11,27 @@
 %(formataddr{prev-resent-to})\
 %(formataddr{x-to})\
 %(formataddr{apparently-to})\
-%(void(width))%(putaddr To: )
+%(void(width))%(void(decode))%(putaddr To: )
 %(lit)%(formataddr{to})\
 %(formataddr{cc})\
 %(formataddr{x-cc})\
 %(formataddr{resent-cc})\
 %(formataddr{prev-resent-cc})\
 %(formataddr(me))\
-%(void(width))%(putaddr Cc: )
+%(void(width))%(void(decode))%(putaddr Cc: )
 Fcc: +sent
-Subject: %<{subject}Re: %(void{subject})%(trim)%(decode)%>
+Subject: %<{subject}Re: %(putstr(trim(decode{subject})))%>
 %;
 %; Make References: and In-reply-to: fields for threading.
-%; Use (void), (trim) and (putstr) to eat trailing whitespace.
+%; Use (trim) 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%>\
+%<{references}%(trim{references})%(putstr) %>\
+%(trim{message-id})%(putstr)\n%>\
 Comments: In-reply-to \
 %<{from}%(void{from})%?(void{apparently-from})%|%(void{sender})%>\
-%(trim)%(decode)\n\
+%(putstr(trim(decode)))\n\
    message dated "%<(nodate{date})%{date}%|%(tws{date})%>."
 --------
 [%4(year{date})-%02(mon{date})-%02(mday{date}) \