diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 0b995552c85..093f5ee21ed 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,11 @@
+2005-10-16  Satyaki Das  <satyaki@theforce.stanford.edu>
+
+	* mh-init.el (mh-image-load-path): Remove use of pushnew since it
+	causes a compiler warning.
+
+	* mh-utils.el (mh-display-msg): Do MIME cleanup before inserting
+	the message to be viewed (closes SF #1306141).
+
 2005-10-16  Masatake YAMATO  <jet@gyve.org>
 
 	* mh-comp.el (mh-complete-word): Pass the common
diff --git a/lisp/mh-e/mh-init.el b/lisp/mh-e/mh-init.el
index a0408172ed7..4b84e525725 100644
--- a/lisp/mh-e/mh-init.el
+++ b/lisp/mh-e/mh-init.el
@@ -337,7 +337,8 @@ directory is added to the `load-path' if it isn't already there."
              (error "Can not find image directory %s"
                     mh-image-load-path))
             ((boundp 'image-load-path)
-             (pushnew mh-image-load-path image-load-path))
+             (unless (member mh-image-load-path image-load-path)
+               (push mh-image-load-path image-load-path)))
             ((not (member mh-image-load-path load-path))
              (push mh-image-load-path load-path))))
     (setq mh-image-load-path-called-flag t)))
diff --git a/lisp/mh-e/mh-utils.el b/lisp/mh-e/mh-utils.el
index b589b63b597..2dbd313b1d2 100644
--- a/lisp/mh-e/mh-utils.el
+++ b/lisp/mh-e/mh-utils.el
@@ -1718,6 +1718,8 @@ Sets the current buffer to the show buffer."
       (cond ((not (equal msg-filename buffer-file-name))
              (mh-unvisit-file)
              (setq buffer-read-only nil)
+             ;; Cleanup old mime handles
+             (mh-mime-cleanup)
              (erase-buffer)
              ;; Changing contents, so this hook needs to be reinitialized.
              ;; pgp.el uses this.
@@ -1729,8 +1731,6 @@ Sets the current buffer to the show buffer."
                                              (list "-form" formfile))
                                          msg-filename)
                (insert-file-contents-literally msg-filename))
-             ;; Cleanup old mime handles
-             (mh-mime-cleanup)
              ;; Use mm to display buffer
              (when (and mh-decode-mime-flag (not formfile))
                (mh-add-missing-mime-version-header)