Hack around problems with multi-valued Reply-To headers. From

Roland Rosenfeld.

diff --git a/po/de.po b/po/de.po
index 218394ab4c4280d413d8a0ec6c821eb3f937f2b3..0a73b673ee1c658444cd261062e3b78f0f9deb69 100644 (file)
--- a/po/de.po
+++ b/po/de.po
@@ -2818,8 +2818,8 @@ msgstr "Kein Betreff, breche ab."
 #.
 #: send.c:432
 #, c-format
-msgid "Reply to %s?"
-msgstr "Antworte an %s?"
+msgid "Reply to %s%s?"
+msgstr "Antworte an %s%s?"
 
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.

diff --git a/po/es.po b/po/es.po
index 6545fe2494ed52ff68934a32f904fb152fa522e0..d38284b100b28467cf10c20e9c98592f1640f592 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -2804,8 +2804,8 @@ msgstr "Sin asunto, cancelando."
 #.
 #: send.c:432
 #, c-format
-msgid "Reply to %s?"
-msgstr "¿Responder a %s?"
+msgid "Reply to %s%s?"
+msgstr "¿Responder a %s%s?"
 
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.

diff --git a/po/it.po b/po/it.po
index 0f51bbaa1b5f186744bb3b3465f34e89f9c2f627..979e18c9d4e2fefc9675cbb088c7ee7e771274ad 100644 (file)
--- a/po/it.po
+++ b/po/it.po
@@ -2849,8 +2849,8 @@ msgstr "Nessun soggetto, abbandonato."
 #.
 #: send.c:432
 #, c-format
-msgid "Reply to %s?"
-msgstr "Rispondo a %s?"
+msgid "Reply to %s%s?"
+msgstr "Rispondo a %s%s?"
 
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.

diff --git a/po/ru.po b/po/ru.po
index a5ff246ddb7adbc0145dcc2d39b5cfa5653fb0a1..a51ae8b4567b3e3102e7bea2f57e679c92975e2d 100644 (file)
--- a/po/ru.po
+++ b/po/ru.po
@@ -2834,8 +2834,8 @@ msgstr "
 #.
 #: send.c:432
 #, c-format
-msgid "Reply to %s?"
-msgstr "ïÔ×ÅÔÉÔØ %s?"
+msgid "Reply to %s%s?"
+msgstr "ïÔ×ÅÔÉÔØ %s%s?"
 
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.

diff --git a/po/uk.po b/po/uk.po
index 7066221dce28ac479be8f1fe3e84785386246511..245771ca9732cfbebba27062a701f8bb7ba4eec7 100644 (file)
--- a/po/uk.po
+++ b/po/uk.po
@@ -2831,8 +2831,8 @@ msgstr "
 #.
 #: send.c:432
 #, c-format
-msgid "Reply to %s?"
-msgstr "÷¦ÄÐÏצÓÔÉ %s?"
+msgid "Reply to %s%s?"
+msgstr "÷¦ÄÐÏצÓÔÉ %s%s?"
 
 #. This could happen if the user tagged some messages and then did
 #. * a limit such that none of the tagged message are visible.

diff --git a/send.c b/send.c
index 62bf6e081aca7b1297f275a6f17a84212ba25f18..84ab3432bf552d6e9a6460ca95828719e6e67b9f 100644 (file)
--- a/send.c
+++ b/send.c
@@ -405,7 +405,7 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int group)
   }
   else if (env->reply_to)
   {
-    if (mutt_addrcmp (env->from, env->reply_to) || 
+    if ((mutt_addrcmp (env->from, env->reply_to) && !env->reply_to->next) || 
        (option (OPTIGNORELISTREPLYTO) &&
        mutt_is_mail_list (env->reply_to) &&
        (mutt_addrsrc (env->reply_to, env->to) ||
@@ -421,7 +421,8 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int group)
        */
       rfc822_append (to, env->from);
     }
-    else if (!mutt_addrcmp (env->from, env->reply_to) &&
+    else if (!(mutt_addrcmp (env->from, env->reply_to) && 
+              !env->reply_to->next) &&
             quadoption (OPT_REPLYTO) != M_YES)
     {
       /* There are quite a few mailing lists which set the Reply-To:
@@ -429,7 +430,9 @@ static int default_to (ADDRESS **to, ENVELOPE *env, int group)
        * to send a message to only the sender of the message.  This
        * provides a way to do that.
        */
-      snprintf (prompt, sizeof (prompt), _("Reply to %s?"), env->reply_to->mailbox);
+      snprintf (prompt, sizeof (prompt), _("Reply to %s%s?"),
+               env->reply_to->mailbox, 
+               env->reply_to->next?",...":"");
       if ((i = query_quadoption (OPT_REPLYTO, prompt)) == M_YES)
        rfc822_append (to, env->reply_to);
       else if (i == M_NO)