2 files changed, 12 insertions, 6 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 0eba20a9899..96c612da42a 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,8 @@
+2008-01-30  Bill Wohler  <wohler@newt.com>
+
+        * mh-mime.el (mh-mml-to-mime): Don't look up sender if From
+        absent. Fixes "Wrong type argument: stringp, nil" error.
+
 2007-12-02  Glenn Morris  <rgm@gnu.org>
 
         * mh-mime.el (mail-strip-quoted-names): Autoload it.
diff --git a/lisp/mh-e/mh-mime.el b/lisp/mh-e/mh-mime.el
index ec0940a5d5e..5713ec8dba4 100644
--- a/lisp/mh-e/mh-mime.el
+++ b/lisp/mh-e/mh-mime.el
@@ -1621,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