# HG changeset patch
# User Karl Heuer <kwzh@gnu.org>
# Date 879888148 0
# Node ID faa32765fb8f886f07776bbc3bedfedff2f8277c
# Parent  f451d46a8c680ed04acbcbc2795e1c961ca9dc83
Improve previous change.

diff -r f451d46a8c68 -r faa32765fb8f lisp/mail/rmail.el
--- a/lisp/mail/rmail.el	Tue Nov 18 21:13:57 1997 +0000
+++ b/lisp/mail/rmail.el	Tue Nov 18 21:22:28 1997 +0000
@@ -1433,11 +1433,8 @@
 		      (case-fold-search t)
 		      (quoted-printable-header-field-end
 		       (save-excursion
-			 ;; Back up to end of previous line, in case the
-			 ;; Content-Transfer-Encoding field comes first.
-			 (forward-char -1)
 			 (re-search-forward
-			  "\ncontent-transfer-encoding\\(\n?[\t ]\\)*:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*"
+			  "^content-transfer-encoding:\\(\n?[\t ]\\)*quoted-printable\\(\n?[\t ]\\)*"
 			  header-end t)))
 		      (size
 		       ;; Get the numeric value from the Content-Length field.
@@ -1488,7 +1485,7 @@
 		       ;; Change "quoted-printable" to "8bit",
 		       ;; to reflect the decoding we just did.
 		       (goto-char quoted-printable-header-field-end)
-		       (zap-to-char -1 ?:)
+		       (delete-region (point) (search-backward ":"))
 		       (insert ": 8bit"))))
 
 	       (save-excursion