*** pine/send.c.orig	Wed Jul  1 21:32:53 1998
--- pine/send.c	Fri Jul 10 00:51:41 1998
***************
*** 6616,6628 ****
  		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 */
  	}
      }
  
--- 6616,6632 ----
  		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 */
  	}
      }
  
***************
*** 7439,7445 ****
  
  	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 */
--- 7443,7450 ----
  
  	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 */
***************
*** 7506,7512 ****
        sprintf (*dst += strlen (*dst),"Content-Transfer-Encoding: %s\015\012",
  	       body_encodings[(body->encoding == ENCBINARY)
  				? ENCBASE64
! 				: (body->encoding == ENC8BIT)
  				    ? ENCQUOTEDPRINTABLE
  				    : (body->encoding <= ENCMAX)
  					? body->encoding : ENCOTHER]);
--- 7511,7517 ----
        sprintf (*dst += strlen (*dst),"Content-Transfer-Encoding: %s\015\012",
  	       body_encodings[(body->encoding == ENCBINARY)
  				? ENCBASE64
! 				: (body->encoding == ENC8BIT && F_OFF(F_ENABLE_8BIT, ps_global))
  				    ? ENCQUOTEDPRINTABLE
  				    : (body->encoding <= ENCMAX)
  					? body->encoding : ENCOTHER]);