;;; @ version
 ;;;
 
-(defconst emh-version "1.4.0")
+(defconst emh-version "1.5.0")
 
 
 ;;; @ variable
 
 (set-alist 'mime-raw-representation-type-alist 'mh-show-mode 'binary)
 
-(defvar emh-content-header-filter-hook
-  (if window-system
-      '(emh-highlight-header)
-    )
+
+(defvar emh-display-header-hook (if window-system
+                                   '(emh-highlight-header)
+                                 )
   "Hook for header filtering.")
 
 (autoload 'emh-highlight-header "emh-face")
 
-(defun emh-content-header-filter ()
-  "Header filter for mime-view.
-It is registered to variable `mime-view-content-header-filter-alist'."
-  (goto-char (point-min))
-  (mime-view-cut-header)
-  (eword-decode-header default-mime-charset)
-  (run-hooks 'emh-content-header-filter-hook)
+(defun emh-header-presentation-method (entity situation)
+  (mime-insert-decoded-header
+   entity
+   mime-view-ignored-field-list mime-view-visible-field-list
+   default-mime-charset)
+  (run-hooks 'emh-display-header-hook)
   )
 
-(set-alist 'mime-view-content-header-filter-alist
-          'mh-show-mode
-          (function emh-content-header-filter))
+(set-alist 'mime-header-presentation-method-alist
+          'mh-show-mode #'emh-header-presentation-method)
+
 
 (defun emh-quitting-method ()
   (let ((buf (current-buffer)))
 
 (set-alist 'mime-preview-quitting-method-alist
           'mh-show-mode #'emh-quitting-method)
-(set-alist 'mime-view-show-summary-method
-          'mh-show-mode
-          (function emh-quitting-method))
+
 
 (defun emh-following-method (buf)
   (save-excursion
       (goto-char last)
       )))
 
-(set-alist 'mime-view-following-method-alist
-          'mh-show-mode
-          (function emh-following-method))
+(set-alist 'mime-preview-following-method-alist
+          'mh-show-mode #'emh-following-method)
 
 
 ;;; @@ for mime-partial
 ;;;
 
-(autoload 'mime-method-to-combine-message/partial-pieces
+(autoload 'mime-combine-message/partial-pieces-automatically
   "mime-partial"
   "Internal method to combine message/partial messages automatically.")
 
 (mime-add-condition
  'action
  '((type . message)(subtype . partial)
-   (method . mime-method-to-combine-message/partial-pieces)
+   (method . mime-combine-message/partial-pieces-automatically)
    (major-mode . mh-show-mode)
    (summary-buffer-exp
     . (and (or (string-match "^article-\\(.+\\)$"