[evolution] Bug 733776 - Should not digitally sign the draft messages

[Milan Crha <mcrha src gnome org>]

commit a38c09b58fdd10f4b38abf874fbfd73fd10bbadc
Author: Milan Crha <mcrha redhat com>
Date:   Thu Jul 31 20:19:20 2014 +0200

    Bug 733776 - Should not digitally sign the draft messages

 composer/e-msg-composer.c |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 deletions(-)
---
diff --git a/composer/e-msg-composer.c b/composer/e-msg-composer.c
index 75aa108..96341ed 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 ||