X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=send.c;h=1c442a05a3c04f633374fd29f6c60742716e0dc0;hp=269d98d0c25e5ed646a4c598bdb2a815ef6ad98c;hb=68d92974c5785799ffb24f6577ae030594f91b29;hpb=16534e98723674fa391e3fc29d2a07ce419c13dd

diff --git a/send.c b/send.c
index 269d98d..1c442a0 100644
--- a/send.c
+++ b/send.c
@@ -97,7 +97,7 @@ static void append_signature (FILE * f)
     fprintf (f, "\n%s", SignOffString);
   }
 
-  if (Signature && (tmpfp = mutt_open_read (Signature, &thepid))) {
+  if (tmpfp = mutt_open_read(NONULL(MAlias.signature), &thepid)) {
     if (option (OPTSIGDASHES))
       fputs ("\n-- \n", f);
     else if (SignOffString)
@@ -1349,16 +1349,12 @@ int ci_send_message (int flags, /* send mode */
     if (option (OPTHDRS))
       process_user_header (msg->env);
 
-
-    if (option (OPTSIGONTOP) && (!(flags & SENDKEY)))
-      append_signature (tempfp);
-
     /* include replies/forwarded messages, unless we are given a template */
     if (!tempfile && (ctx || !(flags & (SENDREPLY | SENDFORWARD)))
         && generate_body (tempfp, msg, flags, ctx, cur) == -1)
       goto cleanup;
 
-    if (!option (OPTSIGONTOP) && (!(flags & SENDKEY)))
+    if (!(flags & SENDKEY))
       append_signature (tempfp);
 
     /*