Rocco Rutte:

[apps/madmutt.git] / send.c

diff --git a/send.c b/send.c
index 9fc382f..a6da714 100644 (file)
--- a/send.c
+++ b/send.c
@@ -12,6 +12,8 @@
 #endif
 
 #include "mutt.h"
+#include "enter.h"
+#include "ascii.h"
 #include "mutt_curses.h"
 #include "rfc2047.h"
 #include "keymap.h"
@@ -54,15 +56,9 @@ static void append_signature (FILE * f)
   FILE *tmpfp;
   pid_t thepid;
 
-  if (SignOffString) {
-    fprintf (f, "\n%s", SignOffString);
-  }
-
   if (Signature && (tmpfp = mutt_open_read (Signature, &thepid))) {
     if (option (OPTSIGDASHES))
       fputs ("\n-- \n", f);
-    else if (SignOffString)
-      fputs ("\n", f);
     mutt_copy_stream (tmpfp, f);
     fclose (tmpfp);
     if (thepid != -1)
@@ -433,7 +429,6 @@ void mutt_make_post_indent (CONTEXT * ctx, HEADER * cur, FILE * out)
   if (PostIndentString) {
     mutt_make_string (buffer, sizeof (buffer), PostIndentString, ctx, cur);
     fputs (buffer, out);
-    fputc ('\n', out);
   }
 }
 
@@ -1093,6 +1088,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;
 
@@ -1173,7 +1169,10 @@ 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;