diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index dfc21373806..bf229a4acbc 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2012-01-10  Glenn Morris  <rgm@gnu.org>
+
+	* mail/unrmail.el (unrmail): Tweak previous change.
+
 2012-01-09  Chong Yidong  <cyd@gnu.org>
 
 	* custom.el (custom-safe-themes): Use SHA-256 for hashing.
diff --git a/lisp/mail/unrmail.el b/lisp/mail/unrmail.el
index 929f97746b0..af16bbf8c73 100644
--- a/lisp/mail/unrmail.el
+++ b/lisp/mail/unrmail.el
@@ -66,11 +66,11 @@ For example, invoke `emacs -batch -f batch-unrmail RMAIL'."
 	  from to)
       (goto-char (point-min))
       (search-forward "\n\^_" nil t)	; Skip BABYL header.
-      (if (= (setq from (point)) (point-max))
-	  (error "The input file contains no messages"))
+      (setq from (point))
       (goto-char (point-max))
       (search-backward "\n\^_" from 'mv)
-      (setq to (point))
+      (if (= from (setq to (point)))
+	  (error "The input file contains no messages"))
       (unless (and coding-system
 		   (coding-system-p coding-system))
 	(setq coding-system