*** empty log message ***

[bpt/emacs.git] / lisp / mh-e / mh-mime.el

diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index 659ab47..5713ec8 100644 (file)
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1,7 +1,7 @@
 ;;; mh-mime.el --- MH-E MIME support
 
 ;; Copyright (C) 1993, 1995,
-;;  2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+;;  2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 
 ;; Author: Bill Wohler <wohler@newt.com>
 ;; Maintainer: Bill Wohler <wohler@newt.com>
@@ -60,6 +60,7 @@
 (autoload 'mail-decode-encoded-word-string "mail-parse")
 (autoload 'mail-header-parse-content-type "mail-parse")
 (autoload 'mail-header-strip "mail-parse")
+(autoload 'mail-strip-quoted-names "mail-utils")
 (autoload 'message-options-get "message")
 (autoload 'message-options-set "message")
 (autoload 'message-options-set-recipient "message")
@@ -1620,13 +1621,14 @@ This action can be undone by running \\[undo]."
   (require 'message)
   (when mh-pgp-support-flag
     ;; PGP requires actual e-mail addresses, not aliases.
-    ;; Parse the recipients and sender from the message
+    ;; Parse the recipients and sender from the message.
     (message-options-set-recipient)
-    ;; Do an alias lookup on sender
-    (message-options-set 'message-sender
-                     (mail-strip-quoted-names
-                      (mh-alias-expand
-                       (message-options-get 'message-sender))))
+    ;; Do an alias lookup on sender (if From field is present).
+    (when (message-options-get 'message-sender)
+      (message-options-set 'message-sender
+                           (mail-strip-quoted-names
+                            (mh-alias-expand
+                             (message-options-get 'message-sender)))))
     ;; Do an alias lookup on recipients
     (message-options-set 'message-recipients
                          (mapconcat