(unforward-rmail-message): Skip all newlines

after the initial separator.
(unforward-rmail-message): Forwarded-From: and Forwarded-Date:
instead of Forwarded-from: and Forwarded-date:.

diff --git a/lisp/mail/undigest.el b/lisp/mail/undigest.el
index ff4673901b231a8290e54ccd169d2861c38360d4..1bfd1d1e8bfa4683d023f4f3347995f25843f5b0 100644 (file)
--- a/lisp/mail/undigest.el
+++ b/lisp/mail/undigest.el
@@ -234,6 +234,7 @@ following the containing message."
          (cond ((re-search-forward
                  "^----.*\\([Ff]orwarded\\|[Oo]riginal\\).*[Mm]essage" nil t)
                 (forward-line 1)
+                (skip-chars-forward "\n")
                 (setq beg (point))
                 (setq end (if (re-search-forward "^----.*[^- \t\n]" nil t)
                               (match-beginning 0) (point-max)))
@@ -269,8 +270,8 @@ following the containing message."
          (narrow-to-region (point) (point))
          (insert rmail-mail-separator)
          (narrow-to-region (point) (point))
-         (insert "Forwarded-from: " forwarded-from "\n")
-         (insert "Forwarded-date: " forwarded-date "\n")
+         (insert "Forwarded-From: " forwarded-from "\n")
+         (insert "Forwarded-Date: " forwarded-date "\n")
          (insert forward-msg)
          (save-restriction
            (goto-char (point-min))