X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=url.c;h=35cb0c1829903ae30b8e91b46b2f4faf833619c8;hp=1740c241ef8951659929f8abdce276207f8a4ee6;hb=c5f843d96b3889ba116e4b704e457a00bee63cb9;hpb=74a2265af51ce89bca845adc1d68f273c9933c13

diff --git a/url.c b/url.c
index 1740c24..35cb0c1 100644
--- a/url.c
+++ b/url.c
@@ -234,16 +234,22 @@ int url_parse_mailto (ENVELOPE * e, char **body, const char *src)
 
     if (!ascii_strcasecmp (tag, "body")) {
       if (body)
-        mutt_str_replace (body, value);
+        str_replace (body, value);
     }
     else {
-      taglen = mutt_strlen (tag);
+#define SAFEPFX (option (OPTSTRICTMAILTO) ? "" : "X-Mailto-")
+      taglen = mutt_strlen (tag) + mutt_strlen (SAFEPFX);
       /* mutt_parse_rfc822_line makes some assumptions */
-      snprintf (scratch, sizeof (scratch), "%s: %s", tag, value);
+      snprintf (scratch, sizeof (scratch), "%s%s: %s", SAFEPFX, tag, value);
+#undef SAVEPFX
       scratch[taglen] = '\0';
       value = &scratch[taglen + 1];
       SKIPWS (value);
       mutt_parse_rfc822_line (e, NULL, scratch, value, 1, 0, 0, &last);
+      /* if $strict_mailto is set, force editing headers to let
+       * users have a look at what we got */
+      if (!option (OPTSTRICTMAILTO))
+        set_option (OPTEDITHDRS);
     }
   }