X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fnnfolder.el;h=db9666b5fc761cf44a9b75b583f036fcd6280c46;hb=dac9f07550d29e8325dfb4d122848173dd660635;hp=5f399d80eec9f5bf4b618da3426fcb45234aa165;hpb=f7f8a94ffef429d5c674abe60fc038f54e126650;p=elisp%2Fgnus.git-

diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el
index 5f399d8..db9666b 100644
--- a/lisp/nnfolder.el
+++ b/lisp/nnfolder.el
@@ -397,10 +397,15 @@ time saver for large mailboxes.")
   (save-excursion
     (set-buffer buffer)
     (goto-char (point-min))
-    (if (looking-at "X-From-Line: ")
-	(replace-match "From ")
-      (unless (looking-at message-unix-mail-delimiter)
-	(insert "From nobody " (current-time-string) "\n")))
+    (let (xfrom)
+      (while (re-search-forward "^X-From-Line: \\(.*\\)$" nil t)
+	(setq xfrom (match-string 1))
+	(gnus-delete-line))
+      (goto-char (point-min))
+      (if xfrom
+	  (insert "From " xfrom "\n")
+	(unless (looking-at message-unix-mail-delimiter)
+	  (insert "From nobody " (current-time-string) "\n"))))
     (nnfolder-normalize-buffer)
     (set-buffer nnfolder-current-buffer)
     (goto-char (point-min))