*** pine/send.c.Dist	Mon Aug 27 10:54:33 2001
--- pine/send.c	Fri Sep 28 00:19:47 2001
***************
*** 7689,7701 ****
  		body->subtype = cpystr("octet-stream");
  	    }
  
! 	    /*
! 	     * Apply maximal encoding regardless of previous
! 	     * setting.  This segment's either not text, or is 
! 	     * unlikely to be readable with > 30% of the
! 	     * text encoded anyway, so we might as well save space...
! 	     */
! 	    new_encoding = ENCBINARY;   /*  > 30% 8 bit chars */
  	}
      }
  
--- 7689,7705 ----
  		body->subtype = cpystr("octet-stream");
  	    }
  
! 	    if(body->type == TYPETEXT)
!               /* Use ENC8BIT rather than ENCBINARY for TEXT */
! 	      new_encoding = ENC8BIT;
! 	    else
! 	      /*
! 	       * Apply maximal encoding regardless of previous
! 	       * setting.  This segment's either not text, or is 
! 	       * unlikely to be readable with > 30% of the
! 	       * text encoded anyway, so we might as well save space...
! 	       */
! 	      new_encoding = ENCBINARY;   /*  > 30% 8 bit chars */
  	}
      }
  
***************
*** 8659,8665 ****
  
  	switch (body->encoding) {	/* all else needs filtering */
  	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
! 	    gf_link_filter(gf_8bit_qp, NULL);
  	    break;
  
  	  case ENCBINARY:		/* encode binary into BASE64 */
--- 8663,8670 ----
  
  	switch (body->encoding) {	/* all else needs filtering */
  	  case ENC8BIT:			/* encode 8BIT into QUOTED-PRINTABLE */
! 	    if(F_OFF(F_ENABLE_8BIT, ps_global)) /* unless 8BIT enabled */
! 		gf_link_filter(gf_8bit_qp, NULL);
  	    break;
  
  	  case ENCBINARY:		/* encode binary into BASE64 */
***************
*** 8761,8767 ****
  	     && !(so_puts(so, "Content-Transfer-Encoding: ")
  		  && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
  						? ENCBASE64
! 						: (body->encoding == ENC8BIT)
  						  ? ENCQUOTEDPRINTABLE
  						  : (body->encoding <= ENCMAX)
  						    ? body->encoding
--- 8766,8772 ----
  	     && !(so_puts(so, "Content-Transfer-Encoding: ")
  		  && so_puts(so, body_encodings[(body->encoding==ENCBINARY)
  						? ENCBASE64
! 						: (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global))
  						  ? ENCQUOTEDPRINTABLE
  						  : (body->encoding <= ENCMAX)
  						    ? body->encoding