only show warning about privacy system 'none' on replies to signed or encrypted msgs
authorPaul <paul@claws-mail.org>
Fri, 26 Oct 2018 12:38:19 +0000 (13:38 +0100)
committerPaul <paul@claws-mail.org>
Fri, 26 Oct 2018 12:38:19 +0000 (13:38 +0100)
src/compose.c

index e6d94973a65e3dcd91bcf60618930c83773a708d..487ec1c984c98b3b9e90611240eedfd1d7d08108 100644 (file)
@@ -1692,7 +1692,8 @@ static Compose *compose_generic_reply(MsgInfo *msginfo,
        g_free(s_system);
 
        if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
        g_free(s_system);
 
        if (privacy_system_can_sign(compose->privacy_system) == FALSE &&
-           (account->default_encrypt_reply || account->default_sign_reply))
+           ((account->default_encrypt_reply && MSG_IS_ENCRYPTED(compose->replyinfo->flags)) ||
+            (account->default_sign_reply && MSG_IS_SIGNED(compose->replyinfo->flags))))
                alertpanel_error(_("You have opted to sign and/or encrypt this "
                                   "message but have not selected a privacy system.\n\n"
                                   "Signing and encrypting have been disabled for this "
                alertpanel_error(_("You have opted to sign and/or encrypt this "
                                   "message but have not selected a privacy system.\n\n"
                                   "Signing and encrypting have been disabled for this "