X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/c948e3f891a14ca70ed9f82ac05481e2a8614bb5..799d60bd3ffa116dd0ee08cba1017cba3c4dbad8:/etc/replgroupcomps?ds=sidebyside

diff --git a/etc/replgroupcomps b/etc/replgroupcomps
index 7920544b..5127988a 100644
--- a/etc/replgroupcomps
+++ b/etc/replgroupcomps
@@ -20,16 +20,21 @@
 %;     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}%|+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.