diff -urN /tmp/pinepgp/usr/lib/pinepgp/.encrypt /usr/lib/pinepgp/.encrypt
--- /tmp/pinepgp/usr/lib/pinepgp/.encrypt	Thu Oct  2 22:51:13 1997
+++ /usr/lib/pinepgp/.encrypt	Tue Mar 10 00:28:05 1998
@@ -45,8 +45,8 @@
 done
 
 if [ ! -z "$TOS" ]; then
-  pgp="pgp +LANGUAGE=en -sea $MSG -o $PGPPATH/tmp.msg $TOS"
-  pgp5="pgpe -sa -r $TOS -o $PGPPATH/tmp.msg $MSG"
+  pgp="pgp +LANGUAGE=en -ea $MSG -o $PGPPATH/tmp.msg $TOS"
+  pgp5="pgpe -a -r $TOS -o $PGPPATH/tmp.msg $MSG"
 else
   exit -1
 fi
diff -urN /tmp/pinepgp/usr/lib/pinepgp/.sign_encrypt /usr/lib/pinepgp/.sign_encrypt
--- /tmp/pinepgp/usr/lib/pinepgp/.sign_encrypt	Thu Jan  1 01:00:00 1970
+++ /usr/lib/pinepgp/.sign_encrypt	Thu Oct  2 22:51:13 1997
@@ -0,0 +1,52 @@
+if [ "$USEPGP5" = "TRUE" ]; then
+  cmd="pgpk -l"
+else
+  cmd="pgp +LANGUAGE=en -kv"
+fi
+
+. /usr/lib/pinepgp/.get_key
+
+function check_key() {
+  $cmd $TO 2> /dev/null > $PGPPATH/tmp.res
+  RES=`grep "1 matching key found" $PGPPATH/tmp.res`
+  if [ -z "$RES" ]; then
+    echo
+    if [ ! -z "`grep "0 matching keys found" $PGPPATH/tmp.res`" ]; then
+      echo "Unable to find public key for $TO"
+    else
+      cat $PGPPATH/tmp.res
+    fi
+    echo
+    echo "Type 'finger' to finger for public key."
+    echo -n "[default = abort] Try a different PGP user-id: "; read answer
+    echo
+    if [ "$answer" = "finger" ]; then
+      get_key
+      check_key
+    elif [ ! -z "$answer" ]; then
+      TO=$answer
+      check_key
+    else
+      TO=$answer
+    fi
+  fi
+  rm -f $PGPPATH/tmp.res
+}
+
+TOS=""
+shift
+for i in $*; do
+  TO="$i"
+  check_key
+  if [ -z "$TO" ]; then
+    exit -1
+  fi
+  TOS="$TOS $TO"
+done
+
+if [ ! -z "$TOS" ]; then
+  pgp="pgp +LANGUAGE=en -sea $MSG -o $PGPPATH/tmp.msg $TOS"
+  pgp5="pgpe -sa -r $TOS -o $PGPPATH/tmp.msg $MSG"
+else
+  exit -1
+fi
diff -urN /tmp/pinepgp/usr/lib/pinepgp/pgp /usr/lib/pinepgp/pgp
--- /tmp/pinepgp/usr/lib/pinepgp/pgp	Thu Oct  2 22:51:13 1997
+++ /usr/lib/pinepgp/pgp	Tue Mar 10 00:19:38 1998
@@ -44,7 +44,7 @@
     fi
   fi
 else
-  DO="encrypt"
+  DO="sign_encrypt"
 fi
 
 # required for fingering
@@ -55,6 +55,7 @@
   echo "PINE/PGP send message"
   echo "---------------------"
   echo "s - sign"
+  echo "r - encrypt"
   echo "e - sign & encrypt"
   echo "n - do nothing"
   echo "f - finger address"
@@ -72,7 +73,8 @@
 menu
 if [ ! -z `echo $answer | grep -i "c"` ]; then exit -1
 elif [ ! -z `echo $answer | grep -i "n"` ]; then DO="nothing"
-elif [ ! -z `echo $answer | grep -i "e"` ]; then DO="encrypt"
+elif [ ! -z `echo $answer | grep -i "r"` ]; then DO="encrypt"
+elif [ ! -z `echo $answer | grep -i "e"` ]; then DO="sign_encrypt"
 elif [ ! -z `echo $answer | grep -i "s"` ]; then DO="sign"
 elif [ ! -z "$answer" ]; then exit -1; fi
 . /usr/lib/pinepgp/.$DO

