merge stable

1 files changed, 3 insertions, 0 deletions

diff --git a/pgp.c b/pgp.c
index a531c1f2..653905f0 100644
--- a/pgp.c
+++ b/pgp.c
@@ -114,7 +114,10 @@ int pgp_use_gpg_agent (void)
     return 0;
 
   if ((tty = ttyname(0)))
+  {
     setenv("GPG_TTY", tty, 0);
+    mutt_envlist_set ("GPG_TTY", tty, 0);
+  }
 
   return 1;
 }