diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 19e51cc603a..4424a5fb389 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-10-12  Glenn Morris  <rgm@gnu.org>
+
+	* mail/rmailsum.el (rmail-header-summary):
+	Fix 2010-11-26 test for multiline Subject: field.  (Bug#12625)
+
 2012-10-12  Fabián Ezequiel Gallina  <fgallina@cuca>
 
 	* progmodes/python.el (python-mode-map): Replace
diff --git a/lisp/mail/rmailsum.el b/lisp/mail/rmailsum.el
index d3a464161cb..612ccbdfd9e 100644
--- a/lisp/mail/rmailsum.el
+++ b/lisp/mail/rmailsum.el
@@ -785,7 +785,7 @@ the message being processed."
 		 (setq pos (point))
 		 (forward-line 1)
 		 (setq str (buffer-substring pos (1- (point))))
-		 (while (looking-at "\\s ")
+		 (while (looking-at "[ \t]")
 		   (setq str (concat str " " 
 				     (buffer-substring (match-end 0)
 						       (line-end-position))))