diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb93cffb3fc..64b6da0ba24 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2001-11-16  Richard M. Stallman  <rms@gnu.org>
+
+	* mail/mail-extr.el (mail-extr-voodoo): Treat a number as a word
+	if it doesn't make sense as anything else.
+	Don't recognize a "telephone number" at the beginning of the name.
+	(mail-extr-leading-garbage): Match non-word characters only.
+
 2001-11-16  Pavel Jan,Bm(Bk  <Pavel@Janik.cz>
 
 	* emulation/viper.el: Fix typo.
diff --git a/lisp/mail/mail-extr.el b/lisp/mail/mail-extr.el
index 0fd3414df04..d6a1f9ffe1c 100644
--- a/lisp/mail/mail-extr.el
+++ b/lisp/mail/mail-extr.el
@@ -316,8 +316,7 @@ by translating things like \"foo!bar!baz@host\" into \"baz@bar.UUCP\"."
 ;; Keep this set as minimal as possible.
 (defconst mail-extr-last-letters (purecopy "[:alpha:]`'."))
 
-(defconst mail-extr-leading-garbage
-  (purecopy (format "[^%s]+" mail-extr-first-letters)))
+(defconst mail-extr-leading-garbage "\\W+")
 
 ;; (defconst mail-extr-non-name-chars 
 ;;   (purecopy (concat "^" mail-extr-all-letters ".")))
@@ -1687,7 +1686,8 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
 	   (looking-at mail-extr-trailing-comment-start-pattern)
 	   
 	   ;; Stop before telephone numbers
-	   (looking-at mail-extr-telephone-extension-pattern))
+	   (and (>= word-count 1)
+		(looking-at mail-extr-telephone-extension-pattern)))
 	  (setq name-done-flag t))
 	 
 	 ;; Delete ham radio call signs
@@ -1765,6 +1765,13 @@ ADDRESS may be a string or a buffer.  If it is a buffer, the visible
 	  (goto-char name-end)
 	  (setq word-found-flag t))
 
+	 ;; Allow a number as a word, if it doesn't mean anything else.
+	 ((looking-at "[0-9]+\\>")
+	  (setq name-beg (point))
+	  (setq name-end (match-end 0))
+	  (goto-char name-end)
+	  (setq word-found-flag t))
+
 	 (t
 	  (setq name-done-flag t)
 	  ))