diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 407c34cbfcc..d69bd444b3a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-31  Eli Zaretskii  <eliz@gnu.org>
+
+	* mail/rmail.el (rmail-redecode-body): Use eight-bit instead of
+	obsolete eight-bit-control and eight-bit-graphic.
+
 2009-01-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* emacs-lisp/elp.el (elp-results-symname-map): Add follow-link.
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 8ea6cd2dbba..b2bd29c1991 100644
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -2722,14 +2722,13 @@ iso-8859, koi8-r, etc."
 		 (not (coding-system-equal
 		       (coding-system-base old-coding)
 		       (coding-system-base coding)))
-		 ;; If the body includes only eight-bit-*
-		 ;; characters, encoding might fail, e.g. with
-		 ;; UTF-8, and isn't needed anyway.
+		 ;; If the body includes only eight-bit characters,
+		 ;; encoding might fail, e.g. with UTF-8, and isn't
+		 ;; needed anyway.
 		 (> (length (delq 'ascii
-				  (delq 'eight-bit-graphic
-					(delq 'eight-bit-control
-					      (find-charset-region
-					       (point-min) (point-max))))))
+				  (delq 'eight-bit
+					(find-charset-region
+					 (point-min) (point-max)))))
 		    0)
 		 (encode-coding-region (point-min) (point-max) old-coding))
 	    (decode-coding-region (point-min) (point-max) coding)