From 6b66483e6fc8357f31852f0a1b15c109b84be2b6 Mon Sep 17 00:00:00 2001
From: yamaoka <yamaoka>
Date: Mon, 5 Apr 1999 04:07:12 +0000
Subject: [PATCH] * Sync up with the latest semi-1_13.

---
 mime-edit.el |   12 +++++++++---
 mime-view.el |    7 ++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/mime-edit.el b/mime-edit.el
index ab33a04..077a5c1 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -2710,9 +2710,15 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 			      encoding nil)
 			)))))))
     (if (or encoded (not not-decode-text))
-	(decode-mime-charset-region (point-min)(point-max)
-				    (or charset default-mime-charset))
-      )
+ 	(progn
+ 	  (save-excursion
+ 	    (goto-char (point-min))
+ 	    (while (re-search-forward "\r\n" nil t)
+ 	      (replace-match "\n")
+ 	      ))
+ 	  (decode-mime-charset-region (point-min)(point-max)
+ 				      (or charset default-mime-charset))
+	  ))
     (let ((he (if (re-search-forward "^$" nil t)
 		  (match-end 0)
 		(point-min)
diff --git a/mime-view.el b/mime-view.el
index 14bca3c..baefb57 100644
--- a/mime-view.el
+++ b/mime-view.el
@@ -1185,9 +1185,10 @@ It calls following-method selected from variable
 			   (concat "^"
 				   (apply (function regexp-or) fields)
 				   ":") ""))))
-		     (if (and
-			  (eq (mime-entity-media-type ci) 'message)
-			  (eq (mime-entity-media-subtype ci) 'rfc822))
+		     (if (or (null entity-node-id)
+			     (and
+			      (eq (mime-entity-media-type ci) 'message)
+			      (eq (mime-entity-media-subtype ci) 'rfc822)))
 			 nil
 		       (if str
 			   (insert str)
-- 
1.7.10.4