From 1fef5ee2e6f68d025048cd43a0ae26bd8e85c28e Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 26 Oct 2018 13:38:19 +0100 Subject: [PATCH] only show warning about privacy system 'none' on replies to signed or encrypted msgs --- src/compose.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/compose.c b/src/compose.c index e6d94973a..487ec1c98 100644 --- a/src/compose.c +++ b/src/compose.c @@ -1692,7 +1692,8 @@ static Compose *compose_generic_reply(MsgInfo *msginfo, 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 " -- 2.25.1