X-Git-Url: http://git.madism.org/?p=apps%2Fmadmutt.git;a=blobdiff_plain;f=pgp.c;h=929f489133c79154c72d63dcf9e1a20a248f77e6;hp=46b0866ab5e59705681cd8833b629b4cf832875b;hb=254adb836d2349416af564eec8280dc83ef9fc1b;hpb=f404a0ca916be07049af51a3022baaaaab94def6

diff --git a/pgp.c b/pgp.c
index 46b0866..929f489 100644
--- a/pgp.c
+++ b/pgp.c
@@ -1490,6 +1490,11 @@ int pgp_send_menu (HEADER *msg, int *redraw)
   
   if (!(WithCrypto & APPLICATION_PGP))
     return msg->security;
+
+  /* If autoinline and no crypto options set, then set inline. */
+  if (option (OPTPGPAUTOINLINE) && 
+      !((msg->security & APPLICATION_PGP) && (msg->security & (SIGN|ENCRYPT))))
+    msg->security |= INLINE;
   
   snprintf (prompt, sizeof (prompt), 
 	    _("PGP (e)ncrypt, (s)ign, sign (a)s, (b)oth, %s, or (c)lear? "),