--- /workspace/emacs/lisp/mail/rmail.el	Wed Sep  3 22:11:40 2003
+++ /usr/local/share/emacs/21.3.50/lisp/mail/rmail.el	Sun Sep 28 23:27:45 2003
@@ -1703,13 +1703,20 @@
 		       (not rmail-enable-multibyte)
 		       (let ((mime-charset
 			      (if (and rmail-decode-mime-charset
-				       (save-excursion
-					 (goto-char start)
-					 (search-forward "\n\n" nil t)
-					 (let ((case-fold-search t))
-					   (re-search-backward
-					    rmail-mime-charset-pattern
-					    start t))))
+				       (or
+					(save-excursion
+					  (goto-char start)
+					  (search-forward "\n\n" nil t)
+					  (let ((case-fold-search t))
+					    (re-search-backward
+					     rmail-mime-charset-pattern
+					     start t)))
+					;; Try to search the whole message
+					(save-excursion
+					  (let ((case-fold-search t))
+					    (re-search-backward
+					     rmail-mime-charset-pattern
+					     start t)))))
 				  (intern (downcase (match-string 1))))))
 			 (rmail-decode-region start (point) mime-charset)))))
 	       ;; Add an X-Coding-System: header if we don't have one.
@@ -1843,13 +1850,20 @@
 		   (not rmail-enable-multibyte)
 		   (let ((mime-charset
 			  (if (and rmail-decode-mime-charset
-				   (save-excursion
-				     (goto-char start)
-				     (search-forward "\n\n" nil t)
-				     (let ((case-fold-search t))
-				       (re-search-backward
-					rmail-mime-charset-pattern
-					start t))))
+				   (or
+				    (save-excursion
+				      (goto-char start)
+				      (search-forward "\n\n" nil t)
+				      (let ((case-fold-search t))
+					(re-search-backward
+					 rmail-mime-charset-pattern
+					 start t)))
+				    ;; Try to search the whole message
+				    (save-excursion
+				      (let ((case-fold-search t))
+					(re-search-backward
+					 rmail-mime-charset-pattern
+					 start t)))))
 			      (intern (downcase (match-string 1))))))
 		     (rmail-decode-region start (point) mime-charset)))
 	       (save-excursion