X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c948e3f891a14ca70ed9f82ac05481e2a8614bb5..50d4d5ca6977bf7224f5ae0aa31f8ee7964df5a3:/etc/replcomps

diff --git a/etc/replcomps b/etc/replcomps
index 6ec3ce72..cf361095 100644
--- a/etc/replcomps
+++ b/etc/replcomps
@@ -1,7 +1,14 @@
-%; $Header$
+%;
+%; replcomps - our default component file for "repl"
+%;
+%;
+%; First, output a "From" header.
+%(void(localmbox))%(void(width))%(putaddr From: )
 %;
 %; These next lines slurp in lots of addresses for To: and cc:.
 %; Use with repl -query or else you may get flooded with addresses!
+%; Currently %(decode) should NOT be used on address fields, in case invalid
+%; characters are in an address.
 %;
 %; If no To:/cc:/Fcc: text, we output empty fields for prompter to fill in.
 %;
@@ -17,10 +24,10 @@
 %(formataddr{x-cc})\
 %(formataddr{resent-cc})\
 %(formataddr{prev-resent-cc})\
-%(formataddr(me))\
+%(formataddr(localmbox))\
 %(void(width))%(putaddr cc: )
 Fcc: %<{fcc}%{fcc}%|+outbox%>
-Subject: %<{subject}Re: %{subject}%>
+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.