tm 7.80.
[elisp/tm.git] / tm-edit.el
index 01c0c78..15b0e7c 100644 (file)
@@ -1,30 +1,30 @@
-;;;
 ;;; tm-edit.el --- Simple MIME Composer for GNU Emacs
-;;;
 
-;; Copyright (C) 1993 UMEDA Masanobu
-;; Copyright (C) 1994,1995 MORIOKA Tomohiko
+;; Copyright (C) 1993 .. 1996 Free Software Foundation, Inc.
 
 ;; Author: UMEDA Masanobu <umerin@mse.kyutech.ac.jp>
 ;;         MORIOKA Tomohiko <morioka@jaist.ac.jp>
-;; Version: $Revision: 7.31 $
+;; Maintainer: MORIOKA Tomohiko <morioka@jaist.ac.jp>
+;; Created: 1994/08/21 renamed from mime.el
+;; Version: $Revision: 7.80 $
 ;; Keywords: mail, news, MIME, multimedia, multilingual
 
-;; This file is not part of GNU Emacs.
+;; This file is part of tm (Tools for MIME).
 
-;; GNU Emacs is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 2, or (at your option)
-;; any later version.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the GNU General Public License as
+;; published by the Free Software Foundation; either version 2, or (at
+;; your option) any later version.
 
-;; GNU Emacs is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
+;; This program is distributed in the hope that it will be useful, but
+;; WITHOUT ANY WARRANTY; without even the implied warranty of
+;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+;; General Public License for more details.
 
 ;; 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, 675 Mass Ave, Cambridge, MA 02139, USA.
+;; along with this program; see the file COPYING.  If not, write to
+;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
 
 ;;; Commentary:
 
@@ -49,7 +49,7 @@
 ;; definition to load mime/editor-mode automatically:
 ;;
 ;; (autoload 'mime/editor-mode "tm-edit"
-;;     "Minor mode for editing MIME message." t)
+;;           "Minor mode for editing MIME message." t)
 ;;
 ;; In case of Mail mode (includes VM mode), you need the following
 ;; hook definition:
 ;;
 ;;--[[audio/basic][base64]]^M...audio encoded in base64 comes here...
 
-;; LCD Archive Entry:
-;; mime|Masanobu UMEDA|umerin@mse.kyutech.ac.jp|
-;; Simple MIME Composer|
-;; $Date: 1995/12/07 10:18:56 $|$Revision: 7.31 $|~/misc/mime.el.Z|
-
 ;;; Code:
 
 (require 'sendmail)
 ;;;
 
 (defconst mime-editor/RCS-ID
-  "$Id: tm-edit.el,v 7.31 1995/12/07 10:18:56 morioka Exp $")
+  "$Id: tm-edit.el,v 7.80 1996/08/30 15:16:52 morioka Exp $")
 
 (defconst mime-editor/version (get-version-string mime-editor/RCS-ID))
 
+(defconst mime-editor/version-name
+  (concat "tm-edit " mime-editor/version))
+
 
 ;;; @ variables
 ;;;
 (defvar mime-prefix "\C-c\C-x"
   "*Keymap prefix for MIME commands.")
 
-(defvar mime-signature-file "~/.signature.rtf"
-  "*Signature file to be included as a part of a multipart message.")
-
 (defvar mime-ignore-preceding-spaces nil
   "*Ignore preceding white spaces if non-nil.")
 
@@ -153,31 +148,6 @@ If non-nil, the text tag is not inserted unless something different.")
 (defvar mime-auto-hide-body t
   "*Hide non-textual body encoded in base64 after insertion if non-nil.")
 
-(defvar mime-body-charset-chooser
-  (cond ((boundp 'NEMACS)
-        (function mime-body-charset-chooser-for-nemacs))
-       ((featurep 'mule)
-        (function mime-body-charset-chooser-for-mule))
-       ((string-match "^19\\." emacs-version)
-        (function mime-body-charset-chooser-for-emacs19))
-       (t                              ;ASCII only emacs
-        (function mime-body-charset-chooser-for-emacs18)))
-  "*Function to identify charset and encoding of a text in a given region.
-The value is a form of (CHARSET . ENCODING), where ENCODING must be a
-full name, such as base64.")
-
-(defvar mime-string-encoder
-  (cond ((boundp 'NEMACS)
-        (function mime-string-encoder-for-nemacs))
-       ((featurep 'mule)
-        (function mime-string-encoder-for-mule))
-       ((string-match "^19\\." emacs-version)
-        (function mime-string-encoder-for-emacs19))
-       (t                              ;ASCII only emacs
-        (function mime-string-encoder-for-emacs18)))
-  "*Function to encode a string for given encoding method.
-The method is a form of (CHARSET . ENCODING).")
-
 (defvar mime-voice-recorder
   (function mime-voice-recorder-for-sun)
   "*Function to record a voice message and return a buffer that contains it.")
@@ -187,8 +157,7 @@ The method is a form of (CHARSET . ENCODING).")
 
 (defvar mime-editor/translate-hook nil
   "*Hook called before translating into a MIME compliant message.
-To insert a signature file specified by mime-signature-file
-(`.signature.rtf' by default) automatically, call the function
+To insert a signature file automatically, call the function
 `mime-editor/insert-signature' from this hook.")
 
 (defvar mime-editor/exit-hook nil
@@ -236,10 +205,7 @@ To insert a signature file specified by mime-signature-file
      ("rfc822")
      )
     ("application"
-     ("octet-stream"
-      ("name")
-      ("type" "" "tar" "shar")
-      ("conversions"))
+     ("octet-stream" ("type" "" "tar" "shar"))
      ("postscript")
      ("x-kiss" ("x-cnf")))
     ("image"
@@ -247,6 +213,7 @@ To insert a signature file specified by mime-signature-file
      ("jpeg")
      ("tiff")
      ("x-pic")
+     ("x-mag")
      ("x-xwd")
      ("x-xbm")
      )
@@ -257,56 +224,168 @@ To insert a signature file specified by mime-signature-file
 
 (defvar mime-file-types
   '(("\\.rtf$"
-     "text"    "richtext"      nil     nil)
+     "text"    "richtext"      nil
+     nil
+     nil               nil)
     ("\\.html$"
-     "text"    "html"          nil     nil)
+     "text"    "html"          nil
+     nil
+     nil               nil)
     ("\\.ps$"
-     "application" "postscript"        nil     "quoted-printable")
-    ("\\.gif$"
-     "image"   "gif"           nil     "base64"
-     (("Content-Description" . file))
+     "application" "postscript"        nil
+     "quoted-printable"
+     "attachment"      (("filename" . file))
      )
     ("\\.jpg$"
-     "image"   "jpeg"          nil     "base64")
-    ("\\.xwd$"
-     "image"   "x-xwd"         nil     "base64")
-    ("\\.xbm$"
-     "image"   "x-xbm"         nil     "base64")
-    ("\\.pic$"
-     "image"   "x-pic"         nil     "base64"
-     (("Content-Description" . file))
+     "image"   "jpeg"          nil
+     "base64"
+     "inline"          (("filename" . file))
+     )
+    ("\\.gif$"
+     "image"   "gif"           nil
+     "base64"
+     "inline"          (("filename" . file))
      )
     ("\\.tiff$"
-     "image"   "tiff"          nil     "base64")
+     "image"   "tiff"          nil
+     "base64"
+     "inline"          (("filename" . file))
+     )
+    ("\\.pic$"
+     "image"   "x-pic"         nil
+     "base64"
+     "inline"          (("filename" . file))
+     )
+    ("\\.mag$"
+     "image"   "x-mag"         nil
+     "base64"
+     "inline"          (("filename" . file))
+     )
+    ("\\.xbm$"
+     "image"   "x-xbm"         nil
+     "base64"
+     "inline"          (("filename" . file))
+     )
+    ("\\.xwd$"
+     "image"   "x-xwd"         nil
+     "base64"
+     "inline"          (("filename" . file))
+     )
     ("\\.au$"
-     "audio"   "basic"         nil     "base64")
+     "audio"   "basic"         nil
+     "base64"
+     "attachment"              (("filename" . file))
+     )
     ("\\.mpg$"
-     "video"   "mpeg"          nil     "base64")
+     "video"   "mpeg"          nil
+     "base64"
+     "attachment"      (("filename" . file))
+     )
     ("\\.el$"
-     "application" "octet-stream" (("name" . file)
-                                  ("type" . "emacs-lisp")) "7bit")
+     "application" "octet-stream" (("type" . "emacs-lisp"))
+     "7bit"
+     "attachment"      (("filename" . file))
+     )
     ("\\.lsp$"
-     "application" "octet-stream" (("name" . file)
-                                  ("type" . "common-lisp")) "7bit")
-    ("\\.tar.gz$"
-     "application" "octet-stream" (("name" . file)
-                                  ("type" . "tar")
-                                  ("conversions" . "gzip")) nil)
+     "application" "octet-stream" (("type" . "common-lisp"))
+     "7bit"
+     "attachment"      (("filename" . file))
+     )
+    ("\\.tar\\.gz$"
+     "application" "octet-stream" (("type" . "tar+gzip"))
+     nil
+     "attachment"      (("filename" . file))
+     )
+    ("\\.tgz$"
+     "application" "octet-stream" (("type" . "tar+gzip"))
+     nil
+     "attachment"      (("filename" . file))
+     )
+    ("\\.tar\\.Z$"
+     "application" "octet-stream" (("type" . "tar+compress"))
+     nil
+     "attachment"      (("filename" . file))
+     )
+    ("\\.taz$"
+     "application" "octet-stream" (("type" . "tar+compress"))
+     nil
+     "attachment"      (("filename" . file))
+     )
+    ("\\.gz$"
+     "application" "octet-stream" (("type" . "gzip"))
+     nil
+     "attachment"      (("filename" . file))
+     )
+    ("\\.Z$"
+     "application" "octet-stream" (("type" . "compress"))
+     nil
+     "attachment"      (("filename" . file))
+     )
+    ("\\.lzh$"
+     "application" "octet-stream" (("type" . "lha"))
+     nil
+     "attachment"      (("filename" . file))
+     )
+    ("\\.zip$"
+     "application" "zip" nil
+     nil
+     "attachment"      (("filename" . file))
+     )
     ("\\.diff$"
-     "application" "octet-stream" (("name" . file)
-                                  ("type" . "patch")) nil)
+     "application" "octet-stream" (("type" . "patch"))
+     nil
+     "attachment"      (("filename" . file))
+     )
+    ("\\.patch$"
+     "application" "octet-stream" (("type" . "patch"))
+     nil
+     "attachment"      (("filename" . file))
+     )
     ("\\.signature"
      "text"    "plain"         nil     nil)
-    (".*"      nil             nil     nil     nil)
+    (".*"
+     "application" "octet-stream" nil
+     nil
+     "attachment"      (("filename" . file))
+     )
     )
   "*Alist of file name, types, parameters, and default encoding.
 If encoding is nil, it is determined from its contents.")
 
+;;; @@ about charset, encoding and transfer-level
+;;;
+
+(defvar mime-editor/transfer-level 7
+  "*A number of network transfer level. It should be bigger than 7.")
+(make-variable-buffer-local 'mime-editor/transfer-level)
+
+(defvar mime-editor/transfer-level-string
+  (mime/encoding-name mime-editor/transfer-level 'not-omit)
+  "*A string formatted version of mime/defaul-transfer-level")
+(make-variable-buffer-local 'mime-editor/transfer-level-string)
+
+(defun mime-editor/make-charset-default-encoding-alist (transfer-level)
+  (mapcar (function
+          (lambda (charset-type)
+            (let ((charset  (car charset-type))
+                  (type     (nth 1 charset-type))
+                  (encoding (nth 2 charset-type))
+                  )
+              (if (<= type transfer-level)
+                  (cons charset (mime/encoding-name type))
+                (cons charset encoding)
+                ))))
+         mime-charset-type-list))
+
+(defvar mime-editor/charset-default-encoding-alist
+  (mime-editor/make-charset-default-encoding-alist mime-editor/transfer-level))
+(make-variable-buffer-local 'mime-editor/charset-default-encoding-alist)
+
 ;;; @@ about message inserting
 ;;;
 
 (defvar mime-editor/yank-ignored-field-list
-  '("Received" "Sender" "Approved" "Path" "Status" "X-VM-.*" "X-UIDL")
+  '("Received" "Approved" "Path" "Replied" "Status" "X-VM-.*" "X-UIDL")
   "Delete these fields from original message when it is inserted
 as message/rfc822 part.
 Each elements are regexp of field-name. [tm-edit.el]")
@@ -337,69 +416,38 @@ Each elements are regexp of field-name. [tm-edit.el]")
 (defvar mime-editor/split-blind-field-regexp
   "\\(^[BDFbdf]cc:\\|^cc:[ \t]*$\\)")
 
-(defvar mime-editor/message-default-sender-alist
-  '((mail-mode . mail-send-and-exit)
-    (mh-letter-mode . mh-send-letter)
-    (news-reply-mode . gnus-inews-news)
-    ))
+(defvar mime-editor/split-message-sender-alist nil)
 
-(defvar mime-editor/split-message-sender-alist
-  '((mail-mode
-     . (lambda ()
-        (interactive)
-        (sendmail-send-it)
-        ))
-    (mh-letter-mode
-     . (lambda (&optional arg)
-        (interactive "P")
-        (write-region (point-min) (point-max)
-                      mime-editor/draft-file-name nil 'no-message)
-        (cond (arg
-               (pop-to-buffer "MH mail delivery")
-               (erase-buffer)
-               (mh-exec-cmd-output mh-send-prog t "-watch" "-nopush"
-                                   "-nodraftfolder"
-                                   mh-send-args mime-editor/draft-file-name)
-               (goto-char (point-max)) ; show the interesting part
-               (recenter -1)
-               (sit-for 1))
-              (t
-               (apply 'mh-exec-cmd-quiet t mh-send-prog 
-                      (mh-list-to-string
-                       (list "-nopush" "-nodraftfolder"
-                             "-noverbose" "-nowatch"
-                             mh-send-args mime-editor/draft-file-name)))))
-        ))
-    ))
+(defvar mime-editor/news-reply-mode-server-running nil)
 
-(defvar mime-editor/window-config-alist
-  '((mail-mode       . nil)
-    (mh-letter-mode  . mh-previous-window-config)
-    (news-reply-mode . (cond ((boundp 'gnus-winconf-post-news)
-                             (prog1
-                                 gnus-winconf-post-news
-                               (setq gnus-winconf-post-news nil)
-                               ))
-                            ((boundp 'gnus-prev-winconf)
-                             (prog1
-                                 gnus-prev-winconf
-                               (setq gnus-prev-winconf nil)
-                               ))
-                            ))
-    ))
 
-(defvar mime-editor/news-reply-mode-server-running nil)
+;;; @@ about PGP
+;;;
+
+(defvar mime-editor/signing-type nil
+  "*PGP signing type (pgp-elkins, pgp-kazu or nil). [tm-edit.el]")
+
+(defvar mime-editor/encrypting-type nil
+  "*PGP encrypting type (pgp-elkins, pgp-kazu or nil). [tm-edit.el]")
+
+(if (or mime-editor/signing-type mime-editor/encrypting-type)
+    (require 'mailcrypt)
+  )
+
 
 ;;; @@ about tag
 ;;;
 
 (defconst mime-editor/single-part-tag-regexp
-  "^--[[][[]\\([^]]*\\)]\\([[]\\([^]]*\\)]\\|\\)]"
+  "--[[][[]\\([^]]*\\)]\\([[]\\([^]]*\\)]\\|\\)]"
   "*Regexp of MIME tag in the form of [[CONTENT-TYPE][ENCODING]].")
 
-(defconst mime-editor/multipart-beginning-regexp "^--<<\\([^<>]+\\)>>-{\n")
+(defconst mime-editor/quoted-single-part-tag-regexp
+  (concat "- " (substring mime-editor/single-part-tag-regexp 1)))
 
-(defconst mime-editor/multipart-end-regexp "^--}-<<\\([^<>]+\\)>>\n")
+(defconst mime-editor/multipart-beginning-regexp "--<<\\([^<>]+\\)>>-{\n")
+
+(defconst mime-editor/multipart-end-regexp "--}-<<\\([^<>]+\\)>>\n")
 
 (defconst mime-editor/beginning-tag-regexp
   (regexp-or mime-editor/single-part-tag-regexp
@@ -431,7 +479,6 @@ Each elements are regexp of field-name. [tm-edit.el]")
 ;;;
 
 (defvar mime/editor-mode-old-local-map nil)
-(defvar mime/editor-mode-old-selective-display nil)
 (defvar mime/editing-buffer nil)
 
 \f
@@ -443,9 +490,11 @@ Each elements are regexp of field-name. [tm-edit.el]")
 Tspecials means any character that matches with it in header must be quoted.")
 
 (defconst mime-editor/mime-version-value
-  (format "1.0 (generated by tm-edit %s)" mime-editor/version)
+  (concat "1.0 (generated by " mime-editor/version-name ")")
   "MIME version number.")
 
+(defconst mime-editor/mime-map (make-sparse-keymap)
+  "Keymap for MIME commands.")
 
 ;;; @ keymap and menu
 ;;;
@@ -453,8 +502,6 @@ Tspecials means any character that matches with it in header must be quoted.")
 (defvar mime/editor-mode-flag nil)
 (make-variable-buffer-local 'mime/editor-mode-flag)
 
-(set-alist 'minor-mode-alist 'mime/editor-mode-flag '(" MIME-Edit"))
-
 (defun mime-editor/define-keymap (keymap)
   "Add mime-editor commands to KEYMAP."
   (if (not (keymapp keymap))
@@ -467,16 +514,55 @@ Tspecials means any character that matches with it in header must be quoted.")
     (define-key keymap "\C-m" 'mime-editor/insert-mail)
     (define-key keymap "\C-w" 'mime-editor/insert-signature)
     (define-key keymap "\C-s" 'mime-editor/insert-signature)
+    (define-key keymap "\C-k" 'mime-editor/insert-key)
     (define-key keymap "t"    'mime-editor/insert-tag)
     (define-key keymap "a"    'mime-editor/enclose-alternative-region)
     (define-key keymap "p"    'mime-editor/enclose-parallel-region)
     (define-key keymap "m"    'mime-editor/enclose-mixed-region)
     (define-key keymap "d"    'mime-editor/enclose-digest-region)
+    (define-key keymap "s"    'mime-editor/enclose-signed-region)
+    (define-key keymap "e"    'mime-editor/enclose-encrypted-region)
+    (define-key keymap "q"    'mime-editor/enclose-quote-region)
+    (define-key keymap "7"    'mime-editor/set-transfer-level-7bit)
+    (define-key keymap "8"    'mime-editor/set-transfer-level-8bit)
+    (define-key keymap "/"    'mime-editor/set-split)
+    (define-key keymap "v"    'mime-editor/set-sign)
+    (define-key keymap "h"    'mime-editor/set-encrypt)
     (define-key keymap "\C-p" 'mime-editor/preview-message)
     (define-key keymap "\C-z" 'mime-editor/exit)
     (define-key keymap "?"    'mime-editor/help)
     ))
 
+(mime-editor/define-keymap mime-editor/mime-map)
+
+(defun mime-editor/toggle-mode ()
+  (interactive)
+  (if mime/editor-mode-flag
+      (mime-editor/exit 'nomime)
+    (mime/editor-mode)
+    ))
+
+(cond (running-xemacs
+       (defconst mime-editor/minor-mime-map nil "Keymap for MIME commands.")
+       (or mime-editor/minor-mime-map
+          (progn
+            (setq mime-editor/minor-mime-map 
+                  (make-sparse-keymap 'mime-editor/minor-mime-map))
+            (define-key
+              mime-editor/minor-mime-map mime-prefix mime-editor/mime-map)
+            ))
+       (add-minor-mode 'mime/editor-mode-flag
+                      '((" MIME-Edit "  mime-editor/transfer-level-string))
+                      mime-editor/minor-mime-map
+                      nil
+                      'mime-editor/toggle-mode)
+       )
+      (t
+       (set-alist 'minor-mode-alist
+                 'mime/editor-mode-flag
+                 '((" MIME-Edit "  mime-editor/transfer-level-string))))
+      )
+
 (defconst mime-editor/menu-title "MIME-Edit")
 
 (defconst mime-editor/menu-list
@@ -494,7 +580,15 @@ Tspecials means any character that matches with it in header must be quoted.")
     (parallel  "Enclose as parallel"   mime-editor/enclose-parallel-region)
     (mixed     "Enclose as serial"     mime-editor/enclose-mixed-region)
     (digest    "Enclose as digest"     mime-editor/enclose-digest-region)
+    (signed    "Enclose as signed"     mime-editor/enclose-signed-region)
+    (encrypted "Enclose as encrypted"  mime-editor/enclose-encrypted-region)
+    (quote     "Verbatim region"       mime-editor/enclose-quote-region)
+    (key       "Insert Public Key"     mime-editor/insert-key)
+    (split     "About split"           mime-editor/set-split)
+    (sign      "About sign"            mime-editor/set-sign)
+    (encrypt   "About encryption"      mime-editor/set-encrypt)
     (preview   "Preview Message"       mime-editor/preview-message)
+    (level     "Toggle transfer-level" mime-editor/toggle-transfer-level)
     )
   "MIME-edit menubar entry.")
 
@@ -513,7 +607,7 @@ Tspecials means any character that matches with it in header must be quoted.")
          (reverse mime-editor/menu-list)
          ))
 
-;;; modified by Pekka Marjola <pema@niksula.hut.fi>
+;;; modified by Pekka Marjola <pema@iki.fi>
 ;;;    1995/9/5 (c.f. [tm-en:69])
 (defun mime-editor/define-menu-for-xemacs ()
   "Define menu for Emacs 19."
@@ -532,8 +626,7 @@ Tspecials means any character that matches with it in header must be quoted.")
 
 ;;; modified by Steven L. Baur <steve@miranova.com>
 ;;;    1995/12/6 (c.f. [tm-en:209])
-(if (and (string-match "XEmacs\\|Lucid" emacs-version)
-        (not (boundp 'mime-editor/popup-menu-for-xemacs)))
+(if (and running-xemacs (not (boundp 'mime-editor/popup-menu-for-xemacs)))
     (setq mime-editor/popup-menu-for-xemacs
          (append '("MIME Commands" "---")
                  (mapcar (function (lambda (item)
@@ -553,32 +646,46 @@ Tspecials means any character that matches with it in header must be quoted.")
   "MIME minor mode for editing the tagged MIME message.
 
 In this mode, basically, the message is composed in the tagged MIME
-format.  The message tag looks like:
+format. The message tag looks like:
 
        `--[[text/plain; charset=ISO-2022-JP][7bit]]'.
 
 The tag specifies the MIME content type, subtype, optional parameters
-and transfer encoding of the message following the tag.  Messages
-without any tag are treated as `text/plain' by default.  Charset and
+and transfer encoding of the message following the tag. Messages
+without any tag are treated as `text/plain' by default. Charset and
 transfer encoding are automatically defined unless explicitly
-specified.  Binary messages such as audio and image are usually hidden
-using selective-display facility.  The messages in the tagged MIME
-format are automatically translated into a MIME compliant message when
-exiting this mode.
+specified. Binary messages such as audio and image are usually hidden.
+The messages in the tagged MIME format are automatically translated
+into a MIME compliant message when exiting this mode.
 
-Available charsets depend on Emacs version being used.  The following
+Available charsets depend on Emacs version being used. The following
 lists the available charsets of each emacs.
 
-Emacs18:       US-ASCII is only available.
+EMACS 18:      US-ASCII is only available.
 NEmacs:                US-ASCII and ISO-2022-JP are available.
-Emacs19:       US-ASCII and ISO-8859-1 are available.
-Mule:          US-ASCII, ISO-8859-* (except for ISO-8859-6),
-               ISO-2022-JP, ISO-2022-JP-2 and ISO-2022-INT-1 are available.
-
-ISO-2022-JP-2 and ISO-2022-INT-1 charsets used in Mule is expected to
-be used to represent multilingual text in intermixed manner.  Any
+EMACS 19:      US-ASCII and ISO-8859-1 (or other charset) are available.
+XEmacs 19:     US-ASCII and ISO-8859-1 (or other charset) are available.
+Mule:          US-ASCII, ISO-8859-* (except for ISO-8859-5), KOI8-R,
+               ISO-2022-JP, ISO-2022-JP-2, ISO-2022-KR, BIG5 and
+               ISO-2022-INT-1 are available.
+
+ISO-2022-JP-2 and ISO-2022-INT-1 charsets used in mule is expected to
+be used to represent multilingual text in intermixed manner. Any
 languages that has no registered charset are represented as either
-ISO-2022-JP-2 or ISO-2022-INT-1 in Mule.
+ISO-2022-JP-2 or ISO-2022-INT-1 in mule.
+
+If you want to use non-ISO-8859-1 charset in EMACS 19 or XEmacs 19,
+please set variable `default-mime-charset'. This variable must be
+symbol of which name is a MIME charset.
+
+If you want to add more charsets in mule, please set variable
+`charsets-mime-charset-alist'. This variable must be alist of which
+key is list of leading-char/charset and value is symbol of MIME
+charset. (leading-char is a term of MULE 1.* and 2.*. charset is a
+term of XEmacs/mule, mule merged EMACS and MULE 3.*) If name of
+coding-system is different as MIME charset, please set variable
+`mime-charset-coding-system-alist'. This variable must be alist of
+which key is MIME charset and value is coding-system.
 
 Following commands are available in addition to major mode commands:
 \\[mime-editor/insert-text]    insert a text message.
@@ -593,9 +700,12 @@ Following commands are available in addition to major mode commands:
 \\[mime-editor/enclose-parallel-region]        enclose as multipart/parallel.
 \\[mime-editor/enclose-mixed-region]   enclose as multipart/mixed.
 \\[mime-editor/enclose-digest-region]  enclose as multipart/digest.
+\\[mime-editor/enclose-signed-region]  enclose as PGP signed.
+\\[mime-editor/enclose-encrypted-region]       enclose as PGP encrypted.
+\\[mime-editor/insert-key]     insert PGP public key.
 \\[mime-editor/preview-message]        preview editing MIME message.
 \\[mime-editor/exit]   exit and translate into a MIME compliant message.
-\\[mime-editor/maybe-translate]        exit, translate and run the original command.
+\\[mime-editor/maybe-translate]        exit and translate if in MIME mode, then split.
 \\[mime-editor/help]   show this help.
 
 Additional commands are available in some major modes:
@@ -622,10 +732,6 @@ User customizable variables (not documented all of them):
  mime-prefix
     Specifies a key prefix for MIME minor mode commands.
 
- mime-signature-file
-    Specifies a signature file to be included as part of a multipart
-    message.
-
  mime-ignore-preceding-spaces
     Preceding white spaces in a message body are ignored if non-nil.
 
@@ -639,15 +745,6 @@ User customizable variables (not documented all of them):
     Hide a non-textual body message encoded in base64 after insertion
     if non-nil.
 
- mime-body-charset-chooser
-    Specifies a function to identify charset and encoding of a text in
-    a given region.  The value is a form of (CHARSET . ENCODING),
-    where ENCODING must be a full name, such as base64.
-
- mime-string-encoder
-    Specifies a function to encode a string for given encoding method.
-    The method is a form of (CHARSET . ENCODING).
-
  mime-voice-recorder
     Specifies a function to record a voice message and return a buffer
     that contains it.  The function mime-voice-recorder-for-sun is for
@@ -671,34 +768,40 @@ User customizable variables (not documented all of them):
       (error "You are already editing a MIME message.")
     (setq mime/editor-mode-flag t)
     ;; Remember old key bindings.
-    (make-local-variable 'mime/editor-mode-old-local-map)
-    (setq mime/editor-mode-old-local-map (current-local-map))
-    ;; Add MIME commands to current local map.
-    (use-local-map (copy-keymap (current-local-map)))
+    (if running-xemacs
+       nil
+      (make-local-variable 'mime/editor-mode-old-local-map)
+      (setq mime/editor-mode-old-local-map (current-local-map))
+      ;; Add MIME commands to current local map.
+      (use-local-map (copy-keymap (current-local-map)))
+      )
     (if (not (lookup-key (current-local-map) mime-prefix))
-       (define-key (current-local-map) mime-prefix (make-sparse-keymap)))
-    (mime-editor/define-keymap (lookup-key (current-local-map) mime-prefix))
+       (define-key (current-local-map) mime-prefix mime-editor/mime-map))
+
+    ;; Set transfer level into mode line
+    ;;
+    (setq mime-editor/transfer-level-string
+         (mime/encoding-name mime-editor/transfer-level 'not-omit))
+    (force-mode-line-update)
     
     ;; Define menu.  Menus for other emacs implementations are
     ;; welcome.
-    ;; modified by Pekka Marjola <pema@niksula.hut.fi>
-    ;;         1995/9/5 (c.f. [tm-eng:69])
-    (cond ((string-match "XEmacs\\|Lucid" emacs-version)
+    (cond (running-xemacs
           (mime-editor/define-menu-for-xemacs))
-         ((string-match "^19\\." emacs-version)
+         ((>= emacs-major-version 19)
           (mime-editor/define-menu-for-emacs19)
           ))
     ;; end
     
-    ;; Remember old selective-display.
-    (make-local-variable 'mime/editor-mode-old-selective-display)
-    (setq mime/editor-mode-old-selective-display selective-display)
-    (setq selective-display t)
+    (enable-invisible)
+    
     ;; I don't care about saving these.
     (setq paragraph-start
-         (concat mime-editor/single-part-tag-regexp "\\|" paragraph-start))
+         (regexp-or mime-editor/single-part-tag-regexp
+                    paragraph-start))
     (setq paragraph-separate
-         (concat mime-editor/single-part-tag-regexp "\\|" paragraph-separate))
+         (regexp-or mime-editor/single-part-tag-regexp
+                    paragraph-separate))
     (run-hooks 'mime/editor-mode-hook)
     (message
      (substitute-command-keys
@@ -724,20 +827,12 @@ just return to previous mode."
          (mime-editor/translate-buffer)))
     ;; Restore previous state.
     (setq mime/editor-mode-flag nil)
-    (use-local-map mime/editor-mode-old-local-map)
-    
-    ;; modified by Pekka Marjola <pema@niksula.hut.fi>
-    ;; 1995/9/5 (c.f. [tm-eng:69])
-    (if (string-match "XEmacs\\|Lucid" emacs-version)
-       (progn
-         (delete-menu-item (list mime-editor/menu-title))
-                                       ; should rather be const
-          ;; (while mime-editor/xemacs-old-bindings
-          ;;   (eval (pop mime-editor/xemacs-old-bindings)))
-         (local-unset-key mime-prefix)))
-    ;; end
+    (cond (running-xemacs
+          (delete-menu-item (list mime-editor/menu-title)))
+         (t
+          (use-local-map mime/editor-mode-old-local-map)))
     
-    (setq selective-display mime/editor-mode-old-selective-display)
+    (end-of-invisible)
     (set-buffer-modified-p (buffer-modified-p))
     (run-hooks 'mime-editor/exit-hook)
     (message "Exit MIME editor mode.")
@@ -746,7 +841,7 @@ just return to previous mode."
 (defun mime-editor/maybe-translate ()
   (interactive)
   (mime-editor/exit nil t)
-  (call-interactively 'mime-editor/split-and-send)
+  (call-interactively 'mime-editor/maybe-split-and-send)
   )
 
 (defun mime-editor/help ()
@@ -759,7 +854,7 @@ just return to previous mode."
 
 (defun mime-editor/insert-text ()
   "Insert a text message.
-Charset is automatically obtained from the mime-body-charset-chooser."
+Charset is automatically obtained from the `mime/lc-charset-alist'."
   (interactive)
   (if (and (mime-editor/insert-tag "text" nil nil)
           (looking-at mime-editor/single-part-tag-regexp))
@@ -777,7 +872,8 @@ Charset is automatically obtained from the mime-body-charset-chooser."
          (subtype (nth 1 guess))
          (parameters (nth 2 guess))
          (default (nth 3 guess))       ;Guess encoding from its file name.
-         (fields (nth 4 guess))
+         (disposition-type (nth 4 guess))
+         (disposition-params (nth 5 guess))
          (encoding
           (if (not (interactive-p))
               default
@@ -794,7 +890,7 @@ Charset is automatically obtained from the mime-body-charset-chooser."
              mime-encoding-method-alist nil t nil))))
     (if (string-equal encoding "")
        (setq encoding default))
-    (if (or (consp parameters) (consp fields))
+    (if (or (consp parameters) (stringp disposition-type))
        (let ((rest parameters) cell attribute value)
          (setq parameters "")
          (while rest
@@ -802,22 +898,31 @@ Charset is automatically obtained from the mime-body-charset-chooser."
            (setq attribute (car cell))
            (setq value (cdr cell))
            (if (eq value 'file)
-               (setq value (file-name-nondirectory file))
+               (setq value (rfc822/wrap-as-quoted-string
+                            (file-name-nondirectory file)))
              )
            (setq parameters (concat parameters "; " attribute "=" value))
            (setq rest (cdr rest))
            )
-         (setq rest fields)
-         (while rest
-           (setq cell (car rest))
-           (setq attribute (car cell))
-           (setq value (cdr cell))
-           (if (eq value 'file)
-               (setq value (file-name-nondirectory file))
-             )
-           (setq parameters (concat parameters "\n" attribute ": " value))
-           (setq rest (cdr rest))
-           )
+         (if disposition-type
+             (progn
+               (setq parameters
+                     (concat parameters "\n"
+                             "Content-Disposition: " disposition-type))
+               (setq rest disposition-params)
+               (while rest
+                 (setq cell (car rest))
+                 (setq attribute (car cell))
+                 (setq value (cdr cell))
+                 (if (eq value 'file)
+                     (setq value (rfc822/wrap-as-quoted-string
+                                  (file-name-nondirectory file)))
+                   )
+                 (setq parameters
+                       (concat parameters "; " attribute "=" value))
+                 (setq rest (cdr rest))
+                 )
+               ))
          ))
     (mime-editor/insert-tag pritype subtype parameters)
     (mime-editor/insert-binary-file file encoding)
@@ -852,32 +957,17 @@ Charset is automatically obtained from the mime-body-charset-chooser."
       )))
 
 (defun mime-editor/insert-signature (&optional arg)
-  "Insert a signature file specified by mime-signature-file."
+  "Insert a signature file."
   (interactive "P")
-  (let ((signature
-        (expand-file-name
-         (if arg
-             (read-file-name "Insert your signature: "
-                             (concat signature-file-name "-")
-                             signature-file-name
-                             nil)
-           (signature/get-signature-file-name))))
-       )
-    (if signature-insert-at-eof
-       (goto-char (point-max))
-      )
-    (apply (function mime-editor/insert-tag)
-          (mime-find-file-type signature))
-    (if (file-readable-p signature)
-       (progn
-         (goto-char (point-max))
-         (if (not (bolp))
-             (insert "\n"))
-         (delete-blank-lines)
-         (insert-file-contents signature)
-         (set-buffer-modified-p (buffer-modified-p))
-                                       ; force mode line update
-         ))))
+  (let ((signature-insert-hook
+         (function
+          (lambda ()
+            (apply (function mime-editor/insert-tag)
+                   (mime-find-file-type signature-file-name))
+            )))
+        )
+    (insert-signature arg)
+    ))
 
 \f
 ;; Insert a new tag around a point.
@@ -889,7 +979,7 @@ If nothing is inserted, return nil."
   (let ((oldtag nil)
        (newtag nil)
        (current (point))
-       exist-prev-tag exist-next-tag)
+       )
     (setq pritype
          (or pritype
              (mime-prompt-for-type)))
@@ -905,13 +995,7 @@ If nothing is inserted, return nil."
     (setq oldtag
          (save-excursion
            (if (mime-editor/goto-tag)
-               (progn
-                 (if (eq current (match-beginning 0))
-                     (setq exist-next-tag t)
-                   (setq exist-prev-tag t)
-                   )
-                 (buffer-substring (match-beginning 0) (match-end 0))
-                 )
+               (buffer-substring (match-beginning 0) (match-end 0))
              ;; Assume content type is 'text/plan'.
              (mime-make-tag "text" "plain")
              )))
@@ -920,46 +1004,6 @@ If nothing is inserted, return nil."
             (not (mime-test-content-type
                   (mime-editor/get-contype oldtag) "text")))
        (setq oldtag nil))
-    (cond (exist-prev-tag (insert "\n"))
-         (exist-next-tag (save-excursion
-                           (insert "\n")
-                           )))
-    ;; (beginning-of-line)
-    ;; (cond ((and oldtag                  ;Text
-    ;;             (not (eobp))
-    ;;             (save-excursion
-    ;;               (forward-line -1)
-    ;;               (looking-at mime-editor/beginning-tag-regexp)
-    ;;               )
-    ;;             (or mime-ignore-same-text-tag
-    ;;                 (not (string-equal oldtag newtag))))
-    ;;        ;; If point is at the next of current tag, move to the
-    ;;        ;; beginning of the tag to disable insertion of extra tag.
-    ;;        (forward-line -1))
-    ;;       ((and oldtag                  ;Text
-    ;;             (not (eobp))
-    ;;             (not (looking-at mime-editor/tag-regexp))
-    ;;             (or mime-ignore-same-text-tag
-    ;;                 (not (string-equal oldtag newtag))))
-    ;;        ;; Copy current tag to break a text into two.
-    ;;        (save-excursion
-    ;;          (insert oldtag "\n")))
-    ;;       ((and (null oldtag)           ;Not text
-    ;;             (not (looking-at mime-editor/tag-regexp)))
-    ;;        ;; Adjust insertion point.  In the middle of text, it is
-    ;;        ;; okay to break the text into two.  However, it should not
-    ;;        ;; be broken into two, if otherwise.
-    ;;        (goto-char (mime-editor/content-end))
-    ;;        (if (eolp)
-    ;;            (forward-line 1))
-    ;;        (if (not (bolp))
-    ;;            (insert "\n"))
-    ;;        ))
-    (if (not (bolp))
-       (if exist-prev-tag
-           (forward-line 1)
-         (insert "\n")
-         ))
     ;; Make a new tag.
     (if (or (not oldtag)               ;Not text
            (or mime-ignore-same-text-tag
@@ -1030,11 +1074,13 @@ Optional argument ENCODING specifies an encoding method such as base64."
        (insert-buffer-substring buffer)
        ;; Encode binary message if necessary.
        (if encoding
-           (mime-encode-region encoding start (point-max))))
+           (mime-encode-region start (point-max) encoding)
+         ))
       (if hide-p
          (progn
-           (mime-flag-region (point-min) (1- (point-max)) ?\^M)
-           (goto-char (point-max)))
+           (invisible-region (point-min) (point-max))
+           (goto-char (point-max))
+           )
        ))
     ;; Define encoding even if it is 7bit.
     (if (stringp encoding)
@@ -1053,16 +1099,13 @@ Optional argument ENCODING specifies an encoding method such as base64."
        t
       ;; At first, go to the end.
       (cond ((re-search-forward mime-editor/beginning-tag-regexp nil t)
-            (goto-char (match-beginning 0)) ;For multiline tag
-            (forward-line -1)
-            (end-of-line)
+            (goto-char (1- (match-beginning 0))) ;For multiline tag
             )
            (t
             (goto-char (point-max))
             ))
       ;; Then search for the beginning. 
       (re-search-backward mime-editor/end-tag-regexp nil t)
-      (beginning-of-line)
       (or (looking-at mime-editor/beginning-tag-regexp)
          ;; Restore previous point.
          (progn
@@ -1096,20 +1139,17 @@ Optional argument ENCODING specifies an encoding method such as base64."
 (defun mime-editor/content-end ()
   "Return the point of the end of content."
   (save-excursion
-    (let ((beg (save-excursion
-                (beginning-of-line) (point))))
+    (let ((beg (point)))
       (if (mime-editor/goto-tag)
          (let ((top (point)))
            (goto-char (match-end 0))
-           (if (and (= beg top)        ;Must be on the same line.
-                    (= (following-char) ?\^M))
-               (progn
-                 (end-of-line)
-                 (point))
+           (if (invisible-p (point))
+               (next-visible-point (point))
              ;; Move to the end of this text.
              (if (re-search-forward mime-editor/tag-regexp nil 'move)
                  ;; Don't forget a multiline tag.
-                 (goto-char (match-beginning 0)))
+                 (goto-char (match-beginning 0))
+               )
              (point)
              ))
        ;; Assume the message begins with text/plain.
@@ -1127,10 +1167,12 @@ Optional argument ENCODING specifies an encoding method such as base64."
        (let ((tag (buffer-substring (match-beginning 0) (match-end 0))))
          (delete-region (match-beginning 0) (match-end 0))
          (insert
-          (mime-create-tag (mime-set-parameter
-                            (mime-editor/get-contype tag) "charset" charset)
-                           (mime-editor/get-encoding tag))))
-      )))
+          (mime-create-tag
+           (mime-editor/set-parameter
+            (mime-editor/get-contype tag)
+            "charset" (upcase (symbol-name charset)))
+           (mime-editor/get-encoding tag)))
+         ))))
 
 (defun mime-editor/define-encoding (encoding)
   "Set encoding of current tag to ENCODING."
@@ -1143,17 +1185,8 @@ Optional argument ENCODING specifies an encoding method such as base64."
 
 (defun mime-editor/choose-charset ()
   "Choose charset of a text following current point."
-  (save-excursion
-    (let* ((beg (point))
-          (end (mime-editor/content-end)))
-      (car (funcall mime-body-charset-chooser beg end)))))
-
-(defun mime-editor/choose-encoding ()
-  "Choose encoding of a text following current point."
-  (save-excursion
-    (let* ((beg (point))
-          (end (mime-editor/content-end)))
-      (cdr (funcall mime-body-charset-chooser beg end)))))
+  (detect-mime-charset-region (point) (mime-editor/content-end))
+  )
 
 (defun mime-make-text-tag (&optional subtype)
   "Make a tag for a text after current point.
@@ -1210,19 +1243,27 @@ Nil if no such parameter."
     nil                                        ;No such parameter
     ))
 
-(defun mime-set-parameter (contype parameter value)
+(defun mime-editor/set-parameter (contype parameter value)
   "For given CONTYPE set PARAMETER to VALUE."
-  (if (string-match
-       (concat
-       ";[ \t\n]*\\("
-       (regexp-quote parameter)
-       "[ \t\n]*=[ \t\n]*\\([^\" \t\n;]*\\|\"[^\"]*\"\\)\\)[ \t\n]*\\(;\\|$\\)")
-       contype)
-      ;; Change value
-      (concat (substring contype 0 (match-beginning 1))
-             parameter "=" value
-             (substring contype (match-end 1)))
-    (concat contype "; " parameter "=" value)))
+  (let (ctype opt-fields)
+    (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)
+      )
+    (if (string-match
+        (concat
+         ";[ \t\n]*\\("
+         (regexp-quote parameter)
+         "[ \t\n]*=[ \t\n]*\\([^\" \t\n;]*\\|\"[^\"]*\"\\)\\)[ \t\n]*\\(;\\|$\\)")
+        ctype)
+       ;; Change value
+       (concat (substring ctype 0 (match-beginning 1))
+               parameter "=" value
+               (substring contype (match-end 1))
+               opt-fields)
+      (concat ctype "; " parameter "=" value opt-fields)
+      )))
 
 (defun mime-strip-parameters (contype)
   "Return primary content-type and subtype without parameters for CONTYPE."
@@ -1345,30 +1386,6 @@ Parameter must be '(PROMPT CHOICE1 (CHOISE2 ...))."
          (mime-prompt-for-parameters-1 (cdr (assoc answer (cdr parameter)))))
     ))
 
-(defun mime-encode-string (encoding string)
-  "Using ENCODING encode a STRING.
-If the STRING is too long, the encoded string may be broken into
-several lines."
-  (save-excursion
-    (set-buffer (get-buffer-create " *MIME encoding*"))
-    (erase-buffer)
-    (insert string)
-    (mime-encode-region encoding (point-min) (point-max))
-    (prog1
-       (buffer-substring (point-min) (point-max))
-      (kill-buffer (current-buffer)))))
-
-(defun mime-decode-string (encoding string)
-  "Using ENCODING decode a STRING."
-  (save-excursion
-    (set-buffer (get-buffer-create " *MIME decoding*"))
-    (erase-buffer)
-    (insert string)
-    (mime-decode-region encoding (point-min) (point-max))
-    (prog1
-       (buffer-substring (point-min) (point-max))
-      (kill-buffer (current-buffer)))))
-
 (defun mime-flag-region (from to flag)
   "Hides or shows lines from FROM to TO, according to FLAG.
 If FLAG is `\\n' (newline character) then text is shown,
@@ -1382,26 +1399,428 @@ while if FLAG is `\\^M' (control-M) the text is hidden."
       (set-buffer-modified-p modp))))
 
 \f
-;; Translate the tagged MIME messages into a MIME compliant message.
+;;; @ Translate the tagged MIME messages into a MIME compliant message.
+;;;
+
+(defvar mime-editor/translate-buffer-hook
+  '(mime-editor/pgp-enclose-buffer
+    mime/encode-message-header
+    mime-editor/translate-body))
 
 (defun mime-editor/translate-buffer ()
   "Encode the tagged MIME message in current buffer in MIME compliant message."
   (interactive)
-  (mime/encode-message-header)
-  (mime-editor/translate-body)
-  )
+  (if (catch 'mime-editor/error
+       (save-excursion
+         (run-hooks 'mime-editor/translate-buffer-hook)
+         ))
+      (progn
+       (undo)
+       (error "Translation error!")
+       )))
+
+(defun mime-editor/find-inmost ()
+  (goto-char (point-min))
+  (if (re-search-forward mime-editor/multipart-beginning-regexp nil t)
+      (let ((bb (match-beginning 0))
+           (be (match-end 0))
+           (type (buffer-substring (match-beginning 1)(match-end 1)))
+           end-exp eb ee)
+       (setq end-exp (format "--}-<<%s>>\n" type))
+       (widen)
+       (if (re-search-forward end-exp nil t)
+           (progn
+             (setq eb (match-beginning 0))
+             (setq ee (match-end 0))
+             )
+         (setq eb (point-max))
+         (setq ee (point-max))
+         )
+       (narrow-to-region be eb)
+       (goto-char be)
+       (if (re-search-forward mime-editor/multipart-beginning-regexp nil t)
+           (let (ret)
+             (narrow-to-region (match-beginning 0)(point-max))
+             (mime-editor/find-inmost)
+             )
+         (widen)
+         (list type bb be eb)
+         ))))
+
+(defun mime-editor/process-multipart-1 (boundary)
+  (let ((ret (mime-editor/find-inmost)))
+    (if ret
+       (let ((type (car ret))
+             (bb (nth 1 ret))(be (nth 2 ret))
+             (eb (nth 3 ret))
+             )
+         (narrow-to-region bb eb)
+         (delete-region bb be)
+         (setq bb (point-min))
+         (setq eb (point-max))
+         (widen)
+         (goto-char eb)
+         (if (looking-at mime-editor/multipart-end-regexp)
+             (let ((beg (match-beginning 0))
+                   (end (match-end 0))
+                   )
+               (delete-region beg end)
+               (or (looking-at mime-editor/beginning-tag-regexp)
+                   (eobp)
+                   (insert (concat (mime-make-text-tag) "\n"))
+                   )))
+         (cond ((string-equal type "quote")
+                (mime-editor/enquote-region bb eb)
+                )
+               ((string-equal type "signed")
+                (cond ((eq mime-editor/signing-type 'pgp-elkins)
+                       (mime-editor/sign-pgp-elkins bb eb boundary)
+                       )
+                      ((eq mime-editor/signing-type 'pgp-kazu)
+                       (mime-editor/sign-pgp-kazu bb eb boundary)
+                       ))
+                )
+               ((string-equal type "encrypted")
+                (cond ((eq mime-editor/encrypting-type 'pgp-elkins)
+                       (mime-editor/encrypt-pgp-elkins bb eb boundary)
+                       )
+                      ((eq mime-editor/encrypting-type 'pgp-kazu)
+                       (mime-editor/encrypt-pgp-kazu bb eb boundary)
+                       )))
+               (t
+                (setq boundary
+                      (nth 2 (mime-editor/translate-region bb eb
+                                                           boundary t)))
+                (goto-char bb)
+                (insert
+                 (format "--[[multipart/%s;
+ boundary=\"%s\"][7bit]]\n"
+                         type boundary))
+                ))
+         boundary))))
+
+(defun mime-editor/enquote-region (beg end)
+  (save-excursion
+    (save-restriction
+      (narrow-to-region beg end)
+      (goto-char beg)
+      (while (re-search-forward mime-editor/single-part-tag-regexp nil t)
+       (let ((tag (buffer-substring (match-beginning 0)(match-end 0))))
+         (replace-match (concat "- " (substring tag 1)))
+         )))))
+
+(defun mime-editor/dequote-region (beg end)
+  (save-excursion
+    (save-restriction
+      (narrow-to-region beg end)
+      (goto-char beg)
+      (while (re-search-forward
+             mime-editor/quoted-single-part-tag-regexp nil t)
+       (let ((tag (buffer-substring (match-beginning 0)(match-end 0))))
+         (replace-match (concat "-" (substring tag 2)))
+         )))))
+
+(autoload 'mc-pgp-lookup-key "mc-pgp")
+(autoload 'mc-pgp-sign-region "mc-pgp")
+(autoload 'mc-pgp-encrypt-region "mc-pgp")
+
+(defun tm:mc-pgp-generic-parser (result)
+  (let ((ret (mc-pgp-generic-parser result)))
+    (if (consp ret)
+       (vector (car ret)(cdr ret))
+      )))
+
+(defun tm:mc-process-region
+  (beg end passwd program args parser &optional buffer boundary)
+  (let ((obuf (current-buffer))
+       (process-connection-type nil)
+       mybuf result rgn proc)
+    (unwind-protect
+       (progn
+         (setq mybuf (or buffer (generate-new-buffer " *mailcrypt temp")))
+         (set-buffer mybuf)
+         (erase-buffer)
+         (set-buffer obuf)
+         (buffer-disable-undo mybuf)
+         (setq proc
+               (apply 'start-process "*PGP*" mybuf program args))
+         (if passwd
+             (progn
+               (process-send-string proc (concat passwd "\n"))
+               (or mc-passwd-timeout (mc-deactivate-passwd t))))
+         (process-send-region proc beg end)
+         (process-send-eof proc)
+         (while (eq 'run (process-status proc))
+           (accept-process-output proc 5))
+         (setq result (process-exit-status proc))
+         ;; Hack to force a status_notify() in Emacs 19.29
+         (delete-process proc)
+         (set-buffer mybuf)
+         (goto-char (point-max))
+         (if (re-search-backward "\nProcess \\*PGP.*\n\\'" nil t)
+             (delete-region (match-beginning 0) (match-end 0)))
+         (goto-char (point-min))
+         ;; CRNL -> NL
+         (while (search-forward "\r\n" nil t)
+           (replace-match "\n"))
+         ;; Hurm.  FIXME; must get better result codes.
+         (if (stringp result)
+             (error "%s exited abnormally: '%s'" program result)
+           (setq rgn (funcall parser result))
+           ;; If the parser found something, migrate it
+           (if (consp rgn)
+               (progn
+                 (set-buffer obuf)
+                 (if boundary
+                     (save-restriction
+                       (narrow-to-region beg end)
+                       (goto-char beg)
+                       (insert (format "--%s\n" boundary))
+                       (goto-char (point-max))
+                       (insert (format "\n--%s
+Content-Type: application/pgp-signature
+Content-Transfer-Encoding: 7bit
+
+" boundary))
+                       (insert-buffer-substring mybuf (car rgn) (cdr rgn))
+                       (goto-char (point-max))
+                       (insert (format "\n--%s--\n" boundary))
+                       )
+                   (delete-region beg end)
+                   (goto-char beg)
+                   (insert-buffer-substring mybuf (car rgn) (cdr rgn))
+                   )
+                 (set-buffer mybuf)
+                 (delete-region (car rgn) (cdr rgn)))))
+         ;; Return nil on failure and exit code on success
+         (if rgn result))
+      ;; Cleanup even on nonlocal exit
+      (if (and proc (eq 'run (process-status proc)))
+         (interrupt-process proc))
+      (set-buffer obuf)
+      (or buffer (null mybuf) (kill-buffer mybuf)))))
+
+(defun tm:mc-pgp-sign-region (start end &optional id unclear boundary)
+  (if (not (boundp 'mc-pgp-user-id))
+      (load "mc-pgp")
+    )
+  (let ((process-environment process-environment)
+       (buffer (get-buffer-create mc-buffer-name))
+       passwd args key
+       (parser (function mc-pgp-generic-parser))
+       (pgp-path mc-pgp-path)
+       )
+    (setq key (mc-pgp-lookup-key (or id mc-pgp-user-id)))
+    (setq passwd
+         (mc-activate-passwd
+          (cdr key)
+          (format "PGP passphrase for %s (%s): " (car key) (cdr key))))
+    (setenv "PGPPASSFD" "0")
+    (setq args
+         (cons
+          (if boundary
+              "-fbast"
+            "-fast")
+          (list "+verbose=1" "+language=en"
+                (format "+clearsig=%s" (if unclear "off" "on"))
+                "+batchmode" "-u" (cdr key))))
+    (if mc-pgp-comment
+       (setq args (cons (format "+comment=%s" mc-pgp-comment) args))
+      )
+    (message "Signing as %s ..." (car key))
+    (if (tm:mc-process-region
+        start end passwd pgp-path args parser buffer boundary)
+       (progn
+         (if boundary
+             (progn
+               (goto-char (point-min))
+               (insert
+                (format "\
+--[[multipart/signed; protocol=\"application/pgp-signature\";
+ boundary=\"%s\"; micalg=pgp-md5][7bit]]\n" boundary))
+               ))
+         (message "Signing as %s ... Done." (car key))
+         t)
+      nil)))
+
+(defun mime-editor/sign-pgp-elkins (beg end boundary)
+  (save-excursion
+    (save-restriction
+      (narrow-to-region beg end)
+      (let* ((ret
+             (mime-editor/translate-region beg end boundary))
+            (ctype    (car ret))
+            (encoding (nth 1 ret))
+            (parts    (nth 3 ret))
+            (pgp-boundary (concat "pgp-sign-" boundary))
+            )
+       (goto-char beg)
+       (insert (format "Content-Type: %s\n" ctype))
+       (if encoding
+           (insert (format "Content-Transfer-Encoding: %s\n" encoding))
+         )
+       (insert "\n")
+       (or (tm:mc-pgp-sign-region (point-min)(point-max)
+                                  nil nil pgp-boundary)
+           (throw 'mime-editor/error 'pgp-error)
+           )
+       ))))
+
+(defvar mime-editor/encrypt-recipient-fields-list '("To" "cc"))
+
+(defun mime-editor/make-encrypt-recipient-header ()
+  (let* ((names mime-editor/encrypt-recipient-fields-list)
+        (values
+         (rfc822/get-field-bodies (cons "From" names)
+                                  nil mail-header-separator))
+        (from (prog1
+                  (car values)
+                (setq values (cdr values))))
+        (header (and (stringp from)
+                     (if (string-equal from "")
+                         ""
+                       (format "From: %s\n" from)
+                       )))
+        recipients)
+    (while (and names values)
+      (let ((name (car names))
+           (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))
+                  ))))
+      (setq names (cdr names)
+           values (cdr values))
+      )
+    (vector from recipients header)
+    ))
+
+(defun mime-editor/encrypt-pgp-elkins (beg end boundary)
+  (save-excursion
+    (save-restriction
+      (let (from recipients header)
+       (let ((ret (mime-editor/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-editor/translate-region beg end boundary))
+              (ctype    (car ret))
+              (encoding (nth 1 ret))
+              (parts    (nth 3 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")
+         (if (null
+              (let ((mc-pgp-always-sign 'never))
+                (mc-pgp-encrypt-region
+                 (mc-split "\\([ \t\n]*,[ \t\n]*\\)+" recipients)
+                 (point-min) (point-max) from nil)
+                ))
+             (throw 'mime-editor/error 'pgp-error)
+           )
+         (goto-char beg)
+         (insert (format "--[[multipart/encrypted;
+ boundary=\"%s\";
+ protocol=\"application/pgp-encrypted\"][7bit]]
+--%s
+Content-Type: application/pgp-encrypted
+
+--%s
+Content-Type: application/octet-stream
+Content-Transfer-Encoding: 7bit
+
+" pgp-boundary pgp-boundary pgp-boundary))
+         (goto-char (point-max))
+         (insert (format "\n--%s--\n" pgp-boundary))
+         )))))
+
+(defun mime-editor/sign-pgp-kazu (beg end boundary)
+  (save-excursion
+    (save-restriction
+      (narrow-to-region beg end)
+      (let* ((ret
+             (mime-editor/translate-region beg end boundary))
+            (ctype    (car ret))
+            (encoding (nth 1 ret))
+            (parts    (nth 3 ret))
+            )
+       (goto-char beg)
+       (insert (format "Content-Type: %s\n" ctype))
+       (if encoding
+           (insert (format "Content-Transfer-Encoding: %s\n" encoding))
+         )
+       (insert "\n")
+       (or (as-binary-process (mc-pgp-sign-region beg (point-max)))
+           (throw 'mime-editor/error 'pgp-error)
+           )
+       (goto-char beg)
+       (insert
+        "--[[application/pgp; format=mime][7bit]]\n")
+       ))
+    ))
+
+(defun mime-editor/encrypt-pgp-kazu (beg end boundary)
+  (save-excursion
+    (let (from recipients header)
+      (let ((ret (mime-editor/make-encrypt-recipient-header)))
+       (setq from (aref ret 0)
+             recipients (aref ret 1)
+             header (aref ret 2))
+       )
+      (save-restriction
+       (narrow-to-region beg end)
+       (let* ((ret
+               (mime-editor/translate-region beg end boundary))
+              (ctype    (car ret))
+              (encoding (nth 1 ret))
+              (parts    (nth 3 ret))
+              )
+         (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 (as-binary-process
+              (mc-pgp-encrypt-region
+               (mc-split "\\([ \t\n]*,[ \t\n]*\\)+" recipients)
+               beg (point-max))
+              )
+             (throw 'mime-editor/error 'pgp-error)
+             )
+         (goto-char beg)
+         (insert
+          "--[[application/pgp; format=mime][7bit]]\n")
+         ))
+      )))
 
 (defun mime-editor/translate-body ()
   "Encode the tagged MIME body in current buffer in MIME compliant message."
   (interactive)
   (save-excursion
     (let ((boundary
-          (concat mime-multipart-boundary " " (current-time-string)))
+          (concat mime-multipart-boundary "_"
+                  (replace-space-with-underline (current-time-string))
+                  ))
          (i 1)
-         (time (current-time-string))
          ret)
       (while (mime-editor/process-multipart-1
-             (format "%s %s-%d" mime-multipart-boundary time i))
+             (format "%s-%d" boundary i))
        (setq i (1+ i))
        )
       (save-restriction
@@ -1423,8 +1842,9 @@ while if FLAG is `\\^M' (control-M) the text is hidden."
                  (point))))
          (setq ret (mime-editor/translate-region
                     beg end
-                    (format "%s %s-%d" mime-multipart-boundary time i)))
+                    (format "%s-%d" boundary i)))
          ))
+      (mime-editor/dequote-region (point-min)(point-max))
       (let ((contype (car ret))                ;Content-Type
            (encoding (nth 1 ret))      ;Content-Transfer-Encoding
            )
@@ -1448,10 +1868,30 @@ while if FLAG is `\\^M' (control-M) the text is hidden."
              (insert encoding)))
        ))))
 
+(defun mime-editor/translate-single-part-tag (&optional prefix)
+  (if (re-search-forward mime-editor/single-part-tag-regexp nil t)
+      (let* ((beg (match-beginning 0))
+            (end (match-end 0))
+            (tag (buffer-substring beg end))
+            )
+       (delete-region beg end)
+       (setq contype (mime-editor/get-contype tag))
+       (setq encoding (mime-editor/get-encoding tag))
+       (insert (concat prefix "--" boundary "\n"))
+       (save-restriction
+         (narrow-to-region (point)(point))
+         (insert "Content-Type: " contype "\n")
+         (if encoding
+             (insert "Content-Transfer-Encoding: " encoding "\n"))
+         (mime/encode-message-header)
+         )
+       t)))
+
 (defun mime-editor/translate-region (beg end &optional boundary multipart)
   (if (null boundary)
       (setq boundary
-           (concat mime-multipart-boundary " " (current-time-string)))
+           (concat mime-multipart-boundary "_"
+                   (replace-space-with-underline (current-time-string))))
     )
   (save-excursion
     (save-restriction
@@ -1468,46 +1908,36 @@ while if FLAG is `\\^M' (control-M) the text is hidden."
        (while (re-search-forward mime-editor/single-part-tag-regexp nil t)
          (setq nparts (1+ nparts)))
        ;; Begin translation.
-       (cond ((and (<= nparts 1)(not multipart))
-              ;; It's a singular message.
-              (goto-char (point-min))
-              (while (re-search-forward
-                      mime-editor/single-part-tag-regexp nil t)
-                (setq tag
-                      (buffer-substring (match-beginning 0) (match-end 0)))
-                (delete-region (match-beginning 0) (1+ (match-end 0)))
-                (setq contype (mime-editor/get-contype tag))
-                (setq encoding (mime-editor/get-encoding tag))
-                ))
-             (t
-              ;; It's a multipart message.
-              (goto-char (point-min))
-              (while (re-search-forward
-                      mime-editor/single-part-tag-regexp nil t)
-                (setq tag
-                      (buffer-substring (match-beginning 0) (match-end 0)))
-                (delete-region (match-beginning 0) (match-end 0))
-                (setq contype (mime-editor/get-contype tag))
-                (setq encoding (mime-editor/get-encoding tag))
-                (insert "--" boundary "\n")
-                (insert "Content-Type: " contype "\n")
-                (if encoding
-                    (insert "Content-Transfer-Encoding: " encoding "\n"))
-                )
-              ;; Define Content-Type as "multipart/mixed".
-              (setq contype
-                    (concat "multipart/mixed; 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))
-              (if multipart
-                  (insert "--" boundary "--\n")
-                (insert "\n--" boundary "--\n")
-                )))
+       (cond
+        ((and (<= nparts 1)(not multipart))
+         ;; It's a singular message.
+         (goto-char (point-min))
+         (while (re-search-forward
+                 mime-editor/single-part-tag-regexp nil t)
+           (setq tag
+                 (buffer-substring (match-beginning 0) (match-end 0)))
+           (delete-region (match-beginning 0) (1+ (match-end 0)))
+           (setq contype (mime-editor/get-contype tag))
+           (setq encoding (mime-editor/get-encoding tag))
+           ))
+        (t
+         ;; It's a multipart message.
+         (goto-char (point-min))
+         (and (mime-editor/translate-single-part-tag)
+              (while (mime-editor/translate-single-part-tag "\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)
        ))))
 
@@ -1527,71 +1957,80 @@ while if FLAG is `\\^M' (control-M) the text is hidden."
       ;; Remove extra whitespaces after the tag.
       (if (looking-at "[ \t]+$")
          (delete-region (match-beginning 0) (match-end 0)))
-      (cond ((= (following-char) ?\^M)
-            ;; It must be image, audio or video.
-            (let ((beg (point))
-                  (end (mime-editor/content-end)))
-              ;; Insert explicit MIME tags after hidden messages.
-              (forward-line 1)
-              (if (and (not (eobp))
-                       (not (looking-at mime-editor/single-part-tag-regexp)))
-                  (progn
-                    (insert (mime-make-text-tag) "\n")
-                    (forward-line -1)  ;Process it again as text.
-                    ))
-              ;; Show a hidden message.  The point is not altered
-              ;; after the conversion.
-              (mime-flag-region beg end ?\n)))
-           ((mime-test-content-type contype "message")
-            ;; Content-type "message" should be sent as is.
-            (forward-line 1))
-           ((mime-test-content-type contype "text")
-            ;; Define charset for text if necessary.
-            (setq charset (or charset (mime-editor/choose-charset)))
-            (mime-editor/define-charset charset)
-            (if (string-equal contype "text/x-rot13-47")
-                (save-excursion
-                  (forward-line)
-                  (set-mark (point))
-                  (goto-char (mime-editor/content-end))
-                  (tm:caesar-region)
-                  ))
-            ;; Point is now on current tag.
-            ;; Define encoding and encode text if necessary.
-            (if (null encoding)        ;Encoding is not specified.
-                (let* ((encoding (mime-editor/choose-encoding))
-                       (beg (mime-editor/content-beginning))
-                       (end (mime-editor/content-end))
-                       (body (buffer-substring beg end))
-                       (encoded (funcall mime-string-encoder
-                                         (cons charset encoding) body)))
-                  (if (not (string-equal body encoded))
-                      (progn
-                        (goto-char beg)
-                        (delete-region beg end)
-                        (insert encoded)
-                        (goto-char beg)))
-                  (mime-editor/define-encoding encoding)))
-            (forward-line 1))
-           ((null encoding)            ;Encoding is not specified.
-            ;; Application, image, audio, video, and any other
-            ;; unknown content-type without encoding should be
-            ;; encoded.
-            (let* ((encoding "base64") ;Encode in BASE64 by default.
-                   (beg (mime-editor/content-beginning))
-                   (end (mime-editor/content-end))
-                   (body (buffer-substring beg end))
-                   (encoded (funcall mime-string-encoder
-                                     (cons nil encoding) body)))
-              (if (not (string-equal body encoded))
-                  (progn
-                    (goto-char beg)
-                    (delete-region beg end)
-                    (insert encoded)
-                    (goto-char beg)))
-              (mime-editor/define-encoding encoding))
-            (forward-line 1))
+      (let ((beg (point))
+           (end (mime-editor/content-end))
            )
+       (if (= end (point-max))
+           nil
+         (goto-char end)
+         (or (looking-at mime-editor/beginning-tag-regexp)
+             (eobp)
+             (insert (mime-make-text-tag) "\n")
+             ))
+       (visible-region beg end)
+       (goto-char beg)
+       )
+      (cond
+       ((mime-test-content-type contype "message")
+       ;; Content-type "message" should be sent as is.
+       (forward-line 1)
+       )
+       ((mime-test-content-type contype "text")
+       ;; Define charset for text if necessary.
+       (setq charset (if charset
+                         (intern (downcase charset))
+                       (mime-editor/choose-charset)))
+       (mime-editor/define-charset charset)
+       (cond ((string-equal contype "text/x-rot13-47")
+              (save-excursion
+                (forward-line)
+                (set-mark (point))
+                (goto-char (mime-editor/content-end))
+                (tm:caesar-region)
+                ))
+             ((string-equal contype "text/enriched")
+              (save-excursion
+                (let ((beg (progn
+                             (forward-line)
+                             (point)))
+                      (end (mime-editor/content-end))
+                      )
+                  (enriched-encode beg end)
+                  (goto-char beg)
+                  (if (search-forward "\n\n")
+                      (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.
+           (let* ((encoding
+                   (cdr
+                    (assq charset
+                          mime-editor/charset-default-encoding-alist)
+                    ))
+                  (beg (mime-editor/content-beginning))
+                  )
+             (encode-mime-charset-region beg (mime-editor/content-end)
+                                         charset)
+             (mime-encode-region beg (mime-editor/content-end) encoding)
+             (mime-editor/define-encoding encoding)
+             ))
+       (goto-char (mime-editor/content-end))
+       )
+       ((null encoding)                ;Encoding is not specified.
+       ;; Application, image, audio, video, and any other
+       ;; unknown content-type without encoding should be
+       ;; encoded.
+       (let* ((encoding "base64")      ;Encode in BASE64 by default.
+              (beg (mime-editor/content-beginning))
+              (end (mime-editor/content-end))
+              (body (buffer-substring beg end))
+              )
+         (mime-encode-region beg end encoding)
+         (mime-editor/define-encoding encoding))
+       (forward-line 1)
+       ))
       )))
 
 (defun mime-delete-field (field)
@@ -1608,173 +2047,6 @@ while if FLAG is `\\^M' (control-M) the text is hidden."
 ;;; Platform dependent functions
 ;;;
 
-;; Emacs 18 implementations
-
-(defun mime-body-charset-chooser-for-emacs18 (begin end)
-  "Return a cons of charset and encoding of a message in a given region.
-Encoding name must be a canonical name, such as `base64'."
-  '("US-ASCII" . nil)                  ;Default charset of MIME.
-  )
-
-(defun mime-string-encoder-for-emacs18 (method string)
-  "For given METHOD that is a cons of charset and encoding, encode a STRING."
-  (let ((charset (car method))
-       (encoding (cdr method)))
-    (cond ((stringp encoding)
-          (mime-encode-string encoding string))
-         ;; Return string without any encoding.
-         (t string)
-         )))
-
-\f
-;; Emacs 19 implementations
-
-(defun mime-body-charset-chooser-for-emacs19 (begin end)
-  "Return a cons of charset and encoding of a message in a given region.
-Encoding name must be a canonical name, such as `base64'.
-US-ASCII and ISO-8859-1 are supported on Emacs 19."
-  (cond ((save-excursion
-          (goto-char begin)
-          (re-search-forward "[\200-\377]" end t))
-        '("ISO-8859-1" . "quoted-printable"))
-       (t
-        '("US-ASCII" . nil))           ;Default charset of MIME.
-       ))
-
-(defun mime-string-encoder-for-emacs19 (method string)
-  "For given METHOD that is a cons of charset and encoding, encode a STRING."
-  (let ((charset (car method))
-       (encoding (cdr method)))
-    (cond ((stringp encoding)
-          (mime-encode-string encoding string))
-         ;; Return string without any encoding.
-         (t string)
-         )))
-
-\f
-;; NEmacs implementations
-
-(defun mime-body-charset-chooser-for-nemacs (begin end)
-  "Return a cons of charset and encoding of a message in a given region.
-Encoding name must be a canonical name, such as `base64'.
-US-ASCII and ISO-2022-JP are supported on NEmacs."
-  (cond ((check-region-kanji-code begin end)
-        ;; The following are safe encoding methods for use in
-        ;; USENET News systems that strip off all ESCs.
-        ;; '("ISO-2022-JP" . "quoted-printable")
-        ;; '("ISO-2022-JP" . "base64")
-        ;; The following expects transport systems are all MIME
-        ;; compliants.  For instance, ESCs are never stripped off.
-        '("ISO-2022-JP" . nil))
-       (t
-        '("US-ASCII" . nil))           ;Default charset of MIME.
-       ))
-
-(defun mime-string-encoder-for-nemacs (method string)
-  "For given METHOD that is a cons of charset and encoding, encode a STRING.
-US-ASCII and ISO-2022-JP are supported on NEmacs."
-  (let ((charset (car method))
-       (encoding (cdr method)))
-    (cond ((stringp encoding)
-          (mime-encode-string encoding
-                              ;; Convert internal (EUC) to JIS code.
-                              (convert-string-kanji-code string 3 2)
-                              ))
-         ;; NEmacs can convert into ISO-2022-JP automatically,
-         ;; but can do it myself as follows:
-         ;;(t (convert-string-kanji-code string 3 2))
-
-         ;; Return string without any encoding.
-         (t string)
-         )))
-
-\f
-;; Mule implementations
-;; Thanks to contributions by wkenji@flab.fujitsu.co.jp (Kenji
-;; WAKAMIYA) and handa@etl.go.jp (Kenichi Handa).
-
-(defun mime-body-charset-chooser-for-mule (begin end)
-  "Return a cons of charset and encoding of a message in a given
-region.  Encoding name must be a canonical name, such as `base64'.
-US-ASCII, ISO-8859-* (except for ISO-8859-6), ISO-2022-JP,
-ISO-2022-JP-2 and ISO-2022-INT-1 are supported on Mule.  Either of
-charset ISO-2022-JP-2 or ISO-2022-INT-1 is used for multilingual text
-in Mule."
-  (let ((lclist (find-charset-region begin end)))
-    (cond ((null lclist)
-          '("US-ASCII" . nil))         ;Default charset of MIME.
-         ;; Multilingual capability requred.
-         ((and (> (length lclist) 1)
-               (boundp '*iso-2022-int-1*))
-          '("ISO-2022-INT-1" . nil))
-         ((> (length lclist) 1)
-          '("ISO-2022-JP-2" . nil))
-         ;; Simple charset.
-         ((memq lc-ltn1 lclist)
-          '("ISO-8859-1" . "quoted-printable"))
-         ((memq lc-ltn2 lclist)
-          '("ISO-8859-2" . "quoted-printable"))
-         ((memq lc-ltn3 lclist)
-          '("ISO-8859-3" . "quoted-printable"))
-         ((memq lc-ltn4 lclist)
-          '("ISO-8859-4" . "quoted-printable"))
-         ((memq lc-crl lclist)
-          '("ISO-8859-5" . "quoted-printable"))
-         ;;((memq lc-arb lclist)
-         ;; '("ISO-8859-6" . "quoted-printable"))
-         ((memq lc-grk lclist)
-          '("ISO-8859-7" . "quoted-printable"))
-         ((memq lc-hbw lclist)
-          '("ISO-8859-8" . "quoted-printable"))
-         ((memq lc-ltn5 lclist)
-          '("ISO-8859-9" . "quoted-printable"))
-         ((memq lc-jp lclist)
-          '("ISO-2022-JP" . nil))
-         ((memq lc-kr lclist)
-          '("ISO-2022-KR" . nil))
-         ;; Unknown charset.
-         ((boundp '*iso-2022-int-1*)
-          '("ISO-2022-INT-1" . nil))
-         (t
-          '("ISO-2022-JP-2" . nil))
-         )))
-
-(defun mime-string-encoder-for-mule (method string)
-  "For given METHOD that is a cons of charset and encoding, encode a
-STRING.  US-ASCII, ISO-8859-* (except for ISO-8859-6), ISO-2022-JP,
-ISO-2022-JP-2 and ISO-2022-INT-1 are supported on Mule.  Either of
-charset ISO-2022-JP-2 or ISO-2022-INT-1 is used for multilingual
-text."
-  (let* ((charset (car method))
-        (encoding (cdr method))
-        (coding-system
-         (cdr (assoc (and (stringp charset) (upcase charset))
-                     '(("ISO-8859-1" . *ctext*)
-                       ("ISO-8859-2" . *iso-8859-2*)
-                       ("ISO-8859-3" . *iso-8859-3*)
-                       ("ISO-8859-4" . *iso-8859-4*)
-                       ("ISO-8859-5" . *iso-8859-5*)
-                       ;;("ISO-8859-6" . *iso-8859-6*)
-                       ("ISO-8859-7" . *iso-8859-7*)
-                       ("ISO-8859-8" . *iso-8859-8*)
-                       ("ISO-8859-9" . *iso-8859-9*)
-                       ("ISO-2022-JP" . *junet*)
-                       ("ISO-2022-JP-2" . *iso-2022-ss2-7*)
-                       ("ISO-2022-KR" . *korean-mail*)
-                       ("ISO-2022-INT-1" . *iso-2022-int-1*)
-                       )))))
-    ;; In bilingual environment it may be unnecessary to convert the
-    ;; coding system of the string unless transfer encoding is
-    ;; required since such conversion may be performed by mule
-    ;; automatically.
-    (if (not (null coding-system))
-       (setq string (code-convert-string string *internal* coding-system)))
-    (if (stringp encoding)
-       (setq string (mime-encode-string encoding string)))
-    string
-    ))
-
-\f
 ;; Sun implementations
 
 (defun mime-voice-recorder-for-sun ()
@@ -1867,68 +2139,6 @@ a recording host instead of local host."
          )
        ))))
 
-;;; mime.el ends here
-
-(defun mime-editor/find-inmost ()
-  (goto-char (point-min))
-  (if (re-search-forward mime-editor/multipart-beginning-regexp nil t)
-      (let ((bb (match-beginning 0))
-           (be (match-end 0))
-           (type (buffer-substring (match-beginning 1)(match-end 1)))
-           end-exp eb ee)
-       (setq end-exp (format "^--}-<<%s>>\n" type))
-       (widen)
-       (if (re-search-forward end-exp nil t)
-           (progn
-             (setq eb (match-beginning 0))
-             (setq ee (match-end 0))
-             )
-         (setq eb (point-max))
-         (setq ee (point-max))
-         )
-       (narrow-to-region be eb)
-       (goto-char be)
-       (if (re-search-forward mime-editor/multipart-beginning-regexp nil t)
-           (let (ret)
-             (narrow-to-region (match-beginning 0)(point-max))
-             (mime-editor/find-inmost)
-             )
-         (widen)
-         ;;(delete-region eb ee)
-         (list type bb be eb)
-         ))))
-
-(defun mime-editor/process-multipart-1 (boundary)
-  (let ((ret (mime-editor/find-inmost)))
-    (if ret
-       (let ((type (car ret))
-             (bb (nth 1 ret))(be (nth 2 ret))
-             (eb (nth 3 ret))
-             )
-         (narrow-to-region bb eb)
-         (delete-region bb be)
-         (setq bb (point-min))
-         (setq eb (point-max))
-         (widen)
-         (goto-char eb)
-         (if (looking-at mime-editor/multipart-end-regexp)
-             (let ((beg (match-beginning 0))
-                   (end (match-end 0))
-                   )
-               (delete-region beg end)
-               (if (and (not (looking-at mime-editor/single-part-tag-regexp))
-                        (not (eobp)))
-                   (insert (concat (mime-make-text-tag) "\n"))
-                 )))
-         (setq boundary
-               (nth 2 (mime-editor/translate-region bb eb
-                                                    boundary t)))
-         (goto-char bb)
-         (insert
-          (format "--[[multipart/%s; boundary=\"%s\"][7bit]]\n"
-                  type boundary))
-         boundary))))
-
 
 ;;; @ multipart enclosure
 ;;;
@@ -1936,30 +2146,25 @@ a recording host instead of local host."
 (defun mime-editor/enclose-region (type beg end)
   (save-excursion
     (goto-char beg)
-    (let ((current (point))
-         exist-prev-tag)
-      (save-excursion
-       (if (mime-editor/goto-tag)
-           (or (eq current (match-beginning 0))
-               (setq exist-prev-tag t)
-               )))
+    (let ((current (point)))
       (save-restriction
        (narrow-to-region beg end)
-       (goto-char beg)
-        (if exist-prev-tag
-           (insert "\n")
-         )
        (insert (format "--<<%s>>-{\n" type))
        (goto-char (point-max))
-       (insert (format "\n--}-<<%s>>\n" type))
+       (insert (format "--}-<<%s>>\n" type))
        (goto-char (point-max))
        )
-      (if (and (not (looking-at mime-editor/single-part-tag-regexp))
-              (not (eobp)))
+      (or (looking-at mime-editor/beginning-tag-regexp)
+         (eobp)
          (insert (mime-make-text-tag) "\n")
-       )
+         )
       )))
 
+(defun mime-editor/enclose-quote-region (beg end)
+  (interactive "*r")
+  (mime-editor/enclose-region "quote" beg end)
+  )
+
 (defun mime-editor/enclose-mixed-region (beg end)
   (interactive "*r")
   (mime-editor/enclose-region "mixed" beg end)
@@ -1980,6 +2185,136 @@ a recording host instead of local host."
   (mime-editor/enclose-region "alternative" beg end)
   )
 
+(defun mime-editor/enclose-signed-region (beg end)
+  (interactive "*r")
+  (if mime-editor/signing-type
+      (mime-editor/enclose-region "signed" beg end)
+    (message "Please specify signing type.")
+    ))
+
+(defun mime-editor/enclose-encrypted-region (beg end)
+  (interactive "*r")
+  (if mime-editor/signing-type
+      (mime-editor/enclose-region "encrypted" beg end)
+    (message "Please specify encrypting type.")
+    ))
+
+(defun mime-editor/insert-key (&optional arg)
+  "Insert a pgp public key."
+  (interactive "P")
+  (mime-editor/insert-tag "application" "pgp-keys")
+  (mime-editor/define-encoding "7bit")
+  (mc-insert-public-key)
+  )
+
+
+;;; @ flag setting
+;;;
+
+(defun mime-editor/set-split (arg)
+  (interactive
+   (list
+    (y-or-n-p "Do you want to enable split?")
+    ))
+  (setq mime-editor/split-message arg)
+  (if arg
+      (message "This message is enabled to split.")
+    (message "This message is not enabled to split.")
+    ))
+
+(defun mime-editor/toggle-transfer-level (&optional transfer-level)
+  "Toggle transfer-level is 7bit or 8bit through.
+
+Optional TRANSFER-LEVEL is a number of transfer-level, 7 or 8."
+  (interactive)
+  (if (numberp transfer-level)
+      (setq mime-editor/transfer-level transfer-level)
+    (if (< mime-editor/transfer-level 8)
+       (setq mime-editor/transfer-level 8)
+      (setq mime-editor/transfer-level 7)
+      ))
+  (setq mime-editor/charset-default-encoding-alist
+       (mime-editor/make-charset-default-encoding-alist
+        mime-editor/transfer-level))
+  (message (format "Current transfer-level is %d bit"
+                  mime-editor/transfer-level))
+  (setq mime-editor/transfer-level-string
+       (mime/encoding-name mime-editor/transfer-level 'not-omit))
+  (force-mode-line-update)
+  )
+
+(defun mime-editor/set-transfer-level-7bit ()
+  (interactive)
+  (mime-editor/toggle-transfer-level 7)
+  )
+
+(defun mime-editor/set-transfer-level-8bit ()
+  (interactive)
+  (mime-editor/toggle-transfer-level 8)
+  )
+
+
+;;; @ pgp
+;;;
+
+(defun mime-editor/set-sign (arg)
+  (interactive
+   (list
+    (y-or-n-p "Do you want to sign?")
+    ))
+  (if arg
+      (if mime-editor/signing-type
+         (progn
+           (setq mime-editor/pgp-processing 'sign)
+           (message "This message will be signed.")
+           )
+       (message "Please specify signing type.")
+       )
+    (if (eq mime-editor/pgp-processing 'sign)
+       (setq mime-editor/pgp-processing nil)
+      )
+    (message "This message will not be signed.")
+    ))
+
+(defun mime-editor/set-encrypt (arg)
+  (interactive
+   (list
+    (y-or-n-p "Do you want to encrypt?")
+    ))
+  (if arg
+      (if mime-editor/encrypting-type
+         (progn
+           (setq mime-editor/pgp-processing 'encrypt)
+           (message "This message will be encrypt.")
+           )
+       (message "Please specify encrypting type.")
+       )
+    (if (eq mime-editor/pgp-processing 'encrypt)
+       (setq mime-editor/pgp-processing nil)
+      )
+    (message "This message will not be encrypt.")
+    ))
+
+(defvar mime-editor/pgp-processing nil)
+(make-variable-buffer-local 'mime-editor/pgp-processing)
+
+(defun mime-editor/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))
+       )
+    (if beg
+       (cond ((eq mime-editor/pgp-processing 'sign)
+              (mime-editor/enclose-signed-region beg end)
+              )
+             ((eq mime-editor/pgp-processing 'encrypt)
+              (mime-editor/enclose-encrypted-region beg end)
+              ))
+      )))
+
 
 ;;; @ split
 ;;;
@@ -1988,15 +2323,111 @@ a recording host instead of local host."
   (fields subject id number total separator)
   (insert fields)
   (insert (format "Subject: %s (%d/%d)\n" subject number total))
-  (insert (format "Mime-Version: 1.0 (split by tm-edit %s)\n"
-                 mime-editor/version))
+  (insert (format "Mime-Version: 1.0 (split by %s)\n"
+                 mime-editor/version-name))
   (insert (format "\
 Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
                  id number total separator))
   )
 
-(defun mime-editor/split-and-send (&optional cmd)
+(defun mime-editor/split-and-send
+  (&optional cmd lines mime-editor/message-max-length)
+  (interactive)
+  (or lines
+      (setq lines
+           (count-lines (point-min) (point-max)))
+      )
+  (or mime-editor/message-max-length
+      (setq mime-editor/message-max-length
+           (or (cdr (assq major-mode mime-editor/message-max-length-alist))
+               mime-editor/message-default-max-length))
+      )
+  (let* ((mime-editor/draft-file-name 
+         (or (buffer-file-name)
+             (make-temp-name
+              (expand-file-name "tm-draft" mime/tmp-dir))))
+        (separator mail-header-separator)
+        (id (concat "\""
+                    (replace-space-with-underline (current-time-string))
+                    "@" (system-name) "\"")))
+    (run-hooks 'mime-editor/before-split-hook)
+    (let ((the-buf (current-buffer))
+         (copy-buf (get-buffer-create " *Original Message*"))
+         (header (rfc822/get-header-string-except
+                  mime-editor/split-ignored-field-regexp separator))
+         (subject (mail-fetch-field "subject"))
+         (total (+ (/ lines mime-editor/message-max-length)
+                   (if (> (mod lines mime-editor/message-max-length) 0)
+                       1)))
+         (command
+          (or cmd
+              (cdr
+               (assq major-mode
+                     mime-editor/split-message-sender-alist))
+              ))
+         (mime-editor/partial-number 1)
+         data)
+      (save-excursion
+       (set-buffer copy-buf)
+       (erase-buffer)
+       (insert-buffer the-buf)
+       (save-restriction
+         (if (re-search-forward
+              (concat "^" (regexp-quote separator) "$") nil t)
+             (let ((he (match-beginning 0)))
+               (replace-match "")
+               (narrow-to-region (point-min) he)
+               ))
+         (goto-char (point-min))
+         (while (re-search-forward mime-editor/split-blind-field-regexp nil t)
+           (delete-region (match-beginning 0)
+                          (1+ (rfc822/field-end)))
+           )))
+      (while (< mime-editor/partial-number total)
+       (erase-buffer)
+       (save-excursion
+         (set-buffer copy-buf)
+         (setq data (buffer-substring
+                     (point-min)
+                     (progn
+                       (goto-line mime-editor/message-max-length)
+                       (point))
+                     ))
+         (delete-region (point-min)(point))
+         )
+       (mime-editor/insert-partial-header
+        header subject id mime-editor/partial-number total separator)
+       (insert data)
+       (save-excursion
+         (message (format "Sending %d/%d..."
+                          mime-editor/partial-number total))
+         (call-interactively command)
+         (message (format "Sending %d/%d... done"
+                          mime-editor/partial-number total))
+         )
+       (setq mime-editor/partial-number
+             (1+ mime-editor/partial-number))
+       )
+      (erase-buffer)
+      (save-excursion
+       (set-buffer copy-buf)
+       (setq data (buffer-string))
+       (erase-buffer)
+       )
+      (mime-editor/insert-partial-header
+       header subject id mime-editor/partial-number total separator)
+      (insert data)
+      (save-excursion
+       (message (format "Sending %d/%d..."
+                        mime-editor/partial-number total))
+       (message (format "Sending %d/%d... done"
+                        mime-editor/partial-number total))
+       )
+      )))
+
+(defun mime-editor/maybe-split-and-send (&optional cmd)
   (interactive)
+  (run-hooks 'mime-editor/before-send-hook)
   (let ((mime-editor/message-max-length
         (or (cdr (assq major-mode mime-editor/message-max-length-alist))
             mime-editor/message-default-max-length))
@@ -2004,126 +2435,8 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
        )
     (if (and (> lines mime-editor/message-max-length)
             mime-editor/split-message)
-       (let* ((mime-editor/draft-file-name 
-               (or (buffer-file-name)
-                   (make-temp-name
-                    (expand-file-name "tm-draft" mime/tmp-dir))))
-              (separator mail-header-separator)
-              (config
-               (eval (cdr (assq major-mode mime-editor/window-config-alist))))
-              (id (concat "\""
-                          (replace-space-with-underline (current-time-string))
-                          "@" (system-name) "\"")))
-         (run-hooks 'mime-editor/before-split-hook)
-         (let* ((header (rfc822/get-header-string-except
-                         mime-editor/split-ignored-field-regexp separator))
-                (subject (mail-fetch-field "subject"))
-                (total (+ (/ lines mime-editor/message-max-length)
-                          (if (> (mod lines mime-editor/message-max-length) 0)
-                              1)))
-                (the-buf (current-buffer))
-                (buf (get-buffer "*tmp-send*"))
-                (command
-                 (or cmd
-                     (cdr
-                      (assq major-mode
-                            mime-editor/split-message-sender-alist))
-                     (cdr
-                      (assq major-mode
-                            mime-editor/message-default-sender-alist))
-                     ))
-                data)
-           (goto-char (point-min))
-           (if (re-search-forward (concat "^" (regexp-quote separator) "$")
-                                  nil t)
-               (replace-match "")
-             )
-           (if buf
-               (progn
-                 (switch-to-buffer buf)
-                 (erase-buffer)
-                 (switch-to-buffer the-buf)
-                 )
-             (setq buf (get-buffer-create "*tmp-send*"))
-             )
-           (switch-to-buffer buf)
-           (make-local-variable 'mail-header-separator)
-           (setq mail-header-separator separator)
-           (switch-to-buffer the-buf)
-           (goto-char (point-min))
-           (re-search-forward "^$" nil t)
-           (let ((mime-editor/partial-number 1))
-             (setq data (buffer-substring
-                         (point-min)
-                         (progn
-                           (goto-line mime-editor/message-max-length)
-                           (point))
-                         ))
-             (delete-region (point-min)(point))
-             (switch-to-buffer buf)
-             (mime-editor/insert-partial-header
-              header subject id mime-editor/partial-number total separator)
-             (insert data)
-             (save-excursion
-               (save-restriction
-                 (goto-char (point-min))
-                 (search-forward (concat "\n" mail-header-separator "\n"))
-                 (narrow-to-region
-                  (match-end 0)
-                  (if (re-search-forward "^$" nil t)
-                      (match-beginning 0)
-                    (point-max)
-                    ))
-                 (goto-char (point-min))
-                 (while (re-search-forward
-                         mime-editor/split-blind-field-regexp nil t)
-                   (delete-region (match-beginning 0)
-                                  (let ((e (rfc822/field-end)))
-                                    (if (< e (point-max))
-                                        (1+ e)
-                                      e)))
-                   )
-                 ))
-             (save-excursion
-               (message (format "Sending %d/%d..."
-                                mime-editor/partial-number total))
-               (call-interactively command)
-               (message (format "Sending %d/%d... done"
-                                mime-editor/partial-number total))
-               )
-             (erase-buffer)
-             (switch-to-buffer the-buf)
-             (setq mime-editor/partial-number 2)
-             (while (< mime-editor/partial-number total)
-               (setq data (buffer-substring
-                           (point-min)
-                           (progn
-                             (goto-line mime-editor/message-max-length)
-                             (point))
-                           ))
-               (delete-region (point-min)(point))
-               (switch-to-buffer buf)
-               (mime-editor/insert-partial-header
-                header subject id mime-editor/partial-number total separator)
-               (insert data)
-               (save-excursion
-                 (message (format "Sending %d/%d..."
-                                  mime-editor/partial-number total))
-                 (call-interactively command)
-                 (message (format "Sending %d/%d... done"
-                                  mime-editor/partial-number total))
-                 )
-               (erase-buffer)
-               (switch-to-buffer the-buf)
-               (setq mime-editor/partial-number
-                     (1+ mime-editor/partial-number))
-               )
-             (goto-char (point-min))
-             (mime-editor/insert-partial-header
-              header subject id mime-editor/partial-number total separator)
-             (message (format "Sending %d/%d..."
-                              mime-editor/partial-number total))
-             ))))))
+       (mime-editor/split-and-send cmd lines mime-editor/message-max-length)
+      )))
 
 
 ;;; @ preview message
@@ -2194,7 +2507,7 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 
 (defun mime-editor/draft-preview ()
   (interactive)
-  (let ((sep (assoc-value major-mode mime-editor/draft-header-separator-alist)))
+  (let ((sep (cdr (assq major-mode mime-editor/draft-header-separator-alist))))
     (or (stringp sep) (setq sep (eval sep)))
     (make-variable-buffer-local 'mime::article/draft-header-separator)
     (goto-char (point-min))
@@ -2237,17 +2550,160 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
           )
 
 
-;;; @ etc
+;;; @ edit again
 ;;;
 
-(defun replace-space-with-underline (str)
-  (mapconcat (function
-             (lambda (arg)
-               (char-to-string
-                (if (= arg 32)
-                    ?_
-                  arg)))) str "")
-  )
+(defun mime-editor::edit-again (code-conversion)
+  (save-excursion
+    (goto-char (point-min))
+    (let ((ctl (mime/Content-Type)))
+      (if ctl
+         (let ((ctype (car ctl))
+               (params (cdr ctl))
+               type stype)
+           (if (string-match "/" ctype)
+               (progn
+                 (setq type (substring ctype 0 (match-beginning 0)))
+                 (setq stype (substring ctype (match-end 0)))
+                 )
+             (setq type ctype)
+             )
+           (cond
+            ((string-equal type "multipart")
+             (let* ((boundary (assoc-value "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-editor::edit-again code-conversion)
+                           (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)
+                                    )))
+               ))
+            (t
+             (let* (charset
+                    (pstr
+                     (mapconcat (function
+                                 (lambda (attr)
+                                   (if (string-equal (car attr)
+                                                     "charset")
+                                       (progn
+                                         (setq charset (cdr attr))
+                                         "")
+                                     (concat ";" (car attr)
+                                             "=" (cdr attr))
+                                     )
+                                   ))
+                                params ""))
+                    encoding
+                    encoded)
+               (save-excursion
+                 (if (re-search-forward
+                      "Content-Transfer-Encoding:" nil t)
+                     (let ((beg (match-beginning 0))
+                           (hbeg (match-end 0))
+                           (end (rfc822/field-end)))
+                       (setq encoding
+                             (eliminate-top-spaces
+                              (rfc822/unfolding-string
+                               (buffer-substring hbeg end))))
+                       (if (or charset (string-equal 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 code-conversion encoded)
+                   (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 (= (point-min) 1)
+                     (progn
+                       (goto-char he)
+                       (insert
+                        (concat "\n"
+                                (mime-create-tag
+                                 (concat type "/" stype pstr) encoding)))
+                       )
+                   (delete-region (point-min) he)
+                   (insert
+                    (mime-create-tag
+                     (concat type "/" stype pstr) encoding))
+                   ))
+               ))))
+       (if code-conversion
+           (decode-mime-charset-region (point-min) (point-max)
+                                       default-mime-charset)
+         )
+       ))))
+
+(defun mime/edit-again (&optional code-conversion no-separator no-mode)
+  (interactive)
+  (mime-editor::edit-again code-conversion)
+  (goto-char (point-min))
+  (save-restriction
+    (narrow-to-region
+     (point-min)
+     (if (re-search-forward
+         (concat "^\\(" (regexp-quote mail-header-separator) "\\)?$")
+         nil t)
+        (match-end 0)
+       (point-max)
+       ))
+    (goto-char (point-min))
+    (while (re-search-forward
+           "^\\(Content-.*\\|Mime-Version\\):" nil t)
+      (delete-region (match-beginning 0) (1+ (rfc822/field-end)))
+      ))
+  (or no-separator
+      (and (re-search-forward "^$")
+          (replace-match mail-header-separator)
+          ))
+  (or no-mode
+      (mime/editor-mode)
+      ))
 
 
 ;;; @ end
@@ -2256,3 +2712,5 @@ Content-Type: message/partial; id=%s; number=%d; total=%d\n%s\n"
 (provide 'tm-edit)
 
 (run-hooks 'tm-edit-load-hook)
+
+;;; tm-edit.el ends here