X-Git-Url: https://diplodocus.org/git/nmh/blobdiff_plain/e429820bc15ffd06239ae9e4f4100ee47738deba..9f8418e870a70c264eda1598f2d470e5428c216d:/etc/replgroupcomps

diff --git a/etc/replgroupcomps b/etc/replgroupcomps
index 210a3e00..5127988a 100644
--- a/etc/replgroupcomps
+++ b/etc/replgroupcomps
@@ -20,12 +20,17 @@
 %;     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%>