From a38c09b58fdd10f4b38abf874fbfd73fd10bbadc Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Thu, 31 Jul 2014 20:19:20 +0200 Subject: Bug 733776 - Should not digitally sign the draft messages --- composer/e-msg-composer.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c index 75aa108678..96341ed2f0 100644 --- a/composer/e-msg-composer.c +++ b/composer/e-msg-composer.c @@ -1116,17 +1116,19 @@ composer_build_message (EMsgComposer *composer, context->session = e_msg_composer_ref_session (composer); context->from = e_msg_composer_get_from (composer); - if (flags & COMPOSER_FLAG_PGP_SIGN) - context->pgp_sign = TRUE; + if (!(flags & COMPOSER_FLAG_SAVE_DRAFT)) { + if (flags & COMPOSER_FLAG_PGP_SIGN) + context->pgp_sign = TRUE; - if (flags & COMPOSER_FLAG_PGP_ENCRYPT) - context->pgp_encrypt = TRUE; + if (flags & COMPOSER_FLAG_PGP_ENCRYPT) + context->pgp_encrypt = TRUE; - if (flags & COMPOSER_FLAG_SMIME_SIGN) - context->smime_sign = TRUE; + if (flags & COMPOSER_FLAG_SMIME_SIGN) + context->smime_sign = TRUE; - if (flags & COMPOSER_FLAG_SMIME_ENCRYPT) - context->smime_encrypt = TRUE; + if (flags & COMPOSER_FLAG_SMIME_ENCRYPT) + context->smime_encrypt = TRUE; + } context->need_thread = context->pgp_sign || context->pgp_encrypt || -- cgit v1.2.3