*** src/mailcrypt-3.5.4/mc-pgp.el	Tue Jul 20 10:20:56 1999
--- share/elisp/mc-pgp.el	Thu Sep 23 15:28:38 1999
***************
*** 255,267 ****
       passwd
       (if key
  	 (mc-activate-passwd (cdr key)
! 			     (and id
! 				  (format "PGP passphrase for %s (%s): "
! 					  (car key) (cdr key))))
         (mc-activate-passwd id "PGP passphrase for conventional decryption: ")))
      (if passwd
  	(setenv "PGPPASSFD" "0"))
!     (setq args '("+verbose=1" "+batchmode" "+language=en" "-f"))
      (if mc-pgp-alternate-keyring
  	(setq args (append args (list (format "+pubring=%s"
  					      mc-pgp-alternate-keyring)))))
--- 253,264 ----
       passwd
       (if key
  	 (mc-activate-passwd (cdr key)
! 			     (format "PGP passphrase for %s (%s): "
! 					  (car key) (cdr key)))
         (mc-activate-passwd id "PGP passphrase for conventional decryption: ")))
      (if passwd
  	(setenv "PGPPASSFD" "0"))
!     (setq args '("+verbose=1" "+language=en" "-f"))
      (if mc-pgp-alternate-keyring
  	(setq args (append args (list (format "+pubring=%s"
  					      mc-pgp-alternate-keyring)))))