--- mutt-1.4/contrib/gpg.rc.orig	2001-12-11 12:33:57 +0300
+++ mutt-1.4/contrib/gpg.rc	2003-03-22 16:39:21 +0300
@@ -2,9 +2,6 @@
 #
 # Command formats for gpg.
 # 
-# This version uses gpg-2comp from 
-#   http://muppet.faveve.uni-stuttgart.de/~gero/gpg-2comp.tar.gz
-#
 # $Id$
 #
 # %p    The empty string when no passphrase is needed,
@@ -31,52 +28,55 @@
 # breaking PGP/MIME.
 
 # decode application/pgp
-set pgp_decode_command="/usr/bin/gpg   %?p?--passphrase-fd 0? --no-verbose --quiet  --batch  --output - %f"
+set	pgp_decode_command="/usr/bin/gpg --no-verbose --quiet --batch --no-tty --output - %?p?--passphrase-fd 0? %f"
 
 # verify a pgp/mime signature
-set pgp_verify_command="/usr/bin/gpg   --no-verbose --quiet  --batch  --output - --verify %s %f"
+set	pgp_verify_command="/usr/bin/gpg --no-verbose --quiet --batch --no-tty --output - --verify %s %f"
 
 # decrypt a pgp/mime attachment
-set pgp_decrypt_command="/usr/bin/gpg   --passphrase-fd 0 --no-verbose --quiet  --batch  --output - %f"
+set	pgp_decrypt_command="/usr/bin/gpg --no-verbose --quiet --batch --no-tty --output - --passphrase-fd 0 %f"
 
 # create a pgp/mime signed attachment
-# set pgp_sign_command="/usr/bin/gpg-2comp --comment '' --no-verbose --batch  --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
-set pgp_sign_command="/usr/bin/gpg    --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --detach-sign --textmode %?a?-u %a? %f"
+set	pgp_sign_command="/usr/bin/gpg --no-verbose --quiet --batch --no-tty --output - --passphrase-fd 0 --armor --textmode --detach-sign %?a?-u %a? %f"
 
 # create a application/pgp signed (old-style) message
-# set pgp_clearsign_command="/usr/bin/gpg-2comp --comment ''  --no-verbose --batch  --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
-set pgp_clearsign_command="/usr/bin/gpg   --no-verbose --batch --quiet   --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
+set	pgp_clearsign_command="/usr/bin/gpg --no-verbose --quiet --batch --no-tty --output - --passphrase-fd 0 --armor --textmode --clearsign %?a?-u %a? %f"
 
 # create a pgp/mime encrypted attachment
-# set pgp_encrypt_only_command="pgpewrap gpg-2comp  -v --batch  --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
-set pgp_encrypt_only_command="pgpewrap /usr/bin/gpg    --batch  --quiet  --no-verbose --output - --encrypt --textmode --armor --always-trust -- -r %r -- %f"
+set	pgp_encrypt_only_command="pgpewrap /usr/bin/gpg --no-verbose --quiet --batch --no-tty --output - --armor --textmode --encrypt --always-trust -- -r %r -- %f"
 
 # create a pgp/mime encrypted and signed attachment
-# set pgp_encrypt_sign_command="pgpewrap gpg-2comp  --passphrase-fd 0 -v --batch  --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
-set pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg  --passphrase-fd 0  --batch --quiet  --no-verbose  --textmode --output - --encrypt --sign %?a?-u %a? --armor --always-trust -- -r %r -- %f"
+set	pgp_encrypt_sign_command="pgpewrap /usr/bin/gpg --no-verbose --quiet --batch --no-tty --output - --passphrase-fd 0 --armor --textmode --encrypt --sign %?a?-u %a? --always-trust -- -r %r -- %f"
 
 # import a key into the public key ring
-set pgp_import_command="/usr/bin/gpg  --no-verbose --import -v %f"
+set	pgp_import_command="/usr/bin/gpg --verbose --import %f"
 
 # export a key from the public key ring
-set pgp_export_command="/usr/bin/gpg   --no-verbose --export --armor %r"
+set	pgp_export_command="/usr/bin/gpg --no-verbose --export --armor %r"
 
 # verify a key
-set pgp_verify_key_command="/usr/bin/gpg   --verbose --batch  --fingerprint --check-sigs %r"
+set	pgp_verify_key_command="/usr/bin/gpg --verbose --batch --no-tty --fingerprint --check-sigs %r"
 
 # read in the public key ring
-set pgp_list_pubring_command="/usr/bin/gpg   --no-verbose --batch --quiet   --with-colons --list-keys %r" 
+set	pgp_list_pubring_command="/usr/bin/gpg --no-verbose --quiet --batch --no-tty --with-colons --list-keys %r" 
 
 # read in the secret key ring
-set pgp_list_secring_command="/usr/bin/gpg   --no-verbose --batch --quiet   --with-colons --list-secret-keys %r" 
+set	pgp_list_secring_command="/usr/bin/gpg --no-verbose --quiet --batch --no-tty --with-colons --list-secret-keys %r" 
 
 # fetch keys
-# set pgp_getkeys_command="pkspxycwrap %r"
+# set	pgp_getkeys_command="pkspxycwrap %r"
 
 # pattern for good signature - may need to be adapted to locale!
 
-# set pgp_good_sign="^gpg: Good signature from"
+# set	pgp_good_sign="^gpg: Good signature from"
 
 # OK, here's a version which uses gnupg's message catalog:
-set pgp_good_sign="`gettext -d gnupg -s 'Good signature from "' | tr -d '"'`"
+# set	pgp_good_sign="`gettext -d gnupg -s 'Good signature from "' | tr -d '"'`"
+
+# If set, automatically pgp encrypt replies to messages which are encrypted.
+set	pgp_replyencrypt
 
+# If set, automatically pgp sign replies to messages which are encrypted.
+# This makes sense in combination with "$pgp_replyencrypt", because it
+# allows you to sign all messages which are automatically encrypted.
+set	pgp_replysignencrypted