--- message.el~	Wed Feb  5 00:07:25 2003
+++ message.el	Tue Feb 25 00:01:30 2003
@@ -4473,10 +4473,15 @@
 
 (defun message-user-mail-address ()
   "Return the pertinent part of `user-mail-address'."
-  (when user-mail-address
-    (if (string-match " " user-mail-address)
-	(nth 1 (mail-extract-address-components user-mail-address))
-      user-mail-address)))
+  (let ((from (message-fetch-field "From")))
+    (if from
+	(if (string-match " " from)
+	    (nth 1 (mail-extract-address-components from))
+	  from)
+      (when user-mail-address
+	(if (string-match " " user-mail-address)
+	    (nth 1 (mail-extract-address-components user-mail-address))
+	  user-mail-address)))))
 
 (defun message-make-fqdn ()
   "Return user's fully qualified domain name."