(rmail-convert-to-babyl-format): Check content-transfer-encoding _last_,

because it's its position that we need as value of base64-header-field-end.

1 files changed, 7 insertions, 6 deletions

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index bfdd5048877..13aba1a3fb0 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1959,12 +1959,13 @@ is non-nil if the user has supplied the password interactively.
 			(base64-header-field-end
 			 (save-excursion
 			   (goto-char start)
+			   ;; Don't try to decode non-text data.
 			   (and (re-search-forward
-				 "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
+				 "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
 				 header-end t)
-				;; Don't try to decode non-text data.
+				(goto-char start)
 				(re-search-forward
-				 "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
+				 "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
 				 header-end t)))))
 		   (if quoted-printable-header-field-end
 		       (save-excursion
@@ -2066,14 +2067,14 @@ is non-nil if the user has supplied the password interactively.
 			  header-end t)))
 		      (base64-header-field-end
 		       (and
+			;; Don't decode non-text data.
 			(save-excursion
 			  (re-search-forward
-			   "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
+			   "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
 			   header-end t))
-			;; Don't decode non-text data.
 			(save-excursion
 			  (re-search-forward
-			   "^content-type:\\(\n?[\t ]\\)\\(text\\|message\\)/"
+			   "^content-transfer-encoding:\\(\n?[\t ]\\)*base64\\(\n?[\t ]\\)*"
 			   header-end t))))
 		      (size
 		       ;; Get the numeric value from the Content-Length field.