Another crypt_reply fix.

diff --git a/send.c b/send.c
index 0f7ed7d60625e3cf33f1f9a269592146487f75f0..c4a545d2afe6f889f816f81dcaf688180a0392f8 100644 (file)
--- a/send.c
+++ b/send.c
@@ -1261,10 +1261,12 @@ ci_send_message (int flags,             /* send mode */
       {
 #ifdef HAVE_SMIME
         if (option (OPTSMIMEISDEFAULT))
-          msg->security ^= APPLICATION_SMIME;
+          msg->security &= ~APPLICATION_SMIME;
 #endif
         msg->security |= APPLICATION_PGP;
       }
+      if (~cur->security && !option (OPTSMIMEISDEFAULT))
+       msg->security |= APPLICATION_PGP;
 #endif /* HAVE_PGP */
     }
     else if (msg->security)
@@ -1275,7 +1277,7 @@ ci_send_message (int flags,               /* send mode */
       if (option (OPTSMIMEISDEFAULT))
       {
         msg->security |= APPLICATION_SMIME;
-        msg->security ^= APPLICATION_PGP;
+        msg->security &= ~APPLICATION_PGP;
       }
 #endif
 #endif /* HAVE_PGP */