(rmail-reply): If no resent-date, use ordinary date.

If no resent-to, use empty string for to.

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index b496102a57a706ef0e24a91a733a6d4a9950da44..7d6e0490d972bca49063f506ffa03a11895cf3d6 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -1740,11 +1740,11 @@ use \\[mail-yank-original] to yank the original message into it."
              subject (or (and resent-reply-to
                               (mail-fetch-field "resent-subject" t))
                          (mail-fetch-field "subject"))
-             date (cond (resent-reply-to
-                         (mail-fetch-field "resent-date" t))
-                        ((mail-fetch-field "date")))
+             date (or (and resent-reply-to
+                           (mail-fetch-field "resent-date" t))
+                      (mail-fetch-field "date"))
              to (cond (resent-reply-to
-                       (mail-fetch-field "resent-to" t))
+                       (or (mail-fetch-field "resent-to" t)) "")
                       ((mail-fetch-field "to" nil t))
                       ;((mail-fetch-field "apparently-to")) ack gag barf
                       (t ""))