*** sendmail-8.9.3/src/mime.c.ORIG	Tue Jan 19 01:35:11 1999
--- sendmail-8.9.3/src/mime.c	Sat Mar 13 01:39:15 1999
***************
*** 443,449 ****
  	{
  		/* no encoding necessary */
  		if (cte != NULL &&
! 		    bitset(MCIF_INMIME, mci->mci_flags) &&
  		    !bitset(M87F_NO8TO7, flags))
  		{
  			/*
--- 443,450 ----
  	{
  		/* no encoding necessary */
  		if (cte != NULL &&
! 		    bitset(MCIF_CVT8TO7|MCIF_CVT7TO8|MCIF_INMIME,
! 			   mci->mci_flags) &&
  		    !bitset(M87F_NO8TO7, flags))
  		{
  			/*



*** sendmail-8.9.3/src/headers.c.ORIG	Tue Jan 26 15:54:50 1999
--- sendmail-8.9.3/src/headers.c	Tue Mar 16 20:43:31 1999
***************
*** 1369,1375 ****
  
  	/*
  	**  If we are converting this to a MIME message, add the
! 	**  MIME headers.
  	*/
  
  #if MIME8TO7
--- 1369,1375 ----
  
  	/*
  	**  If we are converting this to a MIME message, add the
! 	**  MIME headers (but not in MIME mode!).
  	*/
  
  #if MIME8TO7
***************
*** 1377,1386 ****
  	    bitset(EF_HAS8BIT, e->e_flags) &&
  	    !bitset(EF_DONT_MIME, e->e_flags) &&
  	    !bitnset(M_8BITS, mci->mci_mailer->m_flags) &&
! 	    !bitset(MCIF_CVT8TO7|MCIF_CVT7TO8, mci->mci_flags))
  	{
! 		if (hvalue("MIME-Version", e->e_header) == NULL)
! 			putline("MIME-Version: 1.0", mci);
  		if (hvalue("Content-Type", e->e_header) == NULL)
  		{
  			snprintf(obuf, sizeof obuf,
--- 1377,1386 ----
  	    bitset(EF_HAS8BIT, e->e_flags) &&
  	    !bitset(EF_DONT_MIME, e->e_flags) &&
  	    !bitnset(M_8BITS, mci->mci_mailer->m_flags) &&
! 	    !bitset(MCIF_CVT8TO7|MCIF_CVT7TO8|MCIF_INMIME, mci->mci_flags) &&
! 	    hvalue("MIME-Version", e->e_header) == NULL)
  	{
! 		putline("MIME-Version: 1.0", mci);
  		if (hvalue("Content-Type", e->e_header) == NULL)
  		{
  			snprintf(obuf, sizeof obuf,