summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--alpine/mailcmd.c10
-rw-r--r--pith/pine.hlp5
2 files changed, 14 insertions, 1 deletions
diff --git a/alpine/mailcmd.c b/alpine/mailcmd.c
index f066c898..e134e8dc 100644
--- a/alpine/mailcmd.c
+++ b/alpine/mailcmd.c
@@ -2419,6 +2419,16 @@ cmd_bounce(struct pine *state, MSGNO_S *msgmap, int aopt)
}
}
+#ifdef SMIME
+ /* When we bounce a message, we will leave the original message
+ * intact, which means that it will not be signed or encrypted,
+ * so we turn off signing and encrypting now. It will be turned
+ * on again in send_exit_for_pico().
+ */
+ if(ps_global->smime)
+ ps_global->smime->do_sign = ps_global->smime->do_encrypt = 0;
+#endif /* SMIME */
+
rv = bounce(state, role);
if(role)
diff --git a/pith/pine.hlp b/pith/pine.hlp
index 79de8e6b..fb087142 100644
--- a/pith/pine.hlp
+++ b/pith/pine.hlp
@@ -140,7 +140,7 @@ with help text for the config screen and the composer that didn't have any
reasonable place to be called from.
Dummy change to get revision in pine.hlp
============= h_revision =================
-Alpine Commit 105 2015-09-20 19:20:48
+Alpine Commit 106 2015-09-22 19:46:50
============= h_news =================
<HTML>
<HEAD>
@@ -280,6 +280,9 @@ Additions include:
scroll through the history of directories used to save attachments,
while preserving the given name of the file. Suggested by Peter
Koellner.
+
+ <LI> SMIME: Turn off automatic signing and encrypting of a message when
+ bouncing. Suggested after a discussion with Matthias Rieber.
</UL>