* Sync up with the latest semi-1_13.

diff --git a/mime-edit.el b/mime-edit.el
index ab33a04..077a5c1 100644 (file)
--- 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 (file)
--- 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)