Rocco Rutte:

[apps/madmutt.git] / send.c

diff --git a/send.c b/send.c
index 851db2d..5dad490 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1095,6 +1095,7 @@ int ci_send_message (int flags, /* send mode */
   /* save current value of "pgp_sign_as" */
   char *signas = NULL;
   char *tag = NULL, *err = NULL;
+  char *ctype;
 
   int rv = -1;
 
@@ -1175,13 +1176,19 @@ int ci_send_message (int flags, /* send mode */
     pbody->next = msg->content; /* don't kill command-line attachments */
     msg->content = pbody;
 
-    mutt_parse_content_type (ContentType, msg->content);
+    ctype = str_dup (ContentType);
+    mutt_parse_content_type (ctype, msg->content);
+    mem_free (&ctype);
+
     msg->content->unlink = 1;
     msg->content->use_disp = 0;
     msg->content->disposition = DISPINLINE;
     if (option (OPTTEXTFLOWED) && msg->content->type == TYPETEXT
-        && !ascii_strcasecmp (msg->content->subtype, "plain"))
+        && !ascii_strcasecmp (msg->content->subtype, "plain")) {
       mutt_set_parameter ("format", "flowed", &msg->content->parameter);
+      if (option (OPTDELSP))
+        mutt_set_parameter ("delsp", "yes", &msg->content->parameter);
+    }
 
     if (!tempfile) {
       mutt_mktemp (buffer);