1 files changed, 11 insertions, 0 deletions
diff --git a/g10/g10.c b/g10/g10.c
index 3cc6b54aa..e7121b701 100644
--- a/g10/g10.c
+++ b/g10/g10.c
@@ -1806,9 +1806,20 @@ main( int argc, char **argv )
 		  }
 		else if(cmd==aSym)
 		  {
+		    /* This only sets IDEA for symmetric encryption
+		       since it is set via select_algo_from_prefs for
+		       pk encryption. */
 		    m_free(def_cipher_string);
 		    def_cipher_string = m_strdup("idea");
 		  }
+
+		/* PGP2 can't handle the output from the textmode
+		   filter, so we disable it for anything that could
+		   create a literal packet (only encryption and
+		   symmetric encryption, since we disable signing
+		   above). */
+		if(!unusable)
+		  opt.textmode=0;
 	      }
 
 	    if(unusable)