X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=mime-edit.el;h=3b76e6dcb43b6aef362e2293d9e35241c27ae95f;hb=1bed64e1e4785a3dee9bae905e9dd1737c98f59d;hp=3c3899713b04e1aca970072645f29a7b0bb3084e;hpb=cc0a722ec13e11cd7aa00db6929cb2505d1c9556;p=elisp%2Fsemi.git

diff --git a/mime-edit.el b/mime-edit.el
index 3c38997..3b76e6d 100644
--- a/mime-edit.el
+++ b/mime-edit.el
@@ -1,10 +1,10 @@
 ;;; mime-edit.el --- Simple MIME Composer for GNU Emacs
 
-;; Copyright (C) 1993,1994,1995,1996,1997,1998 Free Software Foundation, Inc.
+;; Copyright (C) 1993,94,95,96,97,98,99,2000 Free Software Foundation, Inc.
 
 ;; Author: UMEDA Masanobu <umerin@mse.kyutech.ac.jp>
-;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;;	MORIOKA Tomohiko <tomo@kanji.zinbun.kyoto-u.ac.jp>
+;;	Daiki Ueno <ueno@unixuser.org>
 ;; Created: 1994/08/21 renamed from mime.el
 ;;	Renamed: 1997/2/21 from tm-edit.el
 ;; Keywords: MIME, multimedia, multilingual, mail, news
@@ -23,8 +23,8 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with GNU Emacs; see the file COPYING.  If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
 
 ;;; Commentary:
 
@@ -113,7 +113,12 @@
 (require 'mime-view)
 (require 'signature)
 (require 'alist)
-(require 'invisible)
+(require 'epa)
+
+(autoload 'smime-encrypt-buffer "smime"
+  "S/MIME encryption of current buffer.")
+(autoload 'smime-sign-buffer "smime"
+  "S/MIME signature of current buffer.")
 
 
 ;;; @ version
@@ -121,13 +126,11 @@
 
 (eval-and-compile
   (defconst mime-edit-version
-    (eval-when-compile
-      (concat
-       (mime-product-name mime-user-interface-product) " "
-       (mapconcat #'number-to-string
-		  (mime-product-version mime-user-interface-product) ".")
-       " - \"" (mime-product-code-name mime-user-interface-product) "\"")))
-  )
+    (concat
+     (mime-product-name mime-user-interface-product) " "
+     (mapconcat #'number-to-string
+		(mime-product-version mime-user-interface-product) ".")
+     " - \"" (mime-product-code-name mime-user-interface-product) "\"")))
 
 
 ;;; @ variables
@@ -193,7 +196,7 @@ To insert a signature file automatically, call the function
      ("css") ; rfc2318
      ("xml") ; rfc2376
      ("x-latex")
-     ("x-rot13-47-48")
+     ;; ("x-rot13-47-48")
      )
     ("message"
      ("external-body"
@@ -214,14 +217,16 @@ To insert a signature file automatically, call the function
        ("mail-server"
 	("server" "ftpmail@nic.karrn.ad.jp")
 	("subject"))
-       ("url"         ("url"))
-       ))
+       ("url"         ("url"))))
      ("rfc822")
-     ("news")
-     )
+     ("news"))
     ("application"
      ("octet-stream" ("type" "" "tar" "shar"))
      ("postscript")
+     ("pdf")
+     ("msword")
+     ("vnd.ms-excel")
+     ("vnd.ms-powerpoint")
      ("x-kiss" ("x-cnf")))
     ("image"
      ("gif")
@@ -231,11 +236,9 @@ To insert a signature file automatically, call the function
      ("x-pic")
      ("x-mag")
      ("x-xwd")
-     ("x-xbm")
-     )
+     ("x-xbm"))
     ("audio" ("basic"))
-    ("video" ("mpeg"))
-    )
+    ("video" ("mpeg")))
   "*Alist of content-type, subtype, parameters and its values.")
 
 (defcustom mime-file-types
@@ -246,34 +249,29 @@ To insert a signature file automatically, call the function
     ("\\.cc$"
      "application" "octet-stream" (("type" . "C++"))
      "7bit"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
 
     ("\\.el$"
      "application" "octet-stream" (("type" . "emacs-lisp"))
      "7bit"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
 
     ("\\.lsp$"
      "application" "octet-stream" (("type" . "common-lisp"))
      "7bit"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
 
     ("\\.pl$"
      "application" "octet-stream" (("type" . "perl"))
      "7bit"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
 
     ;; Text or translated text
 
     ("\\.txt$"
      "text"	"plain"		nil
      nil
-     "inline"		(("filename" . file))
-     )
+     "inline"		(("filename" . file)))
 
      ;; .rc : procmail modules pm-xxxx.rc
      ;; *rc : other resource files
@@ -281,8 +279,7 @@ To insert a signature file automatically, call the function
     ("\\.\\(rc\\|lst\\|log\\|sql\\|mak\\)$\\|\\..*rc$"
      "text"	"plain"		nil
      nil
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
 
     ("\\.html$"
      "text"	"html"		nil
@@ -292,8 +289,7 @@ To insert a signature file automatically, call the function
     ("\\.diff$\\|\\.patch$"
      "application" "octet-stream" (("type" . "patch"))
      nil
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
 
     ("\\.signature"
      "text"	"plain"		nil	nil	nil	nil)
@@ -302,122 +298,112 @@ To insert a signature file automatically, call the function
     ;;  Octect binary text
 
     ("\\.doc$"				;MS Word
-     "application" "winword" nil
+     "application" "msword" nil
      "base64"
-     "attachment" (("filename" . file))
-     )
+     "attachment" (("filename" . file)))
+    ("\\.xls$"				; MS Excel
+     "application" "vnd.ms-excel" nil
+     "base64"
+     "attachment" (("filename" . file)))
+    ("\\.ppt$"				; MS Power Point
+     "application" "vnd.ms-powerpoint" nil
+     "base64"
+     "attachment" (("filename" . file)))
 
     ("\\.pln$"
      "text"	"plain"		nil
      nil
-     "inline"		(("filename" . file))
-     )
+     "inline"		(("filename" . file)))
     ("\\.ps$"
      "application" "postscript"	nil
-     "quoted-printable"
-     "attachment"	(("filename" . file))
-     )
+     "base64"
+     "attachment"	(("filename" . file)))
+    ("\\.pdf$"
+     "application" "pdf"	nil
+     "base64"
+     "attachment"	(("filename" . file)))
 
     ;;  Pure binary
 
-    ("\\.jpg$"
+    ("\\.jpg$\\|\\.jpeg$"
      "image"	"jpeg"		nil
      "base64"
-     "inline"		(("filename" . file))
-     )
+     "inline"		(("filename" . file)))
     ("\\.gif$"
      "image"	"gif"		nil
      "base64"
-     "inline"		(("filename" . file))
-     )
+     "inline"		(("filename" . file)))
     ("\\.png$"
      "image"	"png"		nil
      "base64"
-     "inline"		(("filename" . file))
-     )
+     "inline"		(("filename" . file)))
     ("\\.tiff$"
      "image"	"tiff"		nil
      "base64"
-     "inline"		(("filename" . file))
-     )
+     "inline"		(("filename" . file)))
     ("\\.pic$"
      "image"	"x-pic"		nil
      "base64"
-     "inline"		(("filename" . file))
-     )
+     "inline"		(("filename" . file)))
     ("\\.mag$"
      "image"	"x-mag"		nil
      "base64"
-     "inline"		(("filename" . file))
-     )
+     "inline"		(("filename" . file)))
     ("\\.xbm$"
      "image"	"x-xbm"		nil
      "base64"
-     "inline"		(("filename" . file))
-     )
+     "inline"		(("filename" . file)))
     ("\\.xwd$"
      "image"	"x-xwd"		nil
      "base64"
-     "inline"		(("filename" . file))
-     )
+     "inline"		(("filename" . file)))
     ("\\.au$"
      "audio"	"basic"		nil
      "base64"
-     "attachment"		(("filename" . file))
-     )
+     "attachment"		(("filename" . file)))
     ("\\.mpg$"
      "video"	"mpeg"		nil
      "base64"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
     ("\\.tar\\.gz$"
      "application" "octet-stream" (("type" . "tar+gzip"))
      "base64"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
     ("\\.tgz$"
      "application" "octet-stream" (("type" . "tar+gzip"))
      "base64"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
     ("\\.tar\\.Z$"
      "application" "octet-stream" (("type" . "tar+compress"))
      "base64"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
     ("\\.taz$"
      "application" "octet-stream" (("type" . "tar+compress"))
      "base64"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
     ("\\.gz$"
      "application" "octet-stream" (("type" . "gzip"))
      "base64"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
     ("\\.Z$"
      "application" "octet-stream" (("type" . "compress"))
      "base64"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
     ("\\.lzh$"
      "application" "octet-stream" (("type" . "lha"))
      "base64"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
     ("\\.zip$"
      "application" "zip" nil
      "base64"
-     "attachment"	(("filename" . file))
-     )
+     "attachment"	(("filename" . file)))
 
     ;; Rest
 
     (".*"
      "application" "octet-stream" nil
      nil
-     "attachment"	(("filename" . file)))
-    )
+     "attachment"	(("filename" . file))))
   "*Alist of file name, types, parameters, and default encoding.
 If encoding is nil, it is determined from its contents."
   :type `(repeat
@@ -425,8 +411,7 @@ If encoding is nil, it is determined from its contents."
 		;; primary-type
 		(choice :tag "Primary-Type"
 			,@(nconc (mapcar (lambda (cell)
-					   (list 'item (car cell))
-					   )
+					   (list 'item (car cell)))
 					 mime-content-types)
 				 '(string)))
 		;; subtype
@@ -435,8 +420,7 @@ If encoding is nil, it is determined from its contents."
 			   (apply #'nconc
 				  (mapcar (lambda (cell)
 					    (mapcar (lambda (cell)
-						      (list 'item (car cell))
-						      )
+						      (list 'item (car cell)))
 						    (cdr cell)))
 					  mime-content-types))
 			   '(string)))
@@ -448,8 +432,7 @@ If encoding is nil, it is determined from its contents."
 			,@(cons
 			   '(const nil)
 			   (mapcar (lambda (cell)
-				     (list 'item cell)
-				     )
+				     (list 'item cell))
 				   (mime-encoding-list))))
 		;; disposition-type
 		(choice :tag "Disposition-Type"
@@ -459,8 +442,7 @@ If encoding is nil, it is determined from its contents."
 			string)
 		;; parameters
 		(repeat :tag "Parameters of Content-Disposition field"
-			(cons string (choice string symbol)))
-		))
+			(cons string (choice string symbol)))))
   :group 'mime-edit)
 
 
@@ -478,7 +460,10 @@ If encoding is nil, it is determined from its contents."
     (iso-8859-7		8 "quoted-printable")
     (iso-8859-8		8 "quoted-printable")
     (iso-8859-9		8 "quoted-printable")
+    (iso-8859-14	8 "quoted-printable")
+    (iso-8859-15	8 "quoted-printable")
     (iso-2022-jp	7 "base64")
+    (iso-2022-jp-3	7 "base64")
     (iso-2022-kr	7 "base64")
     (euc-kr		8 "base64")
     (cn-gb		8 "base64")
@@ -486,9 +471,9 @@ If encoding is nil, it is determined from its contents."
     (cn-big5		8 "base64")
     (big5		8 "base64")
     (shift_jis		8 "base64")
+    (tis-620		8 "base64")
     (iso-2022-jp-2	7 "base64")
-    (iso-2022-int-1	7 "base64")
-    ))
+    (iso-2022-int-1	7 "base64")))
 
 (defvar mime-transfer-level 7
   "*A number of network transfer level.  It should be bigger than 7.")
@@ -497,14 +482,17 @@ If encoding is nil, it is determined from its contents."
 (defsubst mime-encoding-name (transfer-level &optional not-omit)
   (cond ((> transfer-level 8) "binary")
 	((= transfer-level 8) "8bit")
-	(not-omit "7bit")
-	))
+	(not-omit "7bit")))
 
 (defvar mime-transfer-level-string
   (mime-encoding-name mime-transfer-level 'not-omit)
   "A string formatted version of mime-transfer-level")
 (make-variable-buffer-local 'mime-transfer-level-string)
 
+;;; @@ about content transfer encoding
+
+(defvar mime-content-transfer-encoding-priority-list
+  '(nil "8bit" "binary"))
 
 ;;; @@ about message inserting
 ;;;
@@ -547,7 +535,7 @@ If it is not specified for a major-mode,
   :type 'list)
 
 (defconst mime-edit-split-ignored-field-regexp
-  "\\(^Content-\\|^Subject:\\|^Mime-Version:\\|Message-Id:\\)")
+  "\\(^Content-\\|^Subject:\\|^Mime-Version:\\|^Message-Id:\\)")
 
 (defcustom mime-edit-split-blind-field-regexp
   "\\(^[BDFbdf]cc:\\|^cc:[ \t]*$\\)"
@@ -622,15 +610,41 @@ If it is not specified for a major-mode,
 	  " ("
 	  (mime-product-code-name mime-library-product)
 	  ") "
+	  (if (fboundp 'apel-version)
+	      (concat (apel-version) " "))
+	  "EasyPG/" epg-version-number " "
 	  (if (featurep 'xemacs)
-	      (concat (if (featurep 'mule) "MULE")
+	      (concat (cond ((and (featurep 'chise)
+				  (boundp 'xemacs-chise-version))
+			     (concat "CHISE-MULE/" xemacs-chise-version))
+			    ((featurep 'utf-2000)
+			     (concat "UTF-2000-MULE/" utf-2000-version))
+			    ((featurep 'mule) "MULE"))
 		      " XEmacs"
-		      (if (string-match "\\s +\\\"" emacs-version)
-			  (concat "/"
-				  (substring emacs-version 0
-					     (match-beginning 0))
-				  " (" xemacs-codename ") ("
-				  system-configuration ")")
+		      (if (string-match "^[0-9]+\\(\\.[0-9]+\\)" emacs-version)
+			  (concat
+			   "/"
+			   (substring emacs-version 0 (match-end 0))
+			   (cond ((and (boundp 'xemacs-betaname)
+				       xemacs-betaname)
+				  ;; It does not exist in XEmacs
+				  ;; versions prior to 20.3.
+				  (concat " " xemacs-betaname))
+				 ((and (boundp 'emacs-patch-level)
+				       emacs-patch-level)
+				  ;; It does not exist in FSF Emacs or in
+				  ;; XEmacs versions earlier than 21.1.1.
+				  (format " (patch %d)" emacs-patch-level))
+				 (t ""))
+			   " (" xemacs-codename ")"
+			   ;; `xemacs-extra-name' has appeared in the
+			   ;; development version of XEmacs 21.5-b8.
+			   (if (and (boundp 'xemacs-extra-name)
+				    (symbol-value 'xemacs-extra-name))
+			       (concat " " (symbol-value 'xemacs-extra-name))
+			     "")
+			   " ("
+			   system-configuration ")")
 			" (" emacs-version ")"))
 	    (let ((ver (if (string-match "\\.[0-9]+$" emacs-version)
 			   (substring emacs-version 0 (match-beginning 0))
@@ -647,8 +661,7 @@ If it is not specified for a major-mode,
 				    (if (string-match "^Meadow-" mver)
 					(concat " Meadow/"
 						(substring mver
-							   (match-end 0)))
-				      ))))
+							   (match-end 0)))))))
 		    (concat "MULE/" mule-version
 			    " (based on Emacs " ver ")"))
 		(concat "Emacs/" ver " (" system-configuration ")")))))
@@ -665,13 +678,14 @@ inserted into message header.")
 Tspecials means any character that matches with it in header must be quoted.")
 
 (defconst mime-edit-mime-version-value
-  (eval-when-compile
-    (concat "1.0 (generated by " mime-edit-version ")"))
+  (concat "1.0 (generated by " mime-edit-version ")")
   "MIME version number.")
 
 (defconst mime-edit-mime-version-field-for-message/partial
-  (eval-when-compile
-    (concat "MIME-Version: 1.0 (split by " mime-edit-version ")\n"))
+  (concat "MIME-Version:"
+	  (mime-encode-field-body
+	   (concat " 1.0 (split by " mime-edit-version ")\n")
+	   "MIME-Version"))
   "MIME version field for message/partial.")
 
 
@@ -756,12 +770,11 @@ Tspecials means any character that matches with it in header must be quoted.")
     (encrypted	"Enclose as encrypted"	mime-edit-enclose-pgp-encrypted-region)
     (quote	"Verbatim region"	mime-edit-enclose-quote-region)
     (key	"Insert Public Key"	mime-edit-insert-key)
-    (split	"About split"           mime-edit-set-split)
-    (sign	"About sign"		mime-edit-set-sign)
-    (encrypt	"About encryption"	mime-edit-set-encrypt)
+    (split	"Set splitting"		mime-edit-set-split)
+    (sign	"PGP sign"		mime-edit-set-sign)
+    (encrypt	"PGP encrypt"		mime-edit-set-encrypt)
     (preview	"Preview Message"	mime-edit-preview-message)
-    (level	"Toggle transfer-level"	mime-edit-toggle-transfer-level)
-    )
+    (level	"Toggle transfer-level"	mime-edit-toggle-transfer-level))
   "MIME-edit menubar entry.")
 
 (cond ((featurep 'xemacs)
@@ -778,10 +791,8 @@ Tspecials means any character that matches with it in header must be quoted.")
 		       (mapcar (function
 				(lambda (item)
 				  (vector (nth 1 item)(nth 2 item)
-					  mime-edit-mode-flag)
-				  ))
-			       mime-edit-menu-list)))
-		)))
+					  mime-edit-mode-flag)))
+			       mime-edit-menu-list))))))
 
        ;; modified by Steven L. Baur <steve@miranova.com>
        ;;	1995/12/6 (c.f. [tm-en:209])
@@ -792,9 +803,7 @@ Tspecials means any character that matches with it in header must be quoted.")
 					     (vector (nth 1 item)
 						     (nth 2 item)
 						     t)))
-				 mime-edit-menu-list)))
-	   )
-       )
+				 mime-edit-menu-list)))))
       ((>= emacs-major-version 19)
        (define-key mime-edit-mode-map [menu-bar mime-edit]
 	 (cons mime-edit-menu-title
@@ -803,12 +812,8 @@ Tspecials means any character that matches with it in header must be quoted.")
 		(lambda (item)
 		  (define-key mime-edit-mode-map
 		    (vector 'menu-bar 'mime-edit (car item))
-		    (cons (nth 1 item)(nth 2 item))
-		    )
-		  ))
-	       (reverse mime-edit-menu-list)
-	       )
-       ))
+		    (cons (nth 1 item)(nth 2 item)))))
+	       (reverse mime-edit-menu-list))))
 
 
 ;;; @ functions
@@ -958,8 +963,7 @@ User customizable variables (not documented all of them):
 	(mime-edit-again)
       (make-local-variable 'mime-edit-touched-flag)
       (setq mime-edit-touched-flag t)
-      (turn-on-mime-edit)
-      )))
+      (turn-on-mime-edit))))
 
 
 (cond ((featurep 'xemacs)
@@ -967,16 +971,14 @@ User customizable variables (not documented all of them):
 		       '((" MIME-Edit "  mime-transfer-level-string))
 		       mime-edit-mode-map
 		       nil
-		       'mime-edit-mode)
-       )
+		       'mime-edit-mode))
       (t
        (set-alist 'minor-mode-alist
 		  'mime-edit-mode-flag
 		  '((" MIME-Edit "  mime-transfer-level-string)))
        (set-alist 'minor-mode-map-alist
 		  'mime-edit-mode-flag
-		  mime-edit-mode-map)
-       ))
+		  mime-edit-mode-map)))
 
 
 ;;;###autoload
@@ -995,10 +997,7 @@ User customizable variables (not documented all of them):
 
     ;; Define menu for XEmacs.
     (if (featurep 'xemacs)
-	(mime-edit-define-menu-for-xemacs)
-      )
-
-    (enable-invisible)
+	(mime-edit-define-menu-for-xemacs))
 
     ;; I don't care about saving these.
     (setq paragraph-start
@@ -1009,9 +1008,9 @@ User customizable variables (not documented all of them):
 		     paragraph-separate))
     (run-hooks 'mime-edit-mode-hook)
     (message
+     "%s"
      (substitute-command-keys
-      "Type \\[mime-edit-exit] to exit MIME mode, and type \\[mime-edit-help] to get help."))
-    ))
+      "Type \\[mime-edit-exit] to exit MIME mode, and type \\[mime-edit-help] to get help."))))
 
 ;;;###autoload
 (defalias 'edit-mime 'turn-on-mime-edit) ; for convenience
@@ -1024,8 +1023,7 @@ just return to previous mode."
   (interactive "P")
   (if (not mime-edit-mode-flag)
       (if (null no-error)
-	  (error "You aren't editing a MIME message.")
-	)
+	  (error "You aren't editing a MIME message."))
     (if (not nomime)
 	(progn
 	  (run-hooks 'mime-edit-translate-hook)
@@ -1034,19 +1032,15 @@ just return to previous mode."
     (setq mime-edit-mode-flag nil)
     (if (and (featurep 'xemacs)
 	     (featurep 'menubar))
-	(delete-menu-item (list mime-edit-menu-title))
-      )
-    (end-of-invisible)
+	(delete-menu-item (list mime-edit-menu-title)))
     (set-buffer-modified-p (buffer-modified-p))
     (run-hooks 'mime-edit-exit-hook)
-    (message "Exit MIME editor mode.")
-    ))
+    (message "Exit MIME editor mode.")))
 
 (defun mime-edit-maybe-translate ()
   (interactive)
   (mime-edit-exit nil t)
-  (call-interactively 'mime-edit-maybe-split-and-send)
-  )
+  (call-interactively 'mime-edit-maybe-split-and-send))
 
 (defun mime-edit-help ()
   "Show help message about MIME mode."
@@ -1067,15 +1061,12 @@ If optional argument SUBTYPE is not nil, text/SUBTYPE tag is inserted."
 	  (progn
 	    ;; Make a space between the following message.
 	    (insert "\n")
-	    (forward-char -1)
-	    ))
+	    (forward-char -1)))
       (if (and (member (cadr ret) '("enriched"))
 	       (fboundp 'enriched-mode))
 	  (enriched-mode t)
 	(if (boundp 'enriched-mode)
-	    (enriched-mode -1)
-	  ))
-      )))
+	    (enriched-mode -1))))))
 
 (defun mime-edit-insert-file (file &optional verbose)
   "Insert a message from a file."
@@ -1086,15 +1077,12 @@ If optional argument SUBTYPE is not nil, text/SUBTYPE tag is inserted."
 	  (parameters (nth 2 guess))
 	  (encoding (nth 3 guess))
 	  (disposition-type (nth 4 guess))
-	  (disposition-params (nth 5 guess))
-	  )
+	  (disposition-params (nth 5 guess)))
     (if verbose
 	(setq type    (mime-prompt-for-type type)
-	      subtype (mime-prompt-for-subtype type subtype)
-	      ))
+	      subtype (mime-prompt-for-subtype type subtype)))
     (if (or (interactive-p) verbose)
-	(setq encoding (mime-prompt-for-encoding encoding))
-      )
+	(setq encoding (mime-prompt-for-encoding encoding)))
     (if (or (consp parameters) (stringp disposition-type))
 	(let ((rest parameters) cell attribute value)
 	  (setq parameters "")
@@ -1104,11 +1092,9 @@ If optional argument SUBTYPE is not nil, text/SUBTYPE tag is inserted."
 	    (setq value (cdr cell))
 	    (if (eq value 'file)
 		(setq value (std11-wrap-as-quoted-string
-			     (file-name-nondirectory file)))
-	      )
+			     (file-name-nondirectory file))))
 	    (setq parameters (concat parameters "; " attribute "=" value))
-	    (setq rest (cdr rest))
-	    )
+	    (setq rest (cdr rest)))
 	  (if disposition-type
 	      (progn
 		(setq parameters
@@ -1121,17 +1107,12 @@ If optional argument SUBTYPE is not nil, text/SUBTYPE tag is inserted."
 		  (setq value (cdr cell))
 		  (if (eq value 'file)
 		      (setq value (std11-wrap-as-quoted-string
-				   (file-name-nondirectory file)))
-		    )
+				   (file-name-nondirectory file))))
 		  (setq parameters
 			(concat parameters "; " attribute "=" value))
-		  (setq rest (cdr rest))
-		  )
-		))
-	  ))
+		  (setq rest (cdr rest)))))))
     (mime-edit-insert-tag type subtype parameters)
-    (mime-edit-insert-binary-file file encoding)
-    ))
+    (mime-edit-insert-binary-file file encoding)))
 
 (defun mime-edit-insert-external ()
   "Insert a reference to external body."
@@ -1161,14 +1142,14 @@ If optional argument SUBTYPE is not nil, text/SUBTYPE tag is inserted."
     (mime-edit-insert-tag "audio" "basic" nil)
     (mime-edit-define-encoding encoding)
     (save-restriction
-      (narrow-to-region (1- (point))(point))
+      (narrow-to-region (point)(point))
       (unwind-protect
 	  (funcall mime-edit-voice-recorder encoding)
 	(progn
 	  (insert "\n")
-	  (invisible-region (point-min)(point-max))
-	  (goto-char (point-max))
-	  )))))
+	  (add-text-properties
+	   (point-min)(point-max) '(invisible t mime-edit-invisible t))
+	  (goto-char (point-max)))))))
 
 (defun mime-edit-insert-signature (&optional arg)
   "Insert a signature file."
@@ -1178,11 +1159,8 @@ If optional argument SUBTYPE is not nil, text/SUBTYPE tag is inserted."
           (lambda ()
 	    (let ((items (mime-find-file-type signature-file-name)))
 	      (apply (function mime-edit-insert-tag)
-		     (car items) (cadr items) (list (caddr items))))
-            )))
-        )
-    (insert-signature arg)
-    ))
+		     (car items) (cadr items) (list (caddr items))))))))
+    (insert-signature arg)))
 
 
 ;; Insert a new tag around a point.
@@ -1195,15 +1173,12 @@ If nothing is inserted, return nil."
     (mime-edit-goto-tag)
     (if (and (re-search-forward mime-edit-tag-regexp nil t)
 	     (< (match-beginning 0) p)
-	     (< p (match-end 0))
-	     )
+	     (< p (match-end 0)))
 	(goto-char (match-beginning 0))
-      (goto-char p)
-      ))
+      (goto-char p)))
   (let ((oldtag nil)
 	(newtag nil)
-	(current (point))
-	)
+	(current (point)))
     (setq pritype
 	  (or pritype
 	      (mime-prompt-for-type)))
@@ -1221,8 +1196,7 @@ If nothing is inserted, return nil."
 	    (if (mime-edit-goto-tag)
 		(buffer-substring (match-beginning 0) (match-end 0))
 	      ;; Assume content type is 'text/plan'.
-	      (mime-make-tag "text" "plain")
-	      )))
+	      (mime-make-tag "text" "plain"))))
     ;; We are only interested in TEXT.
     (if (and oldtag
 	     (not (mime-test-content-type
@@ -1241,8 +1215,7 @@ If nothing is inserted, return nil."
       ;; Restore previous point.
       (goto-char current)
       nil				;Nothing is created.
-      )
-    ))
+      )))
 
 (defun mime-edit-insert-binary-file (file &optional encoding)
   "Insert binary FILE at point.
@@ -1254,31 +1227,23 @@ Optional argument ENCODING specifies an encoding method such as base64."
 		       (let ((en (downcase encoding)))
 			 (or (string-equal en "7bit")
 			     (string-equal en "8bit")
-			     (string-equal en "binary")
-			     )))))
-	 )
+			     (string-equal en "binary")))))))
     (save-restriction
-      (narrow-to-region tagend (point))
+      (narrow-to-region (point)(point))
       (mime-insert-encoded-file file encoding)
       (if hide-p
-	  (progn
-	    (invisible-region (point-min) (point-max))
-	    (goto-char (point-max))
-	    )
-	(goto-char (point-max))
-	))
+	  (add-text-properties
+	   (point-min)(point-max) '(invisible t mime-edit-invisible t)))
+      (goto-char (point-max)))
     (or hide-p
 	(looking-at mime-edit-tag-regexp)
 	(= (point)(point-max))
-	(mime-edit-insert-tag "text" "plain")
-	)
+	(mime-edit-insert-tag "text" "plain"))
     ;; Define encoding even if it is 7bit.
     (if (stringp encoding)
 	(save-excursion
 	  (goto-char tagend) ; Make sure which line the tag is on.
-	  (mime-edit-define-encoding encoding)
-	  ))
-    ))
+	  (mime-edit-define-encoding encoding)))))
 
 
 ;; Commands work on a current message flagment.
@@ -1293,17 +1258,14 @@ Optional argument ENCODING specifies an encoding method such as base64."
 	     (goto-char (1- (match-beginning 0))) ;For multiline tag
 	     )
 	    (t
-	     (goto-char (point-max))
-	     ))
+	     (goto-char (point-max))))
       ;; Then search for the beginning.
       (re-search-backward mime-edit-end-tag-regexp nil t)
       (or (looking-at mime-edit-beginning-tag-regexp)
 	  ;; Restore previous point.
 	  (progn
 	    (goto-char current)
-	    nil
-	    ))
-      )))
+	    nil)))))
 
 (defun mime-edit-content-beginning ()
   "Return the point of the beginning of content."
@@ -1324,31 +1286,28 @@ Optional argument ENCODING specifies an encoding method such as base64."
 	 (concat "\n" (regexp-quote mail-header-separator)
 		 (if mime-ignore-preceding-spaces
 		     "[ \t\n]*\n" "\n")) nil 'move)
-	(point))
-      )))
+	(point)))))
 
 (defun mime-edit-content-end ()
   "Return the point of the end of content."
   (save-excursion
     (if (mime-edit-goto-tag)
 	(progn
-	  (goto-char (match-end 0))
-	  (if (invisible-p (point))
-	      (next-visible-point (point))
+	  (goto-char (1+ (match-end 0)))
+	  (if (get-text-property (point) 'mime-edit-invisible)
+	      (or (next-single-property-change (point) 'mime-edit-invisible)
+		  (point-max))
 	    ;; Move to the end of this text.
 	    (if (re-search-forward mime-edit-tag-regexp nil 'move)
 		;; Don't forget a multiline tag.
-		(goto-char (match-beginning 0))
-	      )
-	    (point)
-	    ))
+		(goto-char (match-beginning 0)))
+	    (point)))
       ;; Assume the message begins with text/plain.
       (goto-char (mime-edit-content-beginning))
       (if (re-search-forward mime-edit-tag-regexp nil 'move)
 	  ;; Don't forget a multiline tag.
 	  (goto-char (match-beginning 0)))
-      (point))
-    ))
+      (point))))
 
 (defun mime-edit-define-charset (charset)
   "Set charset of current tag to CHARSET."
@@ -1360,9 +1319,12 @@ Optional argument ENCODING specifies an encoding method such as base64."
 	   (mime-create-tag
 	    (mime-edit-set-parameter
 	     (mime-edit-get-contype tag)
-	     "charset" (upcase (symbol-name charset)))
-	    (mime-edit-get-encoding tag)))
-	  ))))
+	     "charset"
+	     (let ((comment (get charset 'mime-charset-comment)))
+	       (if comment
+		   (concat (upcase (symbol-name charset)) " (" comment ")")
+		 (upcase (symbol-name charset)))))
+	    (mime-edit-get-encoding tag)))))))
 
 (defun mime-edit-define-encoding (encoding)
   "Set encoding of current tag to ENCODING."
@@ -1370,13 +1332,11 @@ Optional argument ENCODING specifies an encoding method such as base64."
     (if (mime-edit-goto-tag)
 	(let ((tag (buffer-substring (match-beginning 0) (match-end 0))))
 	  (delete-region (match-beginning 0) (match-end 0))
-	  (insert (mime-create-tag (mime-edit-get-contype tag) encoding)))
-      )))
+	  (insert (mime-create-tag (mime-edit-get-contype tag) encoding))))))
 
 (defun mime-edit-choose-charset ()
   "Choose charset of a text following current point."
-  (detect-mime-charset-region (point) (mime-edit-content-end))
-  )
+  (detect-mime-charset-region (point) (mime-edit-content-end)))
 
 (defun mime-make-text-tag (&optional subtype)
   "Make a tag for a text after current point.
@@ -1407,10 +1367,8 @@ Otherwise, it is obtained from mime-content-types."
   (and (stringp tag)
        (or (string-match mime-edit-single-part-tag-regexp tag)
 	   (string-match mime-edit-multipart-beginning-regexp tag)
-	   (string-match mime-edit-multipart-end-regexp tag)
-	   )
-       (substring tag (match-beginning 1) (match-end 1))
-       ))
+	   (string-match mime-edit-multipart-end-regexp tag))
+       (substring tag (match-beginning 1) (match-end 1))))
 
 (defun mime-edit-get-encoding (tag)
   "Return encoding of TAG."
@@ -1439,8 +1397,7 @@ Nil if no such parameter."
     (if (string-match "\n[^ \t\n\r]+:" contype)
 	(setq ctype (substring contype 0 (match-beginning 0))
 	      opt-fields (substring contype (match-beginning 0)))
-      (setq ctype contype)
-      )
+      (setq ctype contype))
     (if (string-match
 	 (concat
 	  ";[ \t\n]*\\("
@@ -1450,7 +1407,7 @@ Nil if no such parameter."
 	;; Change value
 	(concat (substring ctype 0 (match-beginning 1))
 		parameter "=" value
-		(substring contype (match-end 1))
+		(substring ctype (match-end 1))
 		opt-fields)
       (concat ctype "; " parameter "=" value opt-fields)
       )))
@@ -1479,8 +1436,7 @@ Nil if no such parameter."
       (if (string-match (car (car guesses)) file)
 	  (setq guess (cdr (car guesses))))
       (setq guesses (cdr guesses)))
-    guess
-    ))
+    guess))
 
 (defun mime-prompt-for-type (&optional default)
   "Ask for Content-type."
@@ -1492,15 +1448,12 @@ Nil if no such parameter."
 			     mime-content-types
 			     nil
 			     'require-match ;Type must be specified.
-			     default
-			     ))
+			     default))
       (if (string-equal type "")
 	  (progn
 	    (message "Content type is required.")
 	    (beep)
-	    (sit-for 1)
-	    ))
-      )
+	    (sit-for 1))))
     type))
 
 (defun mime-prompt-for-subtype (type &optional default)
@@ -1508,8 +1461,7 @@ Nil if no such parameter."
   (let ((subtypes (cdr (assoc type mime-content-types))))
     (or (and default
 	     (assoc default subtypes))
-	(setq default (car (car subtypes)))
-	))
+	(setq default (car (car subtypes)))))
   (let* ((answer
 	  (completing-read
 	   (if default
@@ -1519,8 +1471,7 @@ Nil if no such parameter."
 	   (cdr (assoc type mime-content-types))
 	   nil
 	   'require-match		;Subtype must be specified.
-	   nil
-	   )))
+	   nil)))
     (if (string-equal answer "") default answer)))
 
 (defun mime-prompt-for-parameters (pritype subtype &optional delimiter)
@@ -1534,8 +1485,7 @@ Optional DELIMITER specifies parameter delimiter (';' by default)."
 		 (mime-prompt-for-parameters-1
 		  (cdr (assoc subtype
 			      (cdr (assoc pritype mime-content-types))))))
-	   delimiter
-	   )))
+	   delimiter)))
     (if (and (stringp parameters)
 	     (not (string-equal parameters "")))
 	(concat delimiter parameters)
@@ -1548,7 +1498,7 @@ Optional DELIMITER specifies parameter delimiter (';' by default)."
 
 (defun mime-prompt-for-parameter (parameter)
   "Ask for PARAMETER.
-Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
+Parameter must be '(PROMPT CHOICE1 (CHOICE2...))."
   (let* ((prompt (car parameter))
 	 (choices (mapcar (function
 			   (lambda (e)
@@ -1576,8 +1526,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
 		      ;; Note: control characters ignored!
 		      (if (string-match mime-tspecials-regexp answer)
 			  (concat "\"" answer "\"") answer)))
-	  (mime-prompt-for-parameters-1 (cdr (assoc answer (cdr parameter)))))
-    ))
+	  (mime-prompt-for-parameters-1 (cdr (assoc answer (cdr parameter)))))))
 
 (defun mime-prompt-for-encoding (default)
   "Ask for Content-Transfer-Encoding."
@@ -1586,8 +1535,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
 	    (setq encoding
 		  (completing-read
 		   "What transfer encoding: "
-		   (mime-encoding-alist) nil t default)
-		  )
+		   (mime-encoding-alist) nil t default))
 	    ""))
     encoding))
 
@@ -1602,21 +1550,19 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
 
 (defun mime-edit-translate-header ()
   "Encode the message header into network representation."
-  (eword-encode-header 'code-conversion)
-  (run-hooks 'mime-edit-translate-header-hook)
-  )
+  (mime-encode-header-in-buffer 'code-conversion)
+  (run-hooks 'mime-edit-translate-header-hook))
 
 (defun mime-edit-translate-buffer ()
   "Encode the tagged MIME message in current buffer in MIME compliant message."
   (interactive)
+  (undo-boundary)
   (if (catch 'mime-edit-error
 	(save-excursion
-	  (run-hooks 'mime-edit-translate-buffer-hook)
-	  ))
+	  (run-hooks 'mime-edit-translate-buffer-hook)))
       (progn
 	(undo)
-	(error "Translation error!")
-	)))
+	(error "Translation error!"))))
 
 (defun mime-edit-find-inmost ()
   (goto-char (point-min))
@@ -1629,26 +1575,22 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
 	(widen)
 	(if (re-search-forward end-exp nil t)
 	    (setq eb (match-beginning 0))
-	  (setq eb (point-max))
-	  )
+	  (setq eb (point-max)))
 	(narrow-to-region be eb)
 	(goto-char be)
 	(if (re-search-forward mime-edit-multipart-beginning-regexp nil t)
 	    (progn
 	      (narrow-to-region (match-beginning 0)(point-max))
-	      (mime-edit-find-inmost)
-	      )
+	      (mime-edit-find-inmost))
 	  (widen)
-	  (list type bb be eb)
-	  ))))
+	  (list type bb be eb)))))
 
 (defun mime-edit-process-multipart-1 (boundary)
   (let ((ret (mime-edit-find-inmost)))
     (if ret
 	(let ((type (car ret))
 	      (bb (nth 1 ret))(be (nth 2 ret))
-	      (eb (nth 3 ret))
-	      )
+	      (eb (nth 3 ret)))
 	  (narrow-to-region bb eb)
 	  (delete-region bb be)
 	  (setq bb (point-min))
@@ -1657,28 +1599,25 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
 	  (goto-char eb)
 	  (if (looking-at mime-edit-multipart-end-regexp)
 	      (let ((beg (match-beginning 0))
-		    (end (match-end 0))
-		    )
+		    (end (match-end 0)))
 		(delete-region beg end)
 		(or (looking-at mime-edit-beginning-tag-regexp)
 		    (eobp)
-		    (insert (concat (mime-make-text-tag) "\n"))
-		    )))
+		    (insert (concat (mime-make-text-tag) "\n")))))
 	  (cond ((string-equal type "quote")
-		 (mime-edit-enquote-region bb eb)
-		 )
+		 (mime-edit-enquote-region bb eb))
 		((string-equal type "pgp-signed")
-		 (mime-edit-sign-pgp-mime bb eb boundary)
-		 )
+		 (mime-edit-sign-pgp-mime bb eb boundary))
 		((string-equal type "pgp-encrypted")
-		 (mime-edit-encrypt-pgp-mime bb eb boundary)
-		 )
+		 (mime-edit-encrypt-pgp-mime bb eb boundary))
 		((string-equal type "kazu-signed")
-		 (mime-edit-sign-pgp-kazu bb eb boundary)
-		 )
+		 (mime-edit-sign-pgp-kazu bb eb boundary))
 		((string-equal type "kazu-encrypted")
-		 (mime-edit-encrypt-pgp-kazu bb eb boundary)
-		 )
+		 (mime-edit-encrypt-pgp-kazu bb eb boundary))
+		((string-equal type "smime-signed")
+		 (mime-edit-sign-smime bb eb boundary))
+		((string-equal type "smime-encrypted")
+		 (mime-edit-encrypt-smime bb eb boundary))
 		(t
 		 (setq boundary
 		       (nth 2 (mime-edit-translate-region bb eb
@@ -1687,8 +1626,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
 		 (insert
 		  (format "--[[multipart/%s;
  boundary=\"%s\"][7bit]]\n"
-			  type boundary))
-		 ))
+			  type boundary))))
 	  boundary))))
 
 (defun mime-edit-enquote-region (beg end)
@@ -1698,8 +1636,7 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
       (goto-char beg)
       (while (re-search-forward mime-edit-single-part-tag-regexp nil t)
 	(let ((tag (buffer-substring (match-beginning 0)(match-end 0))))
-	  (replace-match (concat "- " (substring tag 1)))
-	  )))))
+	  (replace-match (concat "- " (substring tag 1))))))))
 
 (defun mime-edit-dequote-region (beg end)
   (save-excursion
@@ -1709,30 +1646,78 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
       (while (re-search-forward
 	      mime-edit-quoted-single-part-tag-regexp nil t)
 	(let ((tag (buffer-substring (match-beginning 0)(match-end 0))))
-	  (replace-match (concat "-" (substring tag 2)))
-	  )))))
+	  (replace-match (concat "-" (substring tag 2))))))))
+
+(defvar mime-edit-pgp-user-id nil)
+
+(defun mime-edit-delete-trailing-whitespace ()
+  (save-match-data
+    (save-excursion
+      (goto-char (point-min))
+      (while (re-search-forward "[ \t]+$" nil t)
+	(delete-region (match-beginning 0) (match-end 0))))))
 
 (defun mime-edit-sign-pgp-mime (beg end boundary)
   (save-excursion
     (save-restriction
-      (narrow-to-region beg end)
-      (let* ((ret
-	      (mime-edit-translate-region beg end boundary))
+      (let* ((from (std11-field-body "From" mail-header-separator))
+	     (ret (progn 
+		    (narrow-to-region beg end)
+		    (mime-edit-translate-region beg end boundary)))
 	     (ctype    (car ret))
 	     (encoding (nth 1 ret))
-	     (pgp-boundary (concat "pgp-sign-" boundary)))
+	     (pgp-boundary (concat "pgp-sign-" boundary))
+	     (context (epg-make-context))
+	     signature
+	     micalg)
+	(mime-edit-delete-trailing-whitespace) ; RFC3156
 	(goto-char beg)
 	(insert (format "Content-Type: %s\n" ctype))
 	(if encoding
-	    (insert (format "Content-Transfer-Encoding: %s\n" encoding))
-	  )
+	    (insert (format "Content-Transfer-Encoding: %s\n" encoding)))
 	(insert "\n")
-	(or (as-binary-process
-	     (funcall (pgp-function 'mime-sign)
-		      (point-min)(point-max) nil nil pgp-boundary))
-	    (throw 'mime-edit-error 'pgp-error)
-	    )
-	))))
+	(epg-context-set-armor context t)
+	(epg-context-set-textmode context t)
+	(epg-context-set-signers
+	 context
+	 (epa-select-keys
+	  "\
+Select keys for signing.
+If no one is selected, default secret key is used.  "
+	  (if from 
+	      (list (nth 1 (std11-extract-address-components from))))
+	  t))
+	(condition-case error
+	    (setq signature
+		  (epg-sign-string context
+				   (buffer-substring (point-min) (point-max))
+				   'detached))
+	  (error (signal 'mime-edit-error (cdr error))))
+	(setq micalg (cdr (assq 'digest-algorithm
+				(car (epg-context-result-for context 'sign)))))
+	(goto-char beg)
+	(insert (format "--[[multipart/signed;
+ boundary=\"%s\"%s;
+ protocol=\"application/pgp-signature\"][7bit]]
+--%s
+"
+			pgp-boundary
+			(if micalg
+			    (concat "; micalg=pgp-"
+				    (downcase
+				     (cdr (assq micalg
+						epg-digest-algorithm-alist))))
+			  "")
+			pgp-boundary))
+	(goto-char (point-max))
+	(insert (format "\n--%s
+Content-Type: application/pgp-signature
+Content-Transfer-Encoding: 7bit
+
+" pgp-boundary))
+	(insert signature)
+	(goto-char (point-max))
+	(insert (format "\n--%s--\n" pgp-boundary))))))
 
 (defvar mime-edit-encrypt-recipient-fields-list '("To" "cc"))
 
@@ -1747,53 +1732,61 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
 	 (header (and (stringp from)
 		      (if (string-equal from "")
 			  ""
-			(format "From: %s\n" from)
-			)))
+			(format "From: %s\n" from))))
 	 recipients)
     (while (and names values)
       (let ((name (car names))
-	    (value (car values))
-	    )
+	    (value (car values)))
 	(and (stringp value)
 	     (or (string-equal value "")
 		 (progn
 		   (setq header (concat header name ": " value "\n")
 			 recipients (if recipients
 					(concat recipients " ," value)
-				      value))
-		   ))))
+				      value))))))
       (setq names (cdr names)
-	    values (cdr values))
-      )
-    (vector from recipients header)
-    ))
+	    values (cdr values)))
+    (vector from recipients header)))
 
 (defun mime-edit-encrypt-pgp-mime (beg end boundary)
   (save-excursion
     (save-restriction
-      (let (from recipients header)
-	(let ((ret (mime-edit-make-encrypt-recipient-header)))
-	  (setq from (aref ret 0)
-		recipients (aref ret 1)
-		header (aref ret 2))
-	  )
-	(narrow-to-region beg end)
-	(let* ((ret
-		(mime-edit-translate-region beg end boundary))
-	       (ctype    (car ret))
-	       (encoding (nth 1 ret))
-	       (pgp-boundary (concat "pgp-" boundary)))
-	  (goto-char beg)
-	  (insert header)
-	  (insert (format "Content-Type: %s\n" ctype))
-	  (if encoding
-	      (insert (format "Content-Transfer-Encoding: %s\n" encoding))
-	    )
-	  (insert "\n")
-	  (or (funcall (pgp-function 'encrypt)
-		       recipients (point-min) (point-max) from)
-	      (throw 'mime-edit-error 'pgp-error)
-	      )
+      (let (recipients header)
+        (let ((ret (mime-edit-make-encrypt-recipient-header)))
+          (setq recipients (aref ret 1)
+                header (aref ret 2)))
+        (narrow-to-region beg end)
+        (let* ((ret
+                (mime-edit-translate-region beg end boundary))
+               (ctype    (car ret))
+               (encoding (nth 1 ret))
+               (pgp-boundary (concat "pgp-" boundary))
+	       (context (epg-make-context))
+	       cipher)
+          (goto-char beg)
+          (insert header)
+          (insert (format "Content-Type: %s\n" ctype))
+          (if encoding
+              (insert (format "Content-Transfer-Encoding: %s\n" encoding)))
+          (insert "\n")
+	  (mime-encode-header-in-buffer)
+	  (epg-context-set-armor context t)
+	  (condition-case error
+	      (setq cipher
+		    (epg-encrypt-string
+		     context
+		     (buffer-substring (point-min) (point-max))
+		     (epa-select-keys
+		      "\
+Select recipents for encryption.
+If no one is selected, symmetric encryption will be performed.  "
+		      (mapcar (lambda (recipient)
+				(nth 1 (std11-extract-address-components
+					recipient)))
+			      (split-string recipients 
+					    "\\([ \t\n]*,[ \t\n]*\\)+")))))
+	    (error (signal 'mime-edit-error (cdr error))))
+	  (delete-region (point-min)(point-max))
 	  (goto-char beg)
 	  (insert (format "--[[multipart/encrypted;
  boundary=\"%s\";
@@ -1806,9 +1799,9 @@ Content-Type: application/octet-stream
 Content-Transfer-Encoding: 7bit
 
 " pgp-boundary pgp-boundary pgp-boundary))
+	  (insert cipher)
 	  (goto-char (point-max))
-	  (insert (format "\n--%s--\n" pgp-boundary))
-	  )))))
+	  (insert (format "\n--%s--\n" pgp-boundary)))))))
 
 (defun mime-edit-sign-pgp-kazu (beg end boundary)
   (save-excursion
@@ -1817,55 +1810,121 @@ Content-Transfer-Encoding: 7bit
       (let* ((ret
 	      (mime-edit-translate-region beg end boundary))
 	     (ctype    (car ret))
-	     (encoding (nth 1 ret)))
+	     (encoding (nth 1 ret))
+	     (context (epg-make-context))
+	     signature)
 	(goto-char beg)
 	(insert (format "Content-Type: %s\n" ctype))
 	(if encoding
-	    (insert (format "Content-Transfer-Encoding: %s\n" encoding))
-	  )
+	    (insert (format "Content-Transfer-Encoding: %s\n" encoding)))
 	(insert "\n")
-	(or (as-binary-process
-	     (funcall (pgp-function 'traditional-sign)
-		      beg (point-max)))
-	    (throw 'mime-edit-error 'pgp-error)
-	    )
+	(condition-case error
+	    (setq signature
+		  (epg-sign-string context
+				   (buffer-substring beg (point-max))
+				   'clearsign))
+	  (error (signal 'mime-edit-error (cdr error))))
 	(goto-char beg)
 	(insert
-	 "--[[application/pgp; format=mime][7bit]]\n")
-	))
-    ))
+	 "--[[application/pgp; format=mime][7bit]]\n" signature)
+	))))
 
 (defun mime-edit-encrypt-pgp-kazu (beg end boundary)
   (save-excursion
     (let (recipients header)
       (let ((ret (mime-edit-make-encrypt-recipient-header)))
 	(setq recipients (aref ret 1)
-	      header (aref ret 2))
-	)
+	      header (aref ret 2)))
       (save-restriction
 	(narrow-to-region beg end)
 	(let* ((ret
 		(mime-edit-translate-region beg end boundary))
 	       (ctype    (car ret))
-	       (encoding (nth 1 ret)))
+	       (encoding (nth 1 ret))
+	       (context (epg-make-context))
+	       cipher)
 	  (goto-char beg)
 	  (insert header)
 	  (insert (format "Content-Type: %s\n" ctype))
 	  (if encoding
-	      (insert (format "Content-Transfer-Encoding: %s\n" encoding))
-	    )
+	      (insert (format "Content-Transfer-Encoding: %s\n" encoding)))
 	  (insert "\n")
-	  (or (as-binary-process
-	       (funcall (pgp-function 'encrypt)
-			recipients beg (point-max) nil 'maybe)
-	       )
-	      (throw 'mime-edit-error 'pgp-error)
-	      )
+	  (epg-context-set-armor context t)
+	  (condition-case error
+	      (setq cipher
+		    (epg-encrypt-string
+		     context
+		     (buffer-substring beg (point-max))
+		     (epa-select-keys
+		      "\
+Select recipents for encryption.
+If no one is selected, symmetric encryption will be performed.  "
+		      (mapcar (lambda (recipient)
+				(nth 1 (std11-extract-address-components
+					recipient)))
+			      (split-string recipients 
+					    "\\([ \t\n]*,[ \t\n]*\\)+")))))
+	    (error (signal 'mime-edit-error (cdr error))))
 	  (goto-char beg)
 	  (insert
-	   "--[[application/pgp; format=mime][7bit]]\n")
-	  ))
-      )))
+	   "--[[application/pgp; format=mime][7bit]]\n" cipher)
+	  )))))
+
+(defun mime-edit-sign-smime (beg end boundary)
+  (save-excursion
+    (save-restriction
+      (let* ((ret (progn 
+		    (narrow-to-region beg end)
+		    (mime-edit-translate-region beg end boundary)))
+	     (ctype    (car ret))
+	     (encoding (nth 1 ret))
+	     (smime-boundary (concat "smime-sign-" boundary)))
+	(goto-char beg)
+	(insert (format "Content-Type: %s\n" ctype))
+	(if encoding
+	    (insert (format "Content-Transfer-Encoding: %s\n" encoding)))
+	(insert "\n")
+	(let (buffer-undo-list)
+	  (goto-char (point-min))
+	  (while (progn (end-of-line) (not (eobp)))
+	    (insert "\r")
+	    (forward-line 1))
+	  (or (smime-sign-buffer)
+	      (throw 'mime-edit-error 'pgp-error)))
+	(goto-char beg)
+	(if (re-search-forward "^Content-Type:\\s-*" nil t)
+	    (let* ((start (match-beginning 0))
+		   (body (buffer-substring (match-end 0) (std11-field-end))))
+	      (delete-region start (line-beginning-position 2))
+	      (goto-char beg)
+	      (insert "--[[" body "][7bit]]\n")))))))
+
+(defun mime-edit-encrypt-smime (beg end boundary)
+  (save-excursion
+    (save-restriction
+      (let* ((ret (progn 
+		    (narrow-to-region beg end)
+		    (mime-edit-translate-region beg end boundary)))
+	     (ctype    (car ret))
+	     (encoding (nth 1 ret)))
+	(goto-char beg)
+	(insert (format "Content-Type: %s\n" ctype))
+	(if encoding
+	    (insert (format "Content-Transfer-Encoding: %s\n" encoding)))
+	(insert "\n")
+	(goto-char (point-min))
+	(while (progn (end-of-line) (not (eobp)))
+	  (insert "\r")
+	  (forward-line 1))
+	(or (smime-encrypt-buffer)
+	    (throw 'mime-edit-error 'pgp-error))
+	(goto-char beg)
+	(if (re-search-forward "^Content-Type:\\s-*" nil t)
+	    (let* ((start (match-beginning 0))
+		   (body (buffer-substring (match-end 0) (std11-field-end))))
+	      (delete-region start (line-beginning-position 2))
+	      (goto-char beg)
+	      (insert "--[[" body "]]\n")))))))
 
 (defsubst replace-space-with-underline (str)
   (mapconcat (function
@@ -1873,13 +1932,11 @@ Content-Transfer-Encoding: 7bit
 		(char-to-string
 		 (if (eq arg ?\ )
 		     ?_
-		   arg)))) str "")
-  )
+		   arg)))) str ""))
 
 (defun mime-edit-make-boundary ()
   (concat mime-multipart-boundary "_"
-	  (replace-space-with-underline (current-time-string))
-	  ))
+	  (replace-space-with-underline (current-time-string))))
 
 (defun mime-edit-translate-body ()
   "Encode the tagged MIME body in current buffer in MIME compliant message."
@@ -1890,8 +1947,7 @@ Content-Transfer-Encoding: 7bit
 	  ret)
       (while (mime-edit-process-multipart-1
 	      (format "%s-%d" boundary i))
-	(setq i (1+ i))
-	)
+	(setq i (1+ i)))
       (save-restriction
 	;; We are interested in message body.
 	(let* ((beg
@@ -1911,8 +1967,7 @@ Content-Transfer-Encoding: 7bit
 		  (point))))
 	  (setq ret (mime-edit-translate-region
 		     beg end
-		     (format "%s-%d" boundary i)))
-	  ))
+		     (format "%s-%d" boundary i)))))
       (mime-edit-dequote-region (point-min)(point-max))
       (let ((contype (car ret))		;Content-Type
 	    (encoding (nth 1 ret))	;Content-Transfer-Encoding
@@ -1920,8 +1975,7 @@ Content-Transfer-Encoding: 7bit
 	;; Insert User-Agent field
 	(and mime-edit-insert-user-agent-field
 	     (or (mail-position-on-field "User-Agent")
-		 (insert mime-edit-user-agent-value)
-		 ))
+		 (insert mime-edit-user-agent-value)))
 	;; Make primary MIME headers.
 	(or (mail-position-on-field "MIME-Version")
 	    (insert mime-edit-mime-version-value))
@@ -1939,8 +1993,7 @@ Content-Transfer-Encoding: 7bit
 	(if encoding
 	    (progn
 	      (mail-position-on-field "Content-Transfer-Encoding")
-	      (insert encoding)))
-	))))
+	      (insert encoding)))))))
 
 (defun mime-edit-translate-single-part-tag (boundary &optional prefix)
   "Translate single-part-tag to MIME header."
@@ -1957,14 +2010,15 @@ Content-Transfer-Encoding: 7bit
 	    (insert "Content-Type: " contype "\n")
 	    (if encoding
 		(insert "Content-Transfer-Encoding: " encoding "\n"))
-	    (eword-encode-header)
-	    ))
-	t)))
+	    (mime-encode-header-in-buffer))
+	  (cons (and contype
+		     (downcase contype))
+		(and encoding
+		     (downcase encoding)))))))
 
 (defun mime-edit-translate-region (beg end &optional boundary multipart)
   (or boundary
-      (setq boundary (mime-edit-make-boundary))
-      )
+      (setq boundary (mime-edit-make-boundary)))
   (save-excursion
     (save-restriction
       (narrow-to-region beg end)
@@ -1990,27 +2044,28 @@ Content-Transfer-Encoding: 7bit
 		  (buffer-substring (match-beginning 0) (match-end 0)))
 	    (delete-region (match-beginning 0) (1+ (match-end 0)))
 	    (setq contype (mime-edit-get-contype tag))
-	    (setq encoding (mime-edit-get-encoding tag))
-	    ))
+	    (setq encoding (mime-edit-get-encoding tag))))
 	 (t
 	  ;; It's a multipart message.
 	  (goto-char (point-min))
-	  (and (mime-edit-translate-single-part-tag boundary)
-	       (while (mime-edit-translate-single-part-tag boundary "\n")))
-	  ;; Define Content-Type as "multipart/mixed".
-	  (setq contype
-		(concat "multipart/mixed;\n boundary=\"" boundary "\""))
-	  ;; Content-Transfer-Encoding must be "7bit".
-	  ;; The following encoding can be `nil', but is
-	  ;; specified as is since there is no way that a user
-	  ;; specifies it.
-	  (setq encoding "7bit")
-	  ;; Insert the trailer.
-	  (goto-char (point-max))
-	  (insert "\n--" boundary "--\n")
-	  ))
-	(list contype encoding boundary nparts)
-	))))
+	  (let ((prio mime-content-transfer-encoding-priority-list)
+		part-info nprio)
+	    (when (setq part-info
+			(mime-edit-translate-single-part-tag boundary))
+	      (and (setq nprio (member (cdr part-info) prio))
+		   (setq prio nprio))
+	      (while (setq part-info
+			   (mime-edit-translate-single-part-tag boundary "\n"))
+		(and (setq nprio (member (cdr part-info) prio))
+		     (setq prio nprio))))
+	    ;; Define Content-Type as "multipart/mixed".
+	    (setq contype
+		  (concat "multipart/mixed;\n boundary=\"" boundary "\""))
+	    (setq encoding (car prio))
+	    ;; Insert the trailer.
+	    (goto-char (point-max))
+	    (insert "\n--" boundary "--\n"))))
+	 (list contype encoding boundary nparts)))))
 
 (defun mime-edit-normalize-body ()
   "Normalize the body part by inserting appropriate message tags."
@@ -2029,23 +2084,19 @@ Content-Transfer-Encoding: 7bit
       (if (looking-at "[ \t]+$")
 	  (delete-region (match-beginning 0) (match-end 0)))
       (let ((beg (point))
-	    (end (mime-edit-content-end))
-	    )
+	    (end (mime-edit-content-end)))
 	(if (= end (point-max))
 	    nil
 	  (goto-char end)
 	  (or (looking-at mime-edit-beginning-tag-regexp)
 	      (eobp)
-	      (insert (mime-make-text-tag) "\n")
-	      ))
-	(visible-region beg end)
-	(goto-char beg)
-	)
+	      (insert (mime-make-text-tag) "\n")))
+	(remove-text-properties beg end '(invisible mime-edit-invisible))
+	(goto-char beg))
       (cond
        ((mime-test-content-type contype "message")
 	;; Content-type "message" should be sent as is.
-	(forward-line 1)
-	)
+	(forward-line 1))
        ((mime-test-content-type contype "text")
 	;; Define charset for text if necessary.
 	(setq charset (if charset
@@ -2055,15 +2106,13 @@ Content-Transfer-Encoding: 7bit
 	(cond ((string-equal contype "text/x-rot13-47-48")
 	       (save-excursion
 		 (forward-line)
-		 (mule-caesar-region (point) (mime-edit-content-end))
-		 ))
+		 (mule-caesar-region (point) (mime-edit-content-end))))
 	      ((string-equal contype "text/enriched")
 	       (save-excursion
 		 (let ((beg (progn
 			      (forward-line)
 			      (point)))
-		       (end (mime-edit-content-end))
-		       )
+		       (end (mime-edit-content-end)))
 		   ;; Patch for hard newlines
                    ;; (save-excursion
                    ;;   (goto-char beg)
@@ -2072,12 +2121,10 @@ Content-Transfer-Encoding: 7bit
                    ;;                        (point)
                    ;;                        'hard t)))
 		   ;; End patch for hard newlines
-		   (enriched-encode beg end)
+		   (enriched-encode beg end nil)
 		   (goto-char beg)
 		   (if (search-forward "\n\n")
-		       (delete-region beg (match-end 0))
-		     )
-		   ))))
+		       (delete-region beg (match-end 0)))))))
 	;; Point is now on current tag.
 	;; Define encoding and encode text if necessary.
 	(or encoding	;Encoding is not specified.
@@ -2108,24 +2155,26 @@ Content-Transfer-Encoding: 7bit
 					    x-ctext))
 			    (while (progn
 				     (replace-match "\e(BFrom ")
-				     (re-search-forward "^From " nil t)
-				     ))
-			  (setq encoding "quoted-printable")
-			  )))))
+				     (re-search-forward "^From " nil t)))
+			  (setq encoding "quoted-printable"))))))
 	      ;; canonicalize line break code
 	      (or (member encoding '(nil "7bit" "8bit" "quoted-printable"))
 		  (save-restriction
 		    (narrow-to-region beg (mime-edit-content-end))
 		    (goto-char beg)
 		    (while (re-search-forward "\\(\\=\\|[^\r]\\)\n" nil t)
-		      (replace-match "\\1\r\n"))))
+		      ;; In a certain period, `replace-match' with "\\N"
+		      ;; converted 8-bit characters into multibyte string,
+		      ;; but it has been fixed at 2004-01-15.
+		      ;;(replace-match "\\1\r\n"))))
+		      (backward-char 1)
+		      (insert "\r")
+		      (forward-char 1))))
 	      (goto-char beg)
 	      (mime-encode-region beg (mime-edit-content-end)
 				  (or encoding "7bit"))
-	      (mime-edit-define-encoding encoding)
-	      ))
-	(goto-char (mime-edit-content-end))
-	)
+	      (mime-edit-define-encoding encoding)))
+	(goto-char (mime-edit-content-end)))
        ((null encoding)		;Encoding is not specified.
 	;; Application, image, audio, video, and any other
 	;; unknown content-type without encoding should be
@@ -2135,9 +2184,7 @@ Content-Transfer-Encoding: 7bit
 	       (end (mime-edit-content-end)))
 	  (mime-encode-region beg end encoding)
 	  (mime-edit-define-encoding encoding))
-	(forward-line 1)
-	))
-      )))
+	(forward-line 1))))))
 
 (defun mime-delete-field (field)
   "Delete header FIELD."
@@ -2145,8 +2192,7 @@ Content-Transfer-Encoding: 7bit
     (goto-char (point-min))
     (while (re-search-forward regexp nil t)
       (delete-region (match-beginning 0)
-		     (progn (forward-line 1) (point)))
-      )))
+		     (1+ (std11-field-end))))))
 
 
 ;;;
@@ -2160,8 +2206,7 @@ Content-Transfer-Encoding: 7bit
 and insert data encoded as ENCODING."
   (message "Start the recording on %s.  Type C-g to finish the recording..."
 	   (system-name))
-  (mime-insert-encoded-file "/dev/audio" encoding)
-  )
+  (mime-insert-encoded-file "/dev/audio" encoding))
 
 
 ;;; @ Other useful commands.
@@ -2175,10 +2220,8 @@ and insert data encoded as ENCODING."
     (if (and inserter (fboundp inserter))
 	(progn
 	  (mime-edit-insert-tag "message" "rfc822")
-	  (funcall inserter message)
-	  )
-      (message "Sorry, I don't have message inserter for your MUA.")
-      )))
+	  (funcall inserter message))
+      (message "Sorry, I don't have message inserter for your MUA."))))
 
 (defun mime-edit-insert-mail (&optional message)
   (interactive)
@@ -2186,10 +2229,8 @@ and insert data encoded as ENCODING."
     (if (and inserter (fboundp inserter))
 	(progn
 	  (mime-edit-insert-tag "message" "rfc822")
-	  (funcall inserter message)
-	  )
-      (message "Sorry, I don't have mail inserter for your MUA.")
-      )))
+	  (funcall inserter message))
+      (message "Sorry, I don't have mail inserter for your MUA."))))
 
 (defun mime-edit-inserted-message-filter ()
   (save-excursion
@@ -2200,17 +2241,13 @@ and insert data encoded as ENCODING."
 	;; for Emacs 18
 	;; (if (re-search-forward "^$" (marker-position (mark-marker)))
 	(if (re-search-forward "^$" (mark t))
-	    (narrow-to-region header-start (match-beginning 0))
-	  )
+	    (narrow-to-region header-start (match-beginning 0)))
 	(goto-char header-start)
 	(while (and (re-search-forward
 		     mime-edit-yank-ignored-field-regexp nil t)
 		    (setq beg (match-beginning 0))
-		    (setq end (1+ (std11-field-end)))
-		    )
-	  (delete-region beg end)
-	  )
-	))))
+		    (setq end (1+ (std11-field-end))))
+	  (delete-region beg end))))))
 
 
 ;;; @ multipart enclosure
@@ -2224,66 +2261,67 @@ and insert data encoded as ENCODING."
       (insert (format "--<<%s>>-{\n" type))
       (goto-char (point-max))
       (insert (format "--}-<<%s>>\n" type))
-      (goto-char (point-max))
-      )
+      (goto-char (point-max)))
     (or (looking-at mime-edit-beginning-tag-regexp)
 	(eobp)
-	(insert (mime-make-text-tag) "\n")
-	)
-    ))
+	(insert (mime-make-text-tag) "\n"))))
 
 (defun mime-edit-enclose-quote-region (beg end)
   (interactive "*r")
-  (mime-edit-enclose-region-internal 'quote beg end)
-  )
+  (mime-edit-enclose-region-internal 'quote beg end))
 
 (defun mime-edit-enclose-mixed-region (beg end)
   (interactive "*r")
-  (mime-edit-enclose-region-internal 'mixed beg end)
-  )
+  (mime-edit-enclose-region-internal 'mixed beg end))
 
 (defun mime-edit-enclose-parallel-region (beg end)
   (interactive "*r")
-  (mime-edit-enclose-region-internal 'parallel beg end)
-  )
+  (mime-edit-enclose-region-internal 'parallel beg end))
 
 (defun mime-edit-enclose-digest-region (beg end)
   (interactive "*r")
-  (mime-edit-enclose-region-internal 'digest beg end)
-  )
+  (mime-edit-enclose-region-internal 'digest beg end))
 
 (defun mime-edit-enclose-alternative-region (beg end)
   (interactive "*r")
-  (mime-edit-enclose-region-internal 'alternative beg end)
-  )
+  (mime-edit-enclose-region-internal 'alternative beg end))
 
 (defun mime-edit-enclose-pgp-signed-region (beg end)
   (interactive "*r")
-  (mime-edit-enclose-region-internal 'pgp-signed beg end)
-  )
+  (mime-edit-enclose-region-internal 'pgp-signed beg end))
 
 (defun mime-edit-enclose-pgp-encrypted-region (beg end)
   (interactive "*r")
-  (mime-edit-enclose-region-internal 'pgp-encrypted beg end)
-  )
+  (mime-edit-enclose-region-internal 'pgp-encrypted beg end))
 
 (defun mime-edit-enclose-kazu-signed-region (beg end)
   (interactive "*r")
-  (mime-edit-enclose-region-internal 'kazu-signed beg end)
-  )
+  (mime-edit-enclose-region-internal 'kazu-signed beg end))
 
 (defun mime-edit-enclose-kazu-encrypted-region (beg end)
   (interactive "*r")
-  (mime-edit-enclose-region-internal 'kazu-encrypted beg end)
-  )
+  (mime-edit-enclose-region-internal 'kazu-encrypted beg end))
+
+(defun mime-edit-enclose-smime-signed-region (beg end)
+  (interactive "*r")
+  (mime-edit-enclose-region-internal 'smime-signed beg end))
+
+(defun mime-edit-enclose-smime-encrypted-region (beg end)
+  (interactive "*r")
+  (mime-edit-enclose-region-internal 'smime-encrypted beg end))
 
 (defun mime-edit-insert-key (&optional arg)
   "Insert a pgp public key."
   (interactive "P")
   (mime-edit-insert-tag "application" "pgp-keys")
   (mime-edit-define-encoding "7bit")
-  (funcall (pgp-function 'insert-key))
-  )
+  (let ((context (epg-make-context)))
+    (epg-context-set-armor t)
+    (epg-export-keys-to-string context
+			       (epa-select-keys "Select keys for export.  ")))
+  (if (and (not (eobp))
+	   (not (looking-at mime-edit-single-part-tag-regexp)))
+      (insert (mime-make-text-tag) "\n")))
 
 
 ;;; @ flag setting
@@ -2292,13 +2330,11 @@ and insert data encoded as ENCODING."
 (defun mime-edit-set-split (arg)
   (interactive
    (list
-    (y-or-n-p "Do you want to enable split? ")
-    ))
+    (y-or-n-p "Do you want to enable split? ")))
   (setq mime-edit-split-message arg)
   (if arg
       (message "This message is enabled to split.")
-    (message "This message is not enabled to split.")
-    ))
+    (message "This message is not enabled to split.")))
 
 (defun mime-edit-toggle-transfer-level (&optional transfer-level)
   "Toggle transfer-level is 7bit or 8bit through.
@@ -2309,24 +2345,20 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
       (setq mime-transfer-level transfer-level)
     (if (< mime-transfer-level 8)
 	(setq mime-transfer-level 8)
-      (setq mime-transfer-level 7)
-      ))
+      (setq mime-transfer-level 7)))
   (message (format "Current transfer-level is %d bit"
 		   mime-transfer-level))
   (setq mime-transfer-level-string
 	(mime-encoding-name mime-transfer-level 'not-omit))
-  (force-mode-line-update)
-  )
+  (force-mode-line-update))
 
 (defun mime-edit-set-transfer-level-7bit ()
   (interactive)
-  (mime-edit-toggle-transfer-level 7)
-  )
+  (mime-edit-toggle-transfer-level 7))
 
 (defun mime-edit-set-transfer-level-8bit ()
   (interactive)
-  (mime-edit-toggle-transfer-level 8)
-  )
+  (mime-edit-toggle-transfer-level 8))
 
 
 ;;; @ pgp
@@ -2338,51 +2370,47 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
 (defun mime-edit-set-sign (arg)
   (interactive
    (list
-    (y-or-n-p "Do you want to sign? ")
-    ))
+    (y-or-n-p "Do you want to sign? ")))
   (if arg
       (progn
-	(setq mime-edit-pgp-processing 'sign)
-	(message "This message will be signed.")
-	)
-    (if (eq mime-edit-pgp-processing 'sign)
-	(setq mime-edit-pgp-processing nil)
-      )
-    (message "This message will not be signed.")
-    ))
+	(or (memq 'sign mime-edit-pgp-processing)
+	    (setq mime-edit-pgp-processing 
+		  (nconc mime-edit-pgp-processing 
+			 (copy-sequence '(sign)))))
+	(message "This message will be signed."))
+    (setq mime-edit-pgp-processing 
+	  (delq 'sign mime-edit-pgp-processing))
+    (message "This message will not be signed.")))
 
 (defun mime-edit-set-encrypt (arg)
   (interactive
    (list
-    (y-or-n-p "Do you want to encrypt? ")
-    ))
+    (y-or-n-p "Do you want to encrypt? ")))
   (if arg
       (progn
-	(setq mime-edit-pgp-processing 'encrypt)
-	(message "This message will be encrypt.")
-	)
-    (if (eq mime-edit-pgp-processing 'encrypt)
-	(setq mime-edit-pgp-processing nil)
-      )
-    (message "This message will not be encrypt.")
-    ))
+	(or (memq 'encrypt mime-edit-pgp-processing)
+	    (setq mime-edit-pgp-processing 
+		  (nconc mime-edit-pgp-processing 
+			 (copy-sequence '(encrypt)))))
+	(message "This message will be encrypt."))
+    (setq mime-edit-pgp-processing
+	  (delq 'encrypt mime-edit-pgp-processing))
+    (message "This message will not be encrypt.")))
 
 (defun mime-edit-pgp-enclose-buffer ()
   (let ((beg (save-excursion
 	       (goto-char (point-min))
 	       (if (search-forward (concat "\n" mail-header-separator "\n"))
-		   (match-end 0)
-		 )))
-	(end (point-max))
-	)
+		   (match-end 0)))))
     (if beg
-	(cond ((eq mime-edit-pgp-processing 'sign)
-	       (mime-edit-enclose-pgp-signed-region beg end)
-	       )
-	      ((eq mime-edit-pgp-processing 'encrypt)
-	       (mime-edit-enclose-pgp-encrypted-region beg end)
-	       ))
-      )))
+	(dolist (pgp-processing mime-edit-pgp-processing)
+	  (case pgp-processing
+	    (sign
+	     (mime-edit-enclose-pgp-signed-region 
+	      beg (point-max)))
+	    (encrypt
+	     (mime-edit-enclose-pgp-encrypted-region 
+	      beg (point-max))))))))
 
 
 ;;; @ split
@@ -2395,29 +2423,22 @@ Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
   (insert mime-edit-mime-version-field-for-message/partial)
   (insert (format "\
 Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
-		  id number total separator))
-  )
+		  id number total separator)))
 
 (defun mime-edit-split-and-send
   (&optional cmd lines mime-edit-message-max-length)
   (interactive)
   (or lines
       (setq lines
-	    (count-lines (point-min) (point-max)))
-      )
+	    (count-lines (point-min) (point-max))))
   (or mime-edit-message-max-length
       (setq mime-edit-message-max-length
 	    (or (cdr (assq major-mode mime-edit-message-max-lines-alist))
-		mime-edit-message-default-max-lines))
-      )
-  (let* ((mime-edit-draft-file-name
-	  (or (buffer-file-name)
-	      (make-temp-name
-	       (expand-file-name "mime-draft" temporary-file-directory))))
-	 (separator mail-header-separator)
-	 (id (concat "\""
-		     (replace-space-with-underline (current-time-string))
-		     "@" (system-name) "\"")))
+		mime-edit-message-default-max-lines)))
+  (let ((separator mail-header-separator)
+	(id (concat "\""
+		    (replace-space-with-underline (current-time-string))
+		    "@" (system-name) "\"")))
     (run-hooks 'mime-edit-before-split-hook)
     (let ((the-buf (current-buffer))
 	  (copy-buf (get-buffer-create " *Original Message*"))
@@ -2435,9 +2456,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 	       (function
 		(lambda ()
 		  (interactive)
-		  (error "Split sender is not specified for `%s'." major-mode)
-		  ))
-	       ))
+		  (error "Split sender is not specified for `%s'." major-mode)))))
 	  (mime-edit-partial-number 1)
 	  data)
       (save-excursion
@@ -2449,13 +2468,11 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 	       (concat "^" (regexp-quote separator) "$") nil t)
 	      (let ((he (match-beginning 0)))
 		(replace-match "")
-		(narrow-to-region (point-min) he)
-		))
+		(narrow-to-region (point-min) he)))
 	  (goto-char (point-min))
 	  (while (re-search-forward mime-edit-split-blind-field-regexp nil t)
 	    (delete-region (match-beginning 0)
-			   (1+ (std11-field-end)))
-	    )))
+			   (1+ (std11-field-end))))))
       (while (< mime-edit-partial-number total)
 	(erase-buffer)
 	(save-excursion
@@ -2464,10 +2481,8 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 		      (point-min)
 		      (progn
 			(goto-line mime-edit-message-max-length)
-			(point))
-		      ))
-	  (delete-region (point-min)(point))
-	  )
+			(point))))
+	  (delete-region (point-min)(point)))
 	(mime-edit-insert-partial-header
 	 header subject id mime-edit-partial-number total separator)
 	(insert data)
@@ -2475,28 +2490,23 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 	  (message (format "Sending %d/%d..."
 			   mime-edit-partial-number total))
 	  (call-interactively command)
-	  (message (format "Sending %d/%d... done"
-			   mime-edit-partial-number total))
-	  )
+	  (message (format "Sending %d/%d...done"
+			   mime-edit-partial-number total)))
 	(setq mime-edit-partial-number
-	      (1+ mime-edit-partial-number))
-	)
+	      (1+ mime-edit-partial-number)))
       (erase-buffer)
       (save-excursion
 	(set-buffer copy-buf)
 	(setq data (buffer-string))
-	(erase-buffer)
-	)
+	(erase-buffer))
       (mime-edit-insert-partial-header
        header subject id mime-edit-partial-number total separator)
       (insert data)
       (save-excursion
 	(message (format "Sending %d/%d..."
 			 mime-edit-partial-number total))
-	(message (format "Sending %d/%d... done"
-			 mime-edit-partial-number total))
-	)
-      )))
+	(message (format "Sending %d/%d...done"
+			 mime-edit-partial-number total))))))
 
 (defun mime-edit-maybe-split-and-send (&optional cmd)
   (interactive)
@@ -2504,18 +2514,17 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
   (let ((mime-edit-message-max-length
 	 (or (cdr (assq major-mode mime-edit-message-max-lines-alist))
 	     mime-edit-message-default-max-lines))
-	(lines (count-lines (point-min) (point-max)))
-	)
+	(lines (count-lines (point-min) (point-max))))
     (if (and (> lines mime-edit-message-max-length)
 	     mime-edit-split-message)
-	(mime-edit-split-and-send cmd lines mime-edit-message-max-length)
-      )))
+	(mime-edit-split-and-send cmd lines mime-edit-message-max-length))))
 
 
 ;;; @ preview message
 ;;;
 
 (defvar mime-edit-buffer nil) ; buffer local variable
+(defvar mime-edit-temp-message-buffer nil) ; buffer local variable
 
 (defun mime-edit-preview-message ()
   "preview editing MIME message."
@@ -2526,42 +2535,40 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 	 (buf-name (buffer-name))
 	 (temp-buf-name (concat "*temp-article:" buf-name "*"))
 	 (buf (get-buffer temp-buf-name))
-	 )
+	 (pgp-processing mime-edit-pgp-processing))
     (if buf
 	(progn
 	  (switch-to-buffer buf)
-	  (erase-buffer)
-	  )
+	  (erase-buffer))
       (setq buf (get-buffer-create temp-buf-name))
-      (switch-to-buffer buf)
-      )
+      (switch-to-buffer buf))
     (insert str)
     (setq major-mode 'mime-temp-message-mode)
     (make-local-variable 'mail-header-separator)
     (setq mail-header-separator separator)
     (make-local-variable 'mime-edit-buffer)
     (setq mime-edit-buffer the-buf)
+    (setq mime-edit-pgp-processing pgp-processing)
 
     (run-hooks 'mime-edit-translate-hook)
     (mime-edit-translate-buffer)
     (goto-char (point-min))
     (if (re-search-forward
 	 (concat "^" (regexp-quote separator) "$"))
-	(replace-match "")
-      )
+	(replace-match ""))
     (mime-view-buffer)
-    ))
+    (make-local-variable 'mime-edit-temp-message-buffer)
+    (setq mime-edit-temp-message-buffer buf)))
 
 (defun mime-edit-quitting-method ()
   "Quitting method for mime-view."
-  (let ((temp mime-raw-buffer)
-	buf)
+  (let* ((temp mime-edit-temp-message-buffer)
+	 buf)
     (mime-preview-kill-buffer)
     (set-buffer temp)
     (setq buf mime-edit-buffer)
     (kill-buffer temp)
-    (switch-to-buffer buf)
-    ))
+    (switch-to-buffer buf)))
 
 (set-alist 'mime-preview-quitting-method-alist
 	   'mime-temp-message-mode
@@ -2577,148 +2584,219 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 	  "\\):")
   "Regexp for deleted header fields when `mime-edit-again' is called.")
 
-(defun mime-edit-decode-buffer (not-decode-text)
+(defsubst eliminate-top-spaces (string)
+  "Eliminate top sequence of space or tab in STRING."
+  (if (string-match "^[ \t]+" string)
+      (substring string (match-end 0))
+    string))
+
+(defun mime-edit-decode-multipart-in-buffer (content-type not-decode-text)
+  (let* ((subtype
+	  (or
+	   (cdr (assoc (mime-content-type-parameter content-type "protocol")
+		       '(("application/pgp-encrypted" . pgp-encrypted)
+			 ("application/pgp-signature" . pgp-signed))))
+	   (mime-content-type-subtype content-type)))
+	 (boundary (mime-content-type-parameter content-type "boundary"))
+	 (boundary-pat (concat "\n--" (regexp-quote boundary) "[ \t]*\n")))
+    (re-search-forward boundary-pat nil t)
+    (let ((bb (match-beginning 0)) eb tag)
+      (setq tag (format "\n--<<%s>>-{\n" subtype))
+      (goto-char bb)
+      (insert tag)
+      (setq bb (+ bb (length tag)))
+      (re-search-forward
+       (concat "\n--" (regexp-quote boundary) "--[ \t]*\n")
+       nil t)
+      (setq eb (match-beginning 0))
+      (replace-match (format "--}-<<%s>>\n" subtype))
+      (save-restriction
+	(narrow-to-region bb eb)
+	(goto-char (point-min))
+	(while (re-search-forward boundary-pat nil t)
+	  (let ((beg (match-beginning 0))
+		end)
+	    (delete-region beg (match-end 0))
+	    (save-excursion
+	      (if (re-search-forward boundary-pat nil t)
+		  (setq end (match-beginning 0))
+		(setq end (point-max)))
+	      (save-restriction
+		(narrow-to-region beg end)
+		(cond
+		 ((eq subtype 'pgp-encrypted)
+		  (when (and
+			 (progn
+			   (goto-char (point-min))
+			   (re-search-forward "^-+BEGIN PGP MESSAGE-+$"
+					      nil t))
+			 (prog1 
+			     (save-window-excursion
+			       (epg-decrypt-string
+				(epg-make-context)
+				(buffer-substring
+				 (match-beginning 0)
+				 (point-max))))
+			   (delete-region (point-min)(point-max))))
+		    (insert-buffer-substring pgg-output-buffer)
+		    (mime-edit-decode-message-in-buffer 
+		     nil not-decode-text)
+		    (delete-region (goto-char (point-min))
+				   (if (search-forward "\n\n" nil t)
+				       (match-end 0)
+				     (point-min)))
+		    (goto-char (point-max))))
+		 (t 
+		  (mime-edit-decode-message-in-buffer
+		   (if (eq subtype 'digest)
+		       (eval-when-compile
+			 (make-mime-content-type 'message 'rfc822)))
+		   not-decode-text)
+		  (goto-char (point-max))))))))))
+    (goto-char (point-min))
+    (or (= (point-min) 1)
+	(delete-region (point-min)
+		       (if (search-forward "\n\n" nil t)
+			   (match-end 0)
+			 (point-min))))))
+
+(defun mime-edit-decode-single-part-in-buffer
+  (content-type not-decode-text &optional content-disposition)
+  (let* ((type (mime-content-type-primary-type content-type))
+	 (subtype (mime-content-type-subtype content-type))
+	 (ctype (format "%s/%s" type subtype))
+	 charset
+	 (pstr (let ((bytes (+ 14 (length ctype))))
+		 (mapconcat (function
+			     (lambda (attr)
+			       (if (string= (car attr) "charset")
+				   (progn
+				     (setq charset (cdr attr))
+				     "")
+				 (let* ((str (concat (car attr)
+						     "=" (cdr attr)))
+					(bs (length str)))
+				   (setq bytes (+ bytes bs 2))
+				   (if (< bytes 76)
+				       (concat "; " str)
+				     (setq bytes (+ bs 1))
+				     (concat ";\n " str)
+				     )))))
+			    (mime-content-type-parameters content-type) "")))
+	 encoding
+	 encoded
+	 (limit (save-excursion
+		  (if (search-forward "\n\n" nil t)
+		      (1- (point)))))
+	 (disposition-type
+	  (mime-content-disposition-type content-disposition))
+	 (disposition-str
+	  (if disposition-type
+	      (let ((bytes (+ 21 (length (format "%s" disposition-type)))))
+		(mapconcat (function
+			    (lambda (attr)
+			      (let* ((str (concat
+					   (car attr)
+					   "="
+					   (if (string-equal "filename"
+							     (car attr))
+					       (std11-wrap-as-quoted-string
+						(cdr attr))
+					     (cdr attr))))
+				     (bs (length str)))
+				(setq bytes (+ bytes bs 2))
+				(if (< bytes 76)
+				    (concat "; " str)
+				  (setq bytes (+ bs 1))
+				  (concat ";\n " str)
+				  ))))
+			   (mime-content-disposition-parameters
+			    content-disposition)
+			   "")))))
+    (if disposition-type
+	(setq pstr (format "%s\nContent-Disposition: %s%s"
+			   pstr disposition-type disposition-str)))
+    (save-excursion
+      (if (re-search-forward
+	   "^Content-Transfer-Encoding:" limit t)
+	  (let ((beg (match-beginning 0))
+		(hbeg (match-end 0))
+		(end (std11-field-end limit)))
+	    (setq encoding
+		  (downcase
+		   (eliminate-top-spaces
+		    (std11-unfold-string
+		     (buffer-substring hbeg end)))))
+	    (if (or charset (eq type 'text))
+		(progn
+		  (delete-region beg (1+ end))
+		  (goto-char (point-min))
+		  (if (search-forward "\n\n" nil t)
+		      (progn
+			(mime-decode-region
+			 (match-end 0)(point-max) encoding)
+			(setq encoded t
+			      encoding nil))))))))
+    (if (and (eq type 'text)
+	     (or encoded (not not-decode-text)))
+	(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))))
+      (if (and (eq type 'text)
+	       (eq subtype 'x-rot13-47-48))
+	  (mule-caesar-region he (point-max)))
+      (if (= (point-min) 1)
+	  (progn
+	    (goto-char he)
+	    (insert
+	     (concat "\n"
+		     (mime-create-tag
+		      (format "%s/%s%s" type subtype pstr)
+		      encoding))))
+	(delete-region (point-min) he)
+	(insert
+	 (mime-create-tag (format "%s/%s%s" type subtype pstr)
+			  encoding))))))
+
+;;;###autoload
+(defun mime-edit-decode-message-in-buffer (&optional default-content-type
+						     not-decode-text)
   (save-excursion
     (goto-char (point-min))
-    (let ((ctl (mime-read-Content-Type)))
+    (let ((ctl (or (mime-read-Content-Type)
+		   default-content-type)))
       (if ctl
-	  (let ((type (mime-content-type-primary-type ctl))
-		(stype (mime-content-type-subtype ctl))
-		(params (mime-content-type-parameters ctl)))
+	  (let ((type (mime-content-type-primary-type ctl)))
 	    (cond
-	     ((and (eq type 'application)(eq stype 'pgp-signature))
-	      (delete-region (point-min)(point-max))
-	      )
+	     ((and (eq type 'application)
+		   (eq (mime-content-type-subtype ctl) 'pgp-signature))
+	      (delete-region (point-min)(point-max)))
 	     ((eq type 'multipart)
-	      (let* ((boundary (cdr (assoc "boundary" params)))
-		     (boundary-pat
-		      (concat "\n--" (regexp-quote boundary) "[ \t]*\n"))
-		     )
-		(re-search-forward boundary-pat nil t)
-		(let ((bb (match-beginning 0)) eb tag)
-		  (setq tag (format "\n--<<%s>>-{\n" stype))
-		  (goto-char bb)
-		  (insert tag)
-		  (setq bb (+ bb (length tag)))
-		  (re-search-forward
-		   (concat "\n--" (regexp-quote boundary) "--[ \t]*\n")
-		   nil t)
-		  (setq eb (match-beginning 0))
-		  (replace-match (format "--}-<<%s>>\n" stype))
-		  (save-restriction
-		    (narrow-to-region bb eb)
-		    (goto-char (point-min))
-		    (while (re-search-forward boundary-pat nil t)
-		      (let ((beg (match-beginning 0))
-			    end)
-			(delete-region beg (match-end 0))
-			(save-excursion
-			  (if (re-search-forward boundary-pat nil t)
-			      (setq end (match-beginning 0))
-			    (setq end (point-max))
-			    )
-			  (save-restriction
-			    (narrow-to-region beg end)
-			    (mime-edit-decode-buffer not-decode-text)
-			    (goto-char (point-max))
-			    ))))
-		    ))
-		(goto-char (point-min))
-		(or (= (point-min) 1)
-		    (delete-region (point-min)
-				   (if (search-forward "\n\n" nil t)
-				       (match-end 0)
-				     (point-min)
-				     )))
-		))
+	      (mime-edit-decode-multipart-in-buffer ctl not-decode-text))
 	     (t
-	      (let* ((ctype (format "%s/%s" type stype))
-		     charset
-		     (pstr
-		      (let ((bytes (+ 14 (length ctype))))
-			(mapconcat (function
-				    (lambda (attr)
-				      (if (string= (car attr) "charset")
-					  (progn
-					    (setq charset (cdr attr))
-					    "")
-					(let* ((str
-						(concat (car attr)
-							"=" (cdr attr))
-						)
-					       (bs (length str))
-					       )
-					  (setq bytes (+ bytes bs 2))
-					  (if (< bytes 76)
-					      (concat "; " str)
-					    (setq bytes (+ bs 1))
-					    (concat ";\n " str)
-					    )
-					  ))))
-				   params "")))
-		     encoding
-		     encoded
-		     (limit (save-excursion
-			      (if (search-forward "\n\n" nil t)
-				  (1- (point))))))
-		(save-excursion
-		  (if (re-search-forward
-		       "^Content-Transfer-Encoding:" limit t)
-		      (let ((beg (match-beginning 0))
-			    (hbeg (match-end 0))
-			    (end (std11-field-end)))
-			(setq encoding
-			      (downcase
-			       (eliminate-top-spaces
-				(std11-unfold-string
-				 (buffer-substring hbeg end)))))
-			(if (or charset (eq type 'text))
-			    (progn
-			      (delete-region beg (1+ end))
-			      (goto-char (point-min))
-			      (if (search-forward "\n\n" nil t)
-				  (progn
-				    (mime-decode-region
-				     (match-end 0)(point-max) encoding)
-				    (setq encoded t
-					  encoding nil)
-				    )))))))
-		(if (or encoded (not not-decode-text))
-		    (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)
-			 )))
-		  (if (and (eq type 'text)
-			   (eq stype 'x-rot13-47-48))
-		      (mule-caesar-region he (point-max))
-		    )
-		  (if (= (point-min) 1)
-		      (progn
-			(goto-char he)
-			(insert
-			 (concat "\n"
-				 (mime-create-tag
-				  (format "%s/%s%s" type stype pstr)
-				  encoding)))
-			)
-		    (delete-region (point-min) he)
-		    (insert
-		     (mime-create-tag
-		      (format "%s/%s%s" type stype pstr)
-		      encoding))
-		    ))
-		))))
+	      (mime-edit-decode-single-part-in-buffer
+	       ctl not-decode-text (mime-read-Content-Disposition)))))
 	(or not-decode-text
 	    (decode-mime-charset-region (point-min) (point-max)
-					default-mime-charset)
-	    )
-	))))
+					default-mime-charset)))
+      (if (= (point-min) 1)
+	  (progn
+	    (save-restriction
+	      (std11-narrow-to-header)
+	      (goto-char (point-min))
+	      (while (re-search-forward
+		      mime-edit-again-ignored-field-regexp nil t)
+		(delete-region (match-beginning 0) (1+ (std11-field-end)))))
+	    (mime-decode-header-in-buffer (not not-decode-text)))))))
 
+;;;###autoload
 (defun mime-edit-again (&optional not-decode-text no-separator not-turn-on)
   "Convert current buffer to MIME-Edit buffer and turn on MIME-Edit mode.
 Content-Type and Content-Transfer-Encoding header fields will be
@@ -2728,23 +2806,14 @@ converted to MIME-Edit tags."
   (if (search-forward
        (concat "\n" (regexp-quote mail-header-separator) "\n")
        nil t)
-      (replace-match "\n\n")
-    )
-  (mime-edit-decode-buffer not-decode-text)
+      (replace-match "\n\n"))
+  (mime-edit-decode-message-in-buffer nil not-decode-text)
   (goto-char (point-min))
-  (save-restriction
-    (std11-narrow-to-header)
-    (goto-char (point-min))
-    (while (re-search-forward mime-edit-again-ignored-field-regexp nil t)
-      (delete-region (match-beginning 0) (1+ (std11-field-end)))
-      ))
   (or no-separator
       (and (re-search-forward "^$")
-	   (replace-match mail-header-separator)
-	   ))
+	   (replace-match mail-header-separator)))
   (or not-turn-on
-      (turn-on-mime-edit)
-      ))
+      (turn-on-mime-edit)))
 
 
 ;;; @ end