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)
mutt_parse_mime_message (ctx, cur);
mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
- if ((cur->security & ENCRYPT) && option (OPTFORWDECODE)) {
- /* make sure we have the user's passphrase before proceeding... */
- crypt_valid_passphrase (cur->security);
- }
-
mutt_forward_intro (out, cur);
if (option (OPTFORWDECODE)) {
int cmflags = M_CM_PREFIX | M_CM_DECODE | M_CM_CHARCONV | M_CM_REPLYING;
int chflags = CH_DECODE;
- if ((cur->security & ENCRYPT)) {
- /* make sure we have the user's passphrase before proceeding... */
- crypt_valid_passphrase (cur->security);
- }
-
mutt_parse_mime_message (ctx, cur);
mutt_message_hook (ctx, cur, M_MESSAGEHOOK);
* Is this the right thing to do?
*/
- if (From)
- adr = address_dup(From);
+ if (MAlias.from)
+ adr = address_dup(MAlias.from);
else if (MCore.use_domain) {
const char *fqdn = mutt_fqdn (1);
adr = address_new();