From: Andreas Gerler <baron@bundesbrandschatzamt.de>
Date: Fri, 31 Jan 2020 16:08:46 +0000 (+0100)
Subject: update org-mime
X-Git-Url: http://git.bundesbrandschatzamt.de/?a=commitdiff_plain;h=a80c82de83899f27913a74ddaf45970a3718dff1;p=emacsconfig.git

update org-mime
---

diff --git a/bba.org b/bba.org
index fc0ba656..75a997cd 100644
--- a/bba.org
+++ b/bba.org
@@ -1967,7 +1967,7 @@ Use =C-c M= to send a multipart email with .org as text and exported
 html.
 
 #+BEGIN_SRC emacs-lisp :tangle yes
-  (load-file "~/.emacs.d/elpa/org-mime-20190805.57/org-mime.el")
+  (load-file "~/.emacs.d/elpa/org-mime-20191226.2309/org-mime.el")
   (add-hook 'org-mode-hook
             (lambda()
               (define-key org-mode-map "\C-c\S-m" 'org-mime-org-buffer-htmlize)))
diff --git a/elpa/org-mime-20190805.57/org-mime-autoloads.el b/elpa/org-mime-20190805.57/org-mime-autoloads.el
deleted file mode 100644
index 3fe08d3f..00000000
--- a/elpa/org-mime-20190805.57/org-mime-autoloads.el
+++ /dev/null
@@ -1,55 +0,0 @@
-;;; org-mime-autoloads.el --- automatically extracted autoloads
-;;
-;;; Code:
-(add-to-list 'load-path (directory-file-name (or (file-name-directory #$) (car load-path))))
-
-;;;### (autoloads nil "org-mime" "org-mime.el" (23994 46438 579200
-;;;;;;  771000))
-;;; Generated autoloads from org-mime.el
-
-(autoload 'org-mime-htmlize "org-mime" "\
-Export a portion of an email to html using `org-mode'.
-If called with an active region only export that region, otherwise entire body.
-
-\(fn)" t nil)
-
-(autoload 'org-mime-org-buffer-htmlize "org-mime" "\
-Create an email buffer of the current org buffer.
-The email buffer will contain both html and in org formats as mime
-alternatives.
-
-The following file keywords can be used to control the headers:
-#+MAIL_TO: some1@some.place
-#+MAIL_SUBJECT: a subject line
-#+MAIL_CC: some2@some.place
-#+MAIL_BCC: some3@some.place
-#+MAIL_FROM: sender@some.place
-
-The cursor ends in the TO field.
-
-\(fn)" t nil)
-
-(autoload 'org-mime-org-subtree-htmlize "org-mime" "\
-Create an email buffer of the current subtree.  If HTMLIZE-FIRST-LEVEL is
-not nil, the first level subtree which containing current subtree is htmlized.
-
-Following headline properties can determine the mail headers,
-* subtree heading
-  :PROPERTIES:
-  :MAIL_SUBJECT: mail title
-  :MAIL_TO: person1@gmail.com
-  :MAIL_CC: person2@gmail.com
-  :MAIL_BCC: person3@gmail.com
-  :MAIL_FROM: sender@gmail.com
-  :END:
-
-\(fn &optional HTMLIZE-FIRST-LEVEL)" t nil)
-
-;;;***
-
-;; Local Variables:
-;; version-control: never
-;; no-byte-compile: t
-;; no-update-autoloads: t
-;; End:
-;;; org-mime-autoloads.el ends here
diff --git a/elpa/org-mime-20190805.57/org-mime-pkg.el b/elpa/org-mime-20190805.57/org-mime-pkg.el
deleted file mode 100644
index fcfe0eb3..00000000
--- a/elpa/org-mime-20190805.57/org-mime-pkg.el
+++ /dev/null
@@ -1,2 +0,0 @@
-;;; -*- no-byte-compile: t -*-
-(define-package "org-mime" "20190805.57" "org html export for text/html MIME emails" '((emacs "24.4") (cl-lib "0.5")) :commit "4bd5d55ba9bca84ffd938b477c72d701cf3736df" :keywords '("mime" "mail" "email" "html") :authors '(("Eric Schulte")) :maintainer '("Chen Bin (redguardtoo)") :url "http://github.com/org-mime/org-mime")
diff --git a/elpa/org-mime-20190805.57/org-mime.el b/elpa/org-mime-20190805.57/org-mime.el
deleted file mode 100644
index 68a3af63..00000000
--- a/elpa/org-mime-20190805.57/org-mime.el
+++ /dev/null
@@ -1,590 +0,0 @@
-;;; org-mime.el --- org html export for text/html MIME emails
-
-;; Copyright (C) 2010-2015 Eric Schulte
-
-;; Author: Eric Schulte
-;; Maintainer: Chen Bin (redguardtoo)
-;; Keywords: mime, mail, email, html
-;; Package-Version: 20190805.57
-;; Homepage: http://github.com/org-mime/org-mime
-;; Version: 0.1.6
-;; Package-Requires: ((emacs "24.4") (cl-lib "0.5"))
-
-;; This file is not part of GNU Emacs.
-
-;;; License:
-
-;; 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 3, or (at your option)
-;; any later version.
-;;
-;; 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.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; WYSIWYG, html mime composition using org-mode
-;;
-;; For mail composed using the orgstruct-mode minor mode, this
-;; provides a function for converting all or part of your mail buffer
-;; to embedded html as exported by org-mode.  Call `org-mime-htmlize'
-;; in a message buffer to convert either the active region or the
-;; entire buffer to html.
-;;
-;; Similarly the `org-mime-org-buffer-htmlize' function can be called
-;; from within an org-mode buffer to convert the buffer to html, and
-;; package the results into an email handling with appropriate MIME
-;; encoding.
-;;
-;; `org-mime-org-subtree-htmlize' is similar to `org-mime-org-buffer-htmlize'
-;; but works on current subtree. It can read following subtree properties:
-;; MAIL_SUBJECT, MAIL_TO, MAIL_FROM, MAIL_CC, and MAIL_BCC.
-;;
-;; Here is the sample of a subtree:
-;; * mail one
-;;   :PROPERTIES:
-;;   :MAIL_SUBJECT: mail title
-;;   :MAIL_TO: person1@gmail.com
-;;   :MAIL_FROM: sender@gmail.com
-;;   :MAIL_CC: person2@gmail.com
-;;   :MAIL_BCC: person3@gmail.com
-;;   :END:
-;;
-;; To avoid exporting the table of contents, you can setup
-;; `org-mime-export-options':
-;;   (setq org-mime-export-options '(:section-numbers nil
-;;                                   :with-author nil
-;;                                   :with-toc nil))
-;;
-;; Or just setup your export options in the org buffer/subtree. These are
-;; overridden by `org-mime-export-options' when it is non-nil.
-;;
-;;
-;; Quick start:
-;; Write a message in message-mode, make sure the mail body follows
-;; org format. Before sending mail, run `M-x org-mime-htmlize' to convert the
-;; body to html, then send the mail as usual.
-;;
-;; Setup (OPTIONAL):
-;; You might want to bind this to a key with something like the
-;; following message-mode binding
-;;
-;;   (add-hook 'message-mode-hook
-;;             (lambda ()
-;;               (local-set-key (kbd "C-c M-o") 'org-mime-htmlize)))
-;;
-;; and the following org-mode binding
-;;
-;;   (add-hook 'org-mode-hook
-;;             (lambda ()
-;;               (local-set-key (kbd "C-c M-o") 'org-mime-org-buffer-htmlize)))
-;;
-;; Extra Tips:
-;; 1. In order to embed images into your mail, use the syntax below,
-;; [[/full/path/to/your.jpg]]
-;;
-;; 2. It's easy to add your own emphasis markup. For example, to render text
-;; between "@" in a red color, you can add a function to `org-mime-html-hook':
-;;
-;;   (add-hook 'org-mime-html-hook
-;;             (lambda ()
-;;               (while (re-search-forward "@\\([^@]*\\)@" nil t)
-;;                 (replace-match "<span style=\"color:red\">\\1</span>"))))
-;;
-;; 3. Now the quoted mail uses a modern style (like Gmail), so mail replies
-;; looks clean and modern. If you prefer the old style, please set
-;; `org-mime-beautify-quoted-mail' to nil.
-
-;;; Code:
-(require 'cl-lib)
-(require 'outline)
-(require 'org)
-(require 'ox-org)
-
-(defcustom org-mime-beautify-quoted-mail t
-  "Beautify quoted mail in more clean HTML, like Gmail."
-  :group 'org-mime
-  :type 'boolean)
-
-(defcustom org-mime-use-property-inheritance nil
-  "Non-nil means al MAIL_ properties apply also for sublevels."
-  :group 'org-mime
-  :type 'boolean)
-
-(defcustom org-mime-default-header
-  "#+OPTIONS: latex:t toc:nil H:3\n"
-  "Default header to control html export options.
-And ensure first line isn't assumed to be a title line."
-  :group 'org-mime
-  :type 'string)
-
-(defcustom org-mime-library 'mml
-  "Library to use for marking up MIME elements."
-  :group 'org-mime
-  :type '(choice 'mml 'semi 'vm))
-
-(defcustom org-mime-preserve-breaks t
-  "Temporary value of `org-export-preserve-breaks' during mime encoding."
-  :group 'org-mime
-  :type 'boolean)
-
-(defcustom org-mime-fixedwith-wrap
-  "<pre style=\"font-family: courier, monospace;\">\n%s</pre>\n"
-  "Format string used to wrap a fixedwidth HTML email."
-  :group 'org-mime
-  :type 'string)
-
-(defcustom org-mime-find-html-start 'identity
-  "Call back to search the new HTML start for htmlize in message buffer."
-  :group 'org-mime
-  :type 'sexp)
-
-(defcustom org-mime-org-html-with-latex-default 'dvipng
-  "Default value of `org-html-with-latex'."
-  :group 'org-mime
-  :type 'sexp)
-
-(defvar org-mime-export-options '(:with-latex dvipng)
-  "Default export options which may overrides org buffer/subtree options.
-You avoid exporting section-number/author/toc with the setup below,
-`(setq org-mime-export-options '(:section-numbers nil :with-author nil :with-toc nil))'")
-
-(defvar org-mime-html-hook nil
-  "Hook to run over the html buffer before attachment to email.
-This could be used for example to post-process html elements.")
-
-(defvar org-mime-pre-html-hook nil
-  "Hook to run before html export.
-Functions should take no arguments and will be run in a
-buffer holding the text to be exported.")
-
-(defvar org-mime-send-buffer-hook nil
-  "Hook to run in the Org-mode file before export.")
-
-(defvar org-mime-debug nil
-  "Enable debug logger.")
-
-(defun org-mime-get-export-options (subtreep)
-  "SUBTREEP is t if current node is subtree."
-  (cond
-   (subtreep
-    (or org-mime-export-options
-        (if (fboundp 'org-export--get-subtree-options)
-            (org-export--get-subtree-options))))
-   (t
-    (or org-mime-export-options
-        (if (fboundp 'org-export--get-inbuffer-options)
-            (org-export--get-inbuffer-options))))))
-
-(defun org-mime-current-line ()
-  "Get current line"
-  (buffer-substring-no-properties (line-beginning-position)
-                                  (line-end-position)))
-
-(defun org-mime-export-buffer-or-subtree (subtreep)
-  "Similar to `org-html-export-as-html' and `org-org-export-as-org'.
-SUBTREEP is t if current node is subtree."
-  (let* ((plain (buffer-string))
-         (buf (org-export-to-buffer 'html "*Org Mime Export*"
-                nil subtreep nil (org-mime-get-export-options subtreep)))
-         (body (prog1
-                   (with-current-buffer buf
-                     (buffer-string))
-                 (kill-buffer buf))))
-    (cons body plain)))
-
-(defun org-mime-export-string (string &optional opts)
-  "Export STRING into html.
-OPTS is export options."
-  ;; Emacs 25+ prefer exporting drawer by default
-  ;; obviously not acceptable in exporting to mail body
-  (let* ((org-export-with-drawers nil))
-    ;; we won't export title from org file anyway
-    (if opts (setq opts (plist-put opts 'title nil)))
-    ;; emacs24.4+
-    (org-export-string-as string 'html t (or org-mime-export-options opts))))
-
-;; example hook, for setting a dark background in
-;; <pre style="background-color: #EEE;"> elements
-(defun org-mime-change-element-style (element style)
-  "Set <ELEMENT> elements in exported html with new default html STYLE."
-  (while (re-search-forward (format "<%s" element) nil t)
-    (replace-match (format "<%s style=\"%s\"" element style))))
-
-(defun org-mime-change-class-style (class style)
-  "CLASS is used for new default html STYLE in exported html."
-  (while (re-search-forward (format "class=\"%s\"" class) nil t)
-    (replace-match (format "class=\"%s\" style=\"%s\"" class style))))
-
-;; ;; example addition to `org-mime-html-hook' adding a dark background
-;; ;; color to <pre> elements
-;; (add-hook 'org-mime-html-hook
-;;           (lambda ()
-;;             (org-mime-change-element-style
-;;              "pre" (format "color: %s; background-color: %s;"
-;;                            "#E6E1DC" "#232323"))
-;;             (org-mime-change-class-style
-;;              "verse" "border-left: 2px solid gray; padding-left: 4px;")))
-
-(defun org-mime-file (ext path id)
-  "Markup a file with EXT, PATH and ID for attachment."
-  (when org-mime-debug (message "org-mime-file called => %s %s %s" ext path id))
-  (cl-case org-mime-library
-    (mml (format "<#part type=\"%s\" filename=\"%s\" disposition=inline id=\"<%s>\">\n<#/part>\n"
-                 ext path id))
-    (semi (concat
-           (format "--[[%s\nContent-Disposition: inline;\nContent-ID: <%s>][base64]]\n"
-                   ext id)
-           (base64-encode-string
-            (with-temp-buffer
-              (set-buffer-multibyte nil)
-              (insert-file-contents-literally path)
-              (buffer-string)))))
-    (vm "?")))
-
-(defun org-mime-beautify-quoted (html)
-  "Clean up quoted mail in modern UI style.
-HTML is the body of the message."
-  (let ((quote-depth 0)
-        (line-depth 0)
-        (quote-opening "<blockquote class=\"gmail_quote\" style=\"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex\">\n<p>\n")
-        (quote-closing "</p>\n</blockquote>\n"))
-    (with-temp-buffer
-      ;; clean title of quoted
-      (insert (replace-regexp-in-string
-               "<p>[\n\r]*&gt;&gt;&gt;&gt;&gt; .* == \\([^\r\n]*\\)[\r\n]*</p>"
-               "<div class=\"gmail_quote\">\\1</div>"
-               html))
-      (goto-char (point-min))
-      (while (not (eobp))
-        (setq line-depth 0)
-        (while (looking-at "&gt;[ \t]*")
-          (replace-match "")
-          (cl-incf line-depth))
-        (cond
-         ((< quote-depth line-depth)
-          (while (< quote-depth line-depth)
-            (insert quote-opening)
-            (cl-incf quote-depth)))
-         ((> quote-depth line-depth)
-          (while (> quote-depth line-depth)
-            (insert quote-closing)
-            (cl-decf quote-depth))))
-        (forward-line))
-      (buffer-substring (point-min) (point-max)))))
-
-(defun org-mime-multipart (plain html &optional images)
-  "Markup a multipart/alternative with HTML alternatives.
-If html portion of message includes IMAGES they are wrapped in multipart/related part."
-  (cl-case org-mime-library
-    (mml (concat "<#multipart type=alternative>\n<#part type=text/plain>"
-                 plain
-                 (when images "<#multipart type=related>")
-                 "<#part type=text/html>"
-                 (if org-mime-beautify-quoted-mail
-                     (org-mime-beautify-quoted html)
-                   html)
-                 images
-                 (when images "<#/multipart>\n")
-                 "<#/multipart>\n"))
-    (semi (concat
-           "--" "<<alternative>>-{\n"
-           "--" "[[text/plain]]\n" plain
-           (when images (concat "--" "<<alternative>>-{\n"))
-           "--" "[[text/html]]\n"  html
-           images
-           (when images (concat "--" "}-<<alternative>>\n"))
-           "--" "}-<<alternative>>\n"))
-    (vm "?")))
-
-(defun org-mime-url-to-path (url current-file)
-  "If URL is file path, convert to valid path.
-Or else use CURRENT-FILE to calculate path."
-  (let* ((dir (file-name-directory current-file))
-         (path (expand-file-name url dir)))
-    (cond
-     ((string-match-p "^file:///" url)
-      (replace-regexp-in-string "^file://" "" url))
-     ((file-exists-p path)
-      path)
-     (t
-      (expand-file-name url default-directory)))))
-
-(defun org-mime-replace-images (str current-file)
-  "Replace images in STR with cid links.
-CURRENT-FILE is used to calculate full path of images."
-  (when org-mime-debug (message "org-mime-replace-images called => %s" current-file))
-  (let* (html-images)
-    (cons
-     (replace-regexp-in-string ;; replace images in html
-      "src=\"\\([^\"]+\\)\""
-      (lambda (text)
-        (format
-         "src=\"cid:%s\""
-         (let* ((url (and (string-match "src=\"\\([^\"]+\\)\"" text)
-                          (match-string 1 text)))
-                (path (org-mime-url-to-path url current-file))
-                (ext (file-name-extension path))
-                (id (replace-regexp-in-string "[\/\\\\]" "_" path)))
-
-           ;; Catch non-existent files here. Otherwise users get an error on sending.
-           (unless (file-exists-p path)
-             (user-error "path: %s does not exist" path))
-
-           ;; Do it
-           (add-to-list 'html-images
-                        (org-mime-file (concat "image/" ext) path id))
-           id)))
-      str)
-     html-images)))
-
-(defun org-mime-extract-non-image-files ()
-  "Extract non-image links in current buffer."
-  (cond
-   ((>= (org-mime-org-major-version) 9)
-    (org-element-map (org-element-parse-buffer) 'link
-      (lambda (link)
-        (when (and (string= (org-element-property :type link) "file")
-                   (not (string-match
-                         (cdr (assoc "file" org-html-inline-image-rules))
-                         (org-element-property :path link))))
-          (org-element-property :path link)))))
-   (t
-    (message "Warning: org-element-map is not available. File links will not be attached.")
-    nil)))
-
-(defun org-mime-insert-html-content (plain file html opts)
-  "Insert HTML content."
-  (let* ((files (org-mime-extract-non-image-files))
-         ;; dvipng for inline latex because MathJax doesn't work in mail
-         ;; Also @see https://github.com/org-mime/org-mime/issues/16
-         ;; (setq org-html-with-latex nil) sometimes useful
-         (org-html-with-latex org-mime-org-html-with-latex-default)
-         ;; we don't want to convert org file links to html
-         (org-html-link-org-files-as-html nil)
-         (org-link-file-path-type 'absolute)
-         ;; prettify reply with ">"
-         (org-export-preserve-breaks org-mime-preserve-breaks)
-         ;; org 9
-         (org-html-htmlize-output-type 'inline-css)
-         ;; org 8
-         (org-export-htmlize-output-type 'inline-css)
-         (html-and-images (org-mime-replace-images html file))
-         (images (cdr html-and-images))
-         (html (org-mime-apply-html-hook (car html-and-images))))
-
-    ;; If there are files that were attached, we should remove the links,
-    ;; and mark them as attachments. The links don't work in the html file.
-    (when files
-      (mapc (lambda (f)
-              (setq html (replace-regexp-in-string
-                          (format "<a href=\"%s\">%s</a>"
-                                  (regexp-quote f) (regexp-quote f))
-                          (format "%s (attached)" (file-name-nondirectory f))
-                          html)))
-            files))
-
-    (insert (org-mime-multipart plain
-                                html
-                                (if images (mapconcat 'identity images "\n"))))
-
-    ;; Attach any residual files
-    (when files
-      (mapc (lambda (f)
-              (when org-mime-debug (message "attaching: %s" f))
-              (mml-attach-file f))
-            files))))
-
-;;;###autoload
-(defun org-mime-htmlize ()
-  "Export a portion of an email to html using `org-mode'.
-If called with an active region only export that region, otherwise entire body."
-  (interactive)
-  (when org-mime-debug (message "org-mime-htmlize called"))
-  (let* ((region-p (org-region-active-p))
-         (html-start (funcall org-mime-find-html-start
-                              (or (and region-p (region-beginning))
-                                  (save-excursion
-                                    (goto-char (point-min))
-                                    (search-forward mail-header-separator)
-                                    (+ (point) 1)))))
-         (html-end (or (and region-p (region-end))
-                       ;; TODO: should catch signature...
-                       (point-max)))
-         (plain (buffer-substring html-start html-end))
-;; to hold attachments for inline html images
-         (opts (if (fboundp 'org-export--get-inbuffer-options)
-                   (org-export--get-inbuffer-options)))
-         (html (org-mime-export-string (concat org-mime-default-header plain) opts))
-         (file (make-temp-name (expand-file-name
-                                "mail" temporary-file-directory))))
-
-    ;; delete current region
-    (delete-region html-start html-end)
-    (goto-char html-start)
-    ;; insert new current
-    (org-mime-insert-html-content plain file html opts)))
-
-(defun org-mime-apply-html-hook (html)
-  "Apply HTML hook."
-  (if org-mime-html-hook
-      (with-temp-buffer
-        (insert html)
-        (goto-char (point-min))
-        (run-hooks 'org-mime-html-hook)
-        (buffer-string))
-    html))
-
-(defun org-mime--get-buffer-title ()
-  "Get buffer title."
-  (let* ((tmp (if (fboundp 'org-export--get-inbuffer-options)
-                  (plist-get (org-export--get-inbuffer-options) :title))))
-    (when tmp
-      (let ((txt (car tmp)))
-        (set-text-properties 0 (length txt) nil txt)
-        txt))))
-
-(defun org-mime-compose (exported file to subject headers subtreep)
-  "Create mail body from EXPORTED in FILE with TO, SUBJECT, HEADERS.
-If SUBTREEP is t, curret org node is subtree."
-  ;; start composing mail
-  (let* ((html (car exported))
-         (plain (cdr exported))
-         (export-opts (org-mime-get-export-options subtreep))
-         patched-html)
-    (unless (featurep 'message) (require 'message))
-    (message-mail to subject headers nil)
-    (message-goto-body)
-    (setq patched-html (with-temp-buffer
-                         (insert html)
-                         (goto-char (point-min))
-                         (run-hooks 'org-mime-pre-html-hook)
-                         (buffer-string)))
-    ;; insert text
-    (org-mime-insert-html-content plain file patched-html export-opts)))
-
-(defun org-mime-extract-keywords ()
-  "Extract keywords."
-  (cond
-   ((>= (org-mime-org-major-version) 9)
-    (org-element-map (org-element-parse-buffer) 'keyword
-      (lambda (keyword)
-        (cons (org-element-property :key keyword)
-              (org-element-property :value keyword)))))
-   (t
-    (message "Warning: org-element-map is not available. File keywords will not work.")
-    '())))
-
-(defun org-mime-build-mail-other-headers (cc bcc from)
-  "Build mail header from CC, BCC, and FROM."
-  (let* ((arr (list (cons "Cc" cc) (cons "Bcc" bcc)  (cons "From" from )))
-         rlt)
-    (dolist (e arr)
-      (when (cdr e)
-        (push e rlt)))
-    rlt))
-
-;;;###autoload
-(defun org-mime-org-buffer-htmlize ()
-  "Create an email buffer of the current org buffer.
-The email buffer will contain both html and in org formats as mime
-alternatives.
-
-The following file keywords can be used to control the headers:
-#+MAIL_TO: some1@some.place
-#+MAIL_SUBJECT: a subject line
-#+MAIL_CC: some2@some.place
-#+MAIL_BCC: some3@some.place
-#+MAIL_FROM: sender@some.place
-
-The cursor ends in the TO field."
-  (interactive)
-  (run-hooks 'org-mime-send-buffer-hook)
-  (let* ((org-html-klipsify-src nil)
-         (region-p (org-region-active-p))
-         (file (buffer-file-name (current-buffer)))
-         (keywords (org-mime-extract-keywords))
-         (subject (or (cdr (assoc "MAIL_SUBJECT" keywords))
-                      (org-mime--get-buffer-title)
-                      (if (not file) (buffer-name (buffer-base-buffer))
-                        (file-name-sans-extension
-                         (file-name-nondirectory file)))))
-         (exported (org-mime-export-buffer-or-subtree nil))
-         (to (cdr (assoc "MAIL_TO" keywords)))
-         (cc (cdr (assoc "MAIL_CC" keywords)))
-         (bcc (cdr (assoc "MAIL_BCC" keywords)))
-         (from (cdr (assoc "MAIL_FROM" keywords)))
-         (other-headers (org-mime-build-mail-other-headers cc bcc from)))
-    (org-mime-compose exported file to subject other-headers nil)
-    (message-goto-to)))
-
-(defun org-mime-org-major-version ()
-  "Get Org major version."
-  (string-to-number (car (split-string (org-release) "\\."))))
-
-(defun org-mime-attr (p)
-  (org-entry-get nil p org-mime-use-property-inheritance))
-
-;;;###autoload
-(defun org-mime-org-subtree-htmlize (&optional htmlize-first-level)
-  "Create an email buffer of the current subtree.  If HTMLIZE-FIRST-LEVEL is
-not nil, the first level subtree which containing current subtree is htmlized.
-
-Following headline properties can determine the mail headers,
-* subtree heading
-  :PROPERTIES:
-  :MAIL_SUBJECT: mail title
-  :MAIL_TO: person1@gmail.com
-  :MAIL_CC: person2@gmail.com
-  :MAIL_BCC: person3@gmail.com
-  :MAIL_FROM: sender@gmail.com
-  :END:
-"
-  (interactive "P")
-  (save-excursion
-    (org-back-to-heading)
-
-    (when (and htmlize-first-level
-               (not (string-match "^\\* " (org-mime-current-line))))
-      ;; go back to the 1st level substree
-      (re-search-backward "^\\* ")
-      (org-back-to-heading))
-
-    (when (outline-on-heading-p nil)
-      (let* ((file (buffer-file-name (current-buffer)))
-             (subject (or (org-mime-attr "MAIL_SUBJECT")
-                          (nth 4 (org-heading-components))))
-             (to (org-mime-attr "MAIL_TO"))
-             (cc (org-mime-attr "MAIL_CC"))
-             (bcc (org-mime-attr "MAIL_BCC"))
-             (from (org-mime-attr "MAIL_FROM"))
-             ;; Thanks to Matt Price improving handling of cc & bcc headers
-             (other-headers (org-mime-build-mail-other-headers cc bcc from))
-             (org-export-show-temporary-export-buffer nil)
-             (subtree-opts (when (fboundp 'org-export--get-subtree-options)
-                             (org-export--get-subtree-options)))
-             (org-export-show-temporary-export-buffer nil)
-             (org-major-version (org-mime-org-major-version))
-             ;; I wrap these bodies in export blocks because in org-mime-compose
-             ;; they get exported again. This makes each block conditionally
-             ;; exposed depending on the backend.
-             (exported (save-restriction (org-narrow-to-subtree)
-                                          (org-mime-export-buffer-or-subtree t))))
-        (save-restriction
-          (org-narrow-to-subtree)
-          (org-mime-compose exported file to subject other-headers t))
-        (message-goto-to)))))
-
-(provide 'org-mime)
-;; Local Variables:
-;; coding: utf-8
-;; tab-width: 2
-;; indent-tabs-mode: nil
-;; End:
-;;; org-mime.el ends here
diff --git a/elpa/org-mime-20191226.2309/org-mime-autoloads.el b/elpa/org-mime-20191226.2309/org-mime-autoloads.el
new file mode 100644
index 00000000..f320b8db
--- /dev/null
+++ b/elpa/org-mime-20191226.2309/org-mime-autoloads.el
@@ -0,0 +1,60 @@
+;;; org-mime-autoloads.el --- automatically extracted autoloads
+;;
+;;; Code:
+
+(add-to-list 'load-path (directory-file-name
+                         (or (file-name-directory #$) (car load-path))))
+
+
+;;;### (autoloads nil "org-mime" "org-mime.el" (0 0 0 0))
+;;; Generated autoloads from org-mime.el
+
+(autoload 'org-mime-htmlize "org-mime" "\
+Export a portion of an email to html using `org-mode'.
+If called with an active region only export that region, otherwise entire body.
+
+\(fn)" t nil)
+
+(autoload 'org-mime-org-buffer-htmlize "org-mime" "\
+Create an email buffer of the current org buffer.
+The email buffer will contain both html and in org formats as mime
+alternatives.
+
+The following file keywords can be used to control the headers:
+#+MAIL_TO: some1@some.place
+#+MAIL_SUBJECT: a subject line
+#+MAIL_CC: some2@some.place
+#+MAIL_BCC: some3@some.place
+#+MAIL_FROM: sender@some.place
+
+The cursor ends in the TO field.
+
+\(fn)" t nil)
+
+(autoload 'org-mime-org-subtree-htmlize "org-mime" "\
+Create an email buffer of the current subtree.  If HTMLIZE-FIRST-LEVEL is
+not nil, the first level subtree which containing current subtree is htmlized.
+
+Following headline properties can determine the mail headers,
+* subtree heading
+  :PROPERTIES:
+  :MAIL_SUBJECT: mail title
+  :MAIL_TO: person1@gmail.com
+  :MAIL_CC: person2@gmail.com
+  :MAIL_BCC: person3@gmail.com
+  :MAIL_FROM: sender@gmail.com
+  :END:
+
+\(fn &optional HTMLIZE-FIRST-LEVEL)" t nil)
+
+(if (fboundp 'register-definition-prefixes) (register-definition-prefixes "org-mime" '("org-mime-")))
+
+;;;***
+
+;; Local Variables:
+;; version-control: never
+;; no-byte-compile: t
+;; no-update-autoloads: t
+;; coding: utf-8
+;; End:
+;;; org-mime-autoloads.el ends here
diff --git a/elpa/org-mime-20191226.2309/org-mime-pkg.el b/elpa/org-mime-20191226.2309/org-mime-pkg.el
new file mode 100644
index 00000000..df626cab
--- /dev/null
+++ b/elpa/org-mime-20191226.2309/org-mime-pkg.el
@@ -0,0 +1,2 @@
+;;; -*- no-byte-compile: t -*-
+(define-package "org-mime" "20191226.2309" "org html export for text/html MIME emails" '((emacs "24.4") (cl-lib "0.5")) :commit "b1899762170eaa656555ce62c58e613ca3509ec4" :keywords '("mime" "mail" "email" "html") :authors '(("Eric Schulte")) :maintainer '("Chen Bin (redguardtoo)") :url "http://github.com/org-mime/org-mime")
diff --git a/elpa/org-mime-20191226.2309/org-mime.el b/elpa/org-mime-20191226.2309/org-mime.el
new file mode 100644
index 00000000..54b895d4
--- /dev/null
+++ b/elpa/org-mime-20191226.2309/org-mime.el
@@ -0,0 +1,597 @@
+;;; org-mime.el --- org html export for text/html MIME emails
+
+;; Copyright (C) 2010-2015 Eric Schulte
+
+;; Author: Eric Schulte
+;; Maintainer: Chen Bin (redguardtoo)
+;; Keywords: mime, mail, email, html
+;; Package-Version: 20191226.2309
+;; Homepage: http://github.com/org-mime/org-mime
+;; Version: 0.1.6
+;; Package-Requires: ((emacs "24.4") (cl-lib "0.5"))
+
+;; This file is not part of GNU Emacs.
+
+;;; License:
+
+;; 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 3, or (at your option)
+;; any later version.
+;;
+;; 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.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;; WYSIWYG, html mime composition using org-mode
+;;
+;; For mail composed using the orgstruct-mode minor mode, this
+;; provides a function for converting all or part of your mail buffer
+;; to embedded html as exported by org-mode.  Call `org-mime-htmlize'
+;; in a message buffer to convert either the active region or the
+;; entire buffer to html.
+;;
+;; Similarly the `org-mime-org-buffer-htmlize' function can be called
+;; from within an org-mode buffer to convert the buffer to html, and
+;; package the results into an email handling with appropriate MIME
+;; encoding.
+;;
+;; `org-mime-org-subtree-htmlize' is similar to `org-mime-org-buffer-htmlize'
+;; but works on current subtree. It can read following subtree properties:
+;; MAIL_SUBJECT, MAIL_TO, MAIL_FROM, MAIL_CC, and MAIL_BCC.
+;;
+;; Here is the sample of a subtree:
+;; * mail one
+;;   :PROPERTIES:
+;;   :MAIL_SUBJECT: mail title
+;;   :MAIL_TO: person1@gmail.com
+;;   :MAIL_FROM: sender@gmail.com
+;;   :MAIL_CC: person2@gmail.com
+;;   :MAIL_BCC: person3@gmail.com
+;;   :END:
+;;
+;; To avoid exporting the table of contents, you can setup
+;; `org-mime-export-options':
+;;   (setq org-mime-export-options '(:section-numbers nil
+;;                                   :with-author nil
+;;                                   :with-toc nil))
+;;
+;; Or just setup your export options in the org buffer/subtree. These are
+;; overridden by `org-mime-export-options' when it is non-nil.
+;;
+;;
+;; Quick start:
+;; Write a message in message-mode, make sure the mail body follows
+;; org format. Before sending mail, run `M-x org-mime-htmlize' to convert the
+;; body to html, then send the mail as usual.
+;;
+;; Setup (OPTIONAL):
+;; You might want to bind this to a key with something like the
+;; following message-mode binding
+;;
+;;   (add-hook 'message-mode-hook
+;;             (lambda ()
+;;               (local-set-key (kbd "C-c M-o") 'org-mime-htmlize)))
+;;
+;; and the following org-mode binding
+;;
+;;   (add-hook 'org-mode-hook
+;;             (lambda ()
+;;               (local-set-key (kbd "C-c M-o") 'org-mime-org-buffer-htmlize)))
+;;
+;; Extra Tips:
+;; 1. In order to embed images into your mail, use the syntax below,
+;; [[/full/path/to/your.jpg]]
+;;
+;; 2. It's easy to add your own emphasis markup. For example, to render text
+;; between "@" in a red color, you can add a function to `org-mime-html-hook':
+;;
+;;   (add-hook 'org-mime-html-hook
+;;             (lambda ()
+;;               (while (re-search-forward "@\\([^@]*\\)@" nil t)
+;;                 (replace-match "<span style=\"color:red\">\\1</span>"))))
+;;
+;; 3. Now the quoted mail uses a modern style (like Gmail), so mail replies
+;; looks clean and modern. If you prefer the old style, please set
+;; `org-mime-beautify-quoted-mail' to nil.
+;;
+;; 4. Please note this program can only embed exported HTML into mail.
+;;    Org-mode is responsible for rendering HTML.
+;;
+;;    For example, see https://github.com/org-mime/org-mime/issues/38
+;;    The solution is patching org-mode,
+;;    https://lists.gnu.org/archive/html/emacs-orgmode/2019-11/msg00016.html
+;;
+
+;;; Code:
+(require 'cl-lib)
+(require 'outline)
+(require 'org)
+(require 'ox-org)
+
+(defcustom org-mime-beautify-quoted-mail t
+  "Beautify quoted mail in more clean HTML, like Gmail."
+  :group 'org-mime
+  :type 'boolean)
+
+(defcustom org-mime-use-property-inheritance nil
+  "Non-nil means al MAIL_ properties apply also for sublevels."
+  :group 'org-mime
+  :type 'boolean)
+
+(defcustom org-mime-default-header
+  "#+OPTIONS: latex:t toc:nil H:3\n"
+  "Default header to control html export options.
+And ensure first line isn't assumed to be a title line."
+  :group 'org-mime
+  :type 'string)
+
+(defcustom org-mime-library 'mml
+  "Library to use for marking up MIME elements."
+  :group 'org-mime
+  :type '(choice 'mml 'semi 'vm))
+
+(defcustom org-mime-preserve-breaks t
+  "Temporary value of `org-export-preserve-breaks' during mime encoding."
+  :group 'org-mime
+  :type 'boolean)
+
+(defcustom org-mime-fixedwith-wrap
+  "<pre style=\"font-family: courier, monospace;\">\n%s</pre>\n"
+  "Format string used to wrap a fixedwidth HTML email."
+  :group 'org-mime
+  :type 'string)
+
+(defcustom org-mime-find-html-start 'identity
+  "Call back to search the new HTML start for htmlize in message buffer."
+  :group 'org-mime
+  :type 'sexp)
+
+(defcustom org-mime-org-html-with-latex-default 'dvipng
+  "Default value of `org-html-with-latex'."
+  :group 'org-mime
+  :type 'sexp)
+
+(defvar org-mime-export-options '(:with-latex dvipng)
+  "Default export options which may overrides org buffer/subtree options.
+You avoid exporting section-number/author/toc with the setup below,
+`(setq org-mime-export-options '(:section-numbers nil :with-author nil :with-toc nil))'")
+
+(defvar org-mime-html-hook nil
+  "Hook to run over the html buffer before attachment to email.
+This could be used for example to post-process html elements.")
+
+(defvar org-mime-pre-html-hook nil
+  "Hook to run before html export.
+Functions should take no arguments and will be run in a
+buffer holding the text to be exported.")
+
+(defvar org-mime-send-buffer-hook nil
+  "Hook to run in the Org-mode file before export.")
+
+(defvar org-mime-debug nil
+  "Enable debug logger.")
+
+(defun org-mime-get-export-options (subtreep)
+  "SUBTREEP is t if current node is subtree."
+  (cond
+   (subtreep
+    (or org-mime-export-options
+        (if (fboundp 'org-export--get-subtree-options)
+            (org-export--get-subtree-options))))
+   (t
+    (or org-mime-export-options
+        (if (fboundp 'org-export--get-inbuffer-options)
+            (org-export--get-inbuffer-options))))))
+
+(defun org-mime-current-line ()
+  "Get current line"
+  (buffer-substring-no-properties (line-beginning-position)
+                                  (line-end-position)))
+
+(defun org-mime-export-buffer-or-subtree (subtreep)
+  "Similar to `org-html-export-as-html' and `org-org-export-as-org'.
+SUBTREEP is t if current node is subtree."
+  (let* ((plain (buffer-string))
+         (buf (org-export-to-buffer 'html "*Org Mime Export*"
+                nil subtreep nil (org-mime-get-export-options subtreep)))
+         (body (prog1
+                   (with-current-buffer buf
+                     (buffer-string))
+                 (kill-buffer buf))))
+    (cons body plain)))
+
+(defun org-mime-export-string (string &optional opts)
+  "Export STRING into html.
+OPTS is export options."
+  ;; Emacs 25+ prefer exporting drawer by default
+  ;; obviously not acceptable in exporting to mail body
+  (let* ((org-export-with-drawers nil))
+    ;; we won't export title from org file anyway
+    (if opts (setq opts (plist-put opts 'title nil)))
+    ;; emacs24.4+
+    (org-export-string-as string 'html t (or org-mime-export-options opts))))
+
+;; example hook, for setting a dark background in
+;; <pre style="background-color: #EEE;"> elements
+(defun org-mime-change-element-style (element style)
+  "Set <ELEMENT> elements in exported html with new default html STYLE."
+  (while (re-search-forward (format "<%s" element) nil t)
+    (replace-match (format "<%s style=\"%s\"" element style))))
+
+(defun org-mime-change-class-style (class style)
+  "CLASS is used for new default html STYLE in exported html."
+  (while (re-search-forward (format "class=\"%s\"" class) nil t)
+    (replace-match (format "class=\"%s\" style=\"%s\"" class style))))
+
+;; ;; example addition to `org-mime-html-hook' adding a dark background
+;; ;; color to <pre> elements
+;; (add-hook 'org-mime-html-hook
+;;           (lambda ()
+;;             (org-mime-change-element-style
+;;              "pre" (format "color: %s; background-color: %s;"
+;;                            "#E6E1DC" "#232323"))
+;;             (org-mime-change-class-style
+;;              "verse" "border-left: 2px solid gray; padding-left: 4px;")))
+
+(defun org-mime-file (ext path id)
+  "Markup a file with EXT, PATH and ID for attachment."
+  (when org-mime-debug (message "org-mime-file called => %s %s %s" ext path id))
+  (cl-case org-mime-library
+    (mml (format "<#part type=\"%s\" filename=\"%s\" disposition=inline id=\"<%s>\">\n<#/part>\n"
+                 ext path id))
+    (semi (concat
+           (format "--[[%s\nContent-Disposition: inline;\nContent-ID: <%s>][base64]]\n"
+                   ext id)
+           (base64-encode-string
+            (with-temp-buffer
+              (set-buffer-multibyte nil)
+              (insert-file-contents-literally path)
+              (buffer-string)))))
+    (vm "?")))
+
+(defun org-mime-beautify-quoted (html)
+  "Clean up quoted mail in modern UI style.
+HTML is the body of the message."
+  (let ((quote-depth 0)
+        (line-depth 0)
+        (quote-opening "<blockquote class=\"gmail_quote\" style=\"margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex\">\n<p>\n")
+        (quote-closing "</p>\n</blockquote>\n"))
+    (with-temp-buffer
+      ;; clean title of quoted
+      (insert (replace-regexp-in-string
+               "<p>[\n\r]*&gt;&gt;&gt;&gt;&gt; .* == \\([^\r\n]*\\)[\r\n]*</p>"
+               "<div class=\"gmail_quote\">\\1</div>"
+               html))
+      (goto-char (point-min))
+      (while (not (eobp))
+        (setq line-depth 0)
+        (while (looking-at "&gt;[ \t]*")
+          (replace-match "")
+          (cl-incf line-depth))
+        (cond
+         ((< quote-depth line-depth)
+          (while (< quote-depth line-depth)
+            (insert quote-opening)
+            (cl-incf quote-depth)))
+         ((> quote-depth line-depth)
+          (while (> quote-depth line-depth)
+            (insert quote-closing)
+            (cl-decf quote-depth))))
+        (forward-line))
+      (buffer-substring (point-min) (point-max)))))
+
+(defun org-mime-multipart (plain html &optional images)
+  "Markup a multipart/alternative with HTML alternatives.
+If html portion of message includes IMAGES they are wrapped in multipart/related part."
+  (cl-case org-mime-library
+    (mml (concat "<#multipart type=alternative>\n<#part type=text/plain>"
+                 plain
+                 (when images "<#multipart type=related>")
+                 "<#part type=text/html>"
+                 (if org-mime-beautify-quoted-mail
+                     (org-mime-beautify-quoted html)
+                   html)
+                 images
+                 (when images "<#/multipart>\n")
+                 "<#/multipart>\n"))
+    (semi (concat
+           "--" "<<alternative>>-{\n"
+           "--" "[[text/plain]]\n" plain
+           (when images (concat "--" "<<alternative>>-{\n"))
+           "--" "[[text/html]]\n"  html
+           images
+           (when images (concat "--" "}-<<alternative>>\n"))
+           "--" "}-<<alternative>>\n"))
+    (vm "?")))
+
+(defun org-mime-url-to-path (url current-file)
+  "If URL is file path, convert to valid path.
+Or else use CURRENT-FILE to calculate path."
+  (let* ((dir (file-name-directory current-file))
+         (path (expand-file-name url dir)))
+    (cond
+     ((string-match-p "^file:///" url)
+      (replace-regexp-in-string "^file://" "" url))
+     ((file-exists-p path)
+      path)
+     (t
+      (expand-file-name url default-directory)))))
+
+(defun org-mime-replace-images (str current-file)
+  "Replace images in STR with cid links.
+CURRENT-FILE is used to calculate full path of images."
+  (when org-mime-debug (message "org-mime-replace-images called => %s" current-file))
+  (let* (html-images)
+    (cons
+     (replace-regexp-in-string ;; replace images in html
+      "src=\"\\([^\"]+\\)\""
+      (lambda (text)
+        (format
+         "src=\"cid:%s\""
+         (let* ((url (and (string-match "src=\"\\([^\"]+\\)\"" text)
+                          (match-string 1 text)))
+                (path (org-mime-url-to-path url current-file))
+                (ext (file-name-extension path))
+                (id (replace-regexp-in-string "[\/\\\\]" "_" path)))
+
+           ;; Catch non-existent files here. Otherwise users get an error on sending.
+           (unless (file-exists-p path)
+             (user-error "path: %s does not exist" path))
+
+           ;; Do it
+           (add-to-list 'html-images
+                        (org-mime-file (concat "image/" ext) path id))
+           id)))
+      str)
+     html-images)))
+
+(defun org-mime-extract-non-image-files ()
+  "Extract non-image links in current buffer."
+  (cond
+   ((>= (org-mime-org-major-version) 9)
+    (org-element-map (org-element-parse-buffer) 'link
+      (lambda (link)
+        (when (and (string= (org-element-property :type link) "file")
+                   (not (string-match
+                         (cdr (assoc "file" org-html-inline-image-rules))
+                         (org-element-property :path link))))
+          (org-element-property :path link)))))
+   (t
+    (message "Warning: org-element-map is not available. File links will not be attached.")
+    nil)))
+
+(defun org-mime-insert-html-content (plain file html opts)
+  "Insert HTML content."
+  (let* ((files (org-mime-extract-non-image-files))
+         ;; dvipng for inline latex because MathJax doesn't work in mail
+         ;; Also @see https://github.com/org-mime/org-mime/issues/16
+         ;; (setq org-html-with-latex nil) sometimes useful
+         (org-html-with-latex org-mime-org-html-with-latex-default)
+         ;; we don't want to convert org file links to html
+         (org-html-link-org-files-as-html nil)
+         (org-link-file-path-type 'absolute)
+         ;; prettify reply with ">"
+         (org-export-preserve-breaks org-mime-preserve-breaks)
+         ;; org 9
+         (org-html-htmlize-output-type 'inline-css)
+         ;; org 8
+         (org-export-htmlize-output-type 'inline-css)
+         (html-and-images (org-mime-replace-images html file))
+         (images (cdr html-and-images))
+         (html (org-mime-apply-html-hook (car html-and-images))))
+
+    ;; If there are files that were attached, we should remove the links,
+    ;; and mark them as attachments. The links don't work in the html file.
+    (when files
+      (mapc (lambda (f)
+              (setq html (replace-regexp-in-string
+                          (format "<a href=\"%s\">%s</a>"
+                                  (regexp-quote f) (regexp-quote f))
+                          (format "%s (attached)" (file-name-nondirectory f))
+                          html)))
+            files))
+
+    (insert (org-mime-multipart plain
+                                html
+                                (if images (mapconcat 'identity images "\n"))))
+
+    ;; Attach any residual files
+    (when files
+      (mapc (lambda (f)
+              (when org-mime-debug (message "attaching: %s" f))
+              (mml-attach-file f))
+            files))))
+
+;;;###autoload
+(defun org-mime-htmlize ()
+  "Export a portion of an email to html using `org-mode'.
+If called with an active region only export that region, otherwise entire body."
+  (interactive)
+  (when org-mime-debug (message "org-mime-htmlize called"))
+  (let* ((region-p (org-region-active-p))
+         (html-start (funcall org-mime-find-html-start
+                              (or (and region-p (region-beginning))
+                                  (save-excursion
+                                    (goto-char (point-min))
+                                    (search-forward mail-header-separator)
+                                    (+ (point) 1)))))
+         (html-end (or (and region-p (region-end))
+                       ;; TODO: should catch signature...
+                       (point-max)))
+         (plain (buffer-substring html-start html-end))
+;; to hold attachments for inline html images
+         (opts (if (fboundp 'org-export--get-inbuffer-options)
+                   (org-export--get-inbuffer-options)))
+         (html (org-mime-export-string (concat org-mime-default-header plain) opts))
+         (file (make-temp-name (expand-file-name
+                                "mail" temporary-file-directory))))
+
+    ;; delete current region
+    (delete-region html-start html-end)
+    (goto-char html-start)
+    ;; insert new current
+    (org-mime-insert-html-content plain file html opts)))
+
+(defun org-mime-apply-html-hook (html)
+  "Apply HTML hook."
+  (if org-mime-html-hook
+      (with-temp-buffer
+        (insert html)
+        (goto-char (point-min))
+        (run-hooks 'org-mime-html-hook)
+        (buffer-string))
+    html))
+
+(defun org-mime--get-buffer-title ()
+  "Get buffer title."
+  (let* ((tmp (if (fboundp 'org-export--get-inbuffer-options)
+                  (plist-get (org-export--get-inbuffer-options) :title))))
+    (when tmp
+      (let ((txt (car tmp)))
+        (set-text-properties 0 (length txt) nil txt)
+        txt))))
+
+(defun org-mime-compose (exported file to subject headers subtreep)
+  "Create mail body from EXPORTED in FILE with TO, SUBJECT, HEADERS.
+If SUBTREEP is t, curret org node is subtree."
+  ;; start composing mail
+  (let* ((html (car exported))
+         (plain (cdr exported))
+         (export-opts (org-mime-get-export-options subtreep))
+         patched-html)
+    (compose-mail to subject headers nil)
+    (message-goto-body)
+    (setq patched-html (with-temp-buffer
+                         (insert html)
+                         (goto-char (point-min))
+                         (run-hooks 'org-mime-pre-html-hook)
+                         (buffer-string)))
+    ;; insert text
+    (org-mime-insert-html-content plain file patched-html export-opts)))
+
+(defun org-mime-extract-keywords ()
+  "Extract keywords."
+  (cond
+   ((>= (org-mime-org-major-version) 9)
+    (org-element-map (org-element-parse-buffer) 'keyword
+      (lambda (keyword)
+        (cons (org-element-property :key keyword)
+              (org-element-property :value keyword)))))
+   (t
+    (message "Warning: org-element-map is not available. File keywords will not work.")
+    '())))
+
+(defun org-mime-build-mail-other-headers (cc bcc from)
+  "Build mail header from CC, BCC, and FROM."
+  (let* ((arr (list (cons "Cc" cc) (cons "Bcc" bcc)  (cons "From" from )))
+         rlt)
+    (dolist (e arr)
+      (when (cdr e)
+        (push e rlt)))
+    rlt))
+
+;;;###autoload
+(defun org-mime-org-buffer-htmlize ()
+  "Create an email buffer of the current org buffer.
+The email buffer will contain both html and in org formats as mime
+alternatives.
+
+The following file keywords can be used to control the headers:
+#+MAIL_TO: some1@some.place
+#+MAIL_SUBJECT: a subject line
+#+MAIL_CC: some2@some.place
+#+MAIL_BCC: some3@some.place
+#+MAIL_FROM: sender@some.place
+
+The cursor ends in the TO field."
+  (interactive)
+  (run-hooks 'org-mime-send-buffer-hook)
+  (let* ((org-html-klipsify-src nil)
+         (region-p (org-region-active-p))
+         (file (buffer-file-name (current-buffer)))
+         (keywords (org-mime-extract-keywords))
+         (subject (or (cdr (assoc "MAIL_SUBJECT" keywords))
+                      (org-mime--get-buffer-title)
+                      (if (not file) (buffer-name (buffer-base-buffer))
+                        (file-name-sans-extension
+                         (file-name-nondirectory file)))))
+         (exported (org-mime-export-buffer-or-subtree nil))
+         (to (cdr (assoc "MAIL_TO" keywords)))
+         (cc (cdr (assoc "MAIL_CC" keywords)))
+         (bcc (cdr (assoc "MAIL_BCC" keywords)))
+         (from (cdr (assoc "MAIL_FROM" keywords)))
+         (other-headers (org-mime-build-mail-other-headers cc bcc from)))
+    (org-mime-compose exported file to subject other-headers nil)
+    (message-goto-to)))
+
+(defun org-mime-org-major-version ()
+  "Get Org major version."
+  (string-to-number (car (split-string (org-release) "\\."))))
+
+(defun org-mime-attr (p)
+  (org-entry-get nil p org-mime-use-property-inheritance))
+
+;;;###autoload
+(defun org-mime-org-subtree-htmlize (&optional htmlize-first-level)
+  "Create an email buffer of the current subtree.  If HTMLIZE-FIRST-LEVEL is
+not nil, the first level subtree which containing current subtree is htmlized.
+
+Following headline properties can determine the mail headers,
+* subtree heading
+  :PROPERTIES:
+  :MAIL_SUBJECT: mail title
+  :MAIL_TO: person1@gmail.com
+  :MAIL_CC: person2@gmail.com
+  :MAIL_BCC: person3@gmail.com
+  :MAIL_FROM: sender@gmail.com
+  :END:
+"
+  (interactive "P")
+  (save-excursion
+    (org-back-to-heading)
+
+    (when (and htmlize-first-level
+               (not (string-match "^\\* " (org-mime-current-line))))
+      ;; go back to the 1st level substree
+      (re-search-backward "^\\* ")
+      (org-back-to-heading))
+
+    (when (outline-on-heading-p nil)
+      (let* ((file (buffer-file-name (current-buffer)))
+             (subject (or (org-mime-attr "MAIL_SUBJECT")
+                          (nth 4 (org-heading-components))))
+             (to (org-mime-attr "MAIL_TO"))
+             (cc (org-mime-attr "MAIL_CC"))
+             (bcc (org-mime-attr "MAIL_BCC"))
+             (from (org-mime-attr "MAIL_FROM"))
+             ;; Thanks to Matt Price improving handling of cc & bcc headers
+             (other-headers (org-mime-build-mail-other-headers cc bcc from))
+             (org-export-show-temporary-export-buffer nil)
+             (subtree-opts (when (fboundp 'org-export--get-subtree-options)
+                             (org-export--get-subtree-options)))
+             (org-export-show-temporary-export-buffer nil)
+             (org-major-version (org-mime-org-major-version))
+             ;; I wrap these bodies in export blocks because in org-mime-compose
+             ;; they get exported again. This makes each block conditionally
+             ;; exposed depending on the backend.
+             (exported (save-restriction (org-narrow-to-subtree)
+                                          (org-mime-export-buffer-or-subtree t))))
+        (save-restriction
+          (org-narrow-to-subtree)
+          (org-mime-compose exported file to subject other-headers t))
+        (message-goto-to)))))
+
+(provide 'org-mime)
+;; Local Variables:
+;; coding: utf-8
+;; tab-width: 2
+;; indent-tabs-mode: nil
+;; End:
+;;; org-mime.el ends here
diff --git a/elpa/org-mime-readme.txt b/elpa/org-mime-readme.txt
index 02bed600..dc5a0f3b 100644
--- a/elpa/org-mime-readme.txt
+++ b/elpa/org-mime-readme.txt
@@ -1,4 +1,4 @@
-WYSWYG, html mime composition using org-mode
+WYSIWYG, html mime composition using org-mode
 
 For mail composed using the orgstruct-mode minor mode, this
 provides a function for converting all or part of your mail buffer
@@ -12,33 +12,36 @@ package the results into an email handling with appropriate MIME
 encoding.
 
 `org-mime-org-subtree-htmlize' is similar to `org-mime-org-buffer-htmlize'
-but works on subtree. It can also read subtree properties MAIL_SUBJECT,
-MAIL_TO, MAIL_CC, and MAIL_BCC. Here is the sample of subtree:
+but works on current subtree. It can read following subtree properties:
+MAIL_SUBJECT, MAIL_TO, MAIL_FROM, MAIL_CC, and MAIL_BCC.
 
+Here is the sample of a subtree:
 * mail one
   :PROPERTIES:
   :MAIL_SUBJECT: mail title
   :MAIL_TO: person1@gmail.com
+  :MAIL_FROM: sender@gmail.com
   :MAIL_CC: person2@gmail.com
   :MAIL_BCC: person3@gmail.com
   :END:
 
-To avoid exporting TOC, you can setup `org-mime-export-options',
+To avoid exporting the table of contents, you can setup
+`org-mime-export-options':
   (setq org-mime-export-options '(:section-numbers nil
                                   :with-author nil
                                   :with-toc nil))
-Or just setup your export options in org buffer/subtree which is overrided
-by `org-mime-export-options' when it's NOT nil.
 
-You can change `org-mime-up-subtree-heading' before exporting subtree.
-heck its documentation.
+Or just setup your export options in the org buffer/subtree. These are
+overridden by `org-mime-export-options' when it is non-nil.
+
 
 Quick start:
-Write mail in message-mode, make sure the mail body follows org format.
-Before sending mail, `M-x org-mime-htmlize'
+Write a message in message-mode, make sure the mail body follows
+org format. Before sending mail, run `M-x org-mime-htmlize' to convert the
+body to html, then send the mail as usual.
 
 Setup (OPTIONAL):
-you might want to bind this to a key with something like the
+You might want to bind this to a key with something like the
 following message-mode binding
 
   (add-hook 'message-mode-hook
@@ -50,3 +53,26 @@ and the following org-mode binding
   (add-hook 'org-mode-hook
             (lambda ()
               (local-set-key (kbd "C-c M-o") 'org-mime-org-buffer-htmlize)))
+
+Extra Tips:
+1. In order to embed images into your mail, use the syntax below,
+[[/full/path/to/your.jpg]]
+
+2. It's easy to add your own emphasis markup. For example, to render text
+between "@" in a red color, you can add a function to `org-mime-html-hook':
+
+  (add-hook 'org-mime-html-hook
+            (lambda ()
+              (while (re-search-forward "@\\([^@]*\\)@" nil t)
+                (replace-match "<span style=\"color:red\">\\1</span>"))))
+
+3. Now the quoted mail uses a modern style (like Gmail), so mail replies
+looks clean and modern. If you prefer the old style, please set
+`org-mime-beautify-quoted-mail' to nil.
+
+4. Please note this program can only embed exported HTML into mail.
+   Org-mode is responsible for rendering HTML.
+
+   For example, see https://github.com/org-mime/org-mime/issues/38
+   The solution is patching org-mode,
+   https://lists.gnu.org/archive/html/emacs-orgmode/2019-11/msg00016.html