From: tsumura <tsumura>
Date: Mon, 15 Jul 2002 06:18:00 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=3c5eb3cec52dab7b12249d9364f69f28848804b5;p=elisp%2Femh.git

*** empty log message ***
---

diff --git a/ChangeLog b/ChangeLog
index 67db587..c4a791e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2002-07-15  TSUMURA Tomoaki <tsumura@tomo.gr.jp>
+
+	* emh.el (emh-icon-directory): New variable.
+	* emh-e21.el: New file.
+	* etc/icons/emh-forward-up.xpm: New file.
+	* etc/icons/mh-delete-msg-up.xpm: New file.
+	* etc/icons/mh-fully-kill-draft-up.xpm: New file.
+	* etc/icons/mh-inc-folder-up.xpm: New file.
+	* etc/icons/mh-insert-signature-up.xpm: New file.
+	* etc/icons/mh-next-undeleted-msg-up.xpm: New file.
+	* etc/icons/mh-previous-undeleted-msg-up.xpm: New file.
+	* etc/icons/mh-quit-up.xpm: New file.
+	* etc/icons/mh-reply-up.xpm: New file.
+	* etc/icons/mh-rescan-folder-up.xpm: New file.
+	* etc/icons/mh-send-letter-up.xpm: New file.
+	* etc/icons/mh-send-up.xpm: New file.
+	* etc/icons/mh-show-up.xpm: New file.
+	* etc/icons/mh-yank-cur-msg-up.xpm: New file.
+	* etc/icons/mime-edit-set-encrypt-up.xpm: New file.
+	* etc/icons/mime-edit-set-sign-up.xpm: New file.
+	* EMH-MK: Modified for installation of toolbar icons.
+	* EMH-ELS: Ditto.
+	* Makefile: Ditto.
+
 2000-12-25  MORIOKA Tomohiko  <tomo@kanji.zinbun.kyoto-u.ac.jp>
 
 	* EMH: Version 1.14.1 released.
diff --git a/EMH-ELS b/EMH-ELS
index 2f5ed72..eba41ce 100644
--- a/EMH-ELS
+++ b/EMH-ELS
@@ -8,4 +8,8 @@
 
 (setq emh-modules '(emh emh-def emh-face emh-comp emh-setup))
 
+(if (and (boundp 'emacs-major-version)
+	 (>= emacs-major-version 21))
+    (setq emh-modules (append emh-modules (list 'emh-e21))))
+
 ;;; EMH-ELS ends here
diff --git a/EMH-MK b/EMH-MK
index 0bac244..47a78be 100644
--- a/EMH-MK
+++ b/EMH-MK
@@ -24,6 +24,7 @@
 			      VERSION_SPECIFIC_LISPDIR)))
 	     ))
     (setq command-line-args-left (cdr command-line-args-left))
+    (config-emh-pixmap-dir)
     )
   (setq command-line-args-left (cdr command-line-args-left))
   (load-file "EMH-CFG")
@@ -40,6 +41,7 @@ LISPDIR=%s\n" PREFIX LISPDIR))
 (defun install-emh ()
   (config-emh)
   (install-elisp-modules emh-modules "./" EMH_DIR)
+  (if PIXMAPDIR (install-emh-icons))
   )
 
 (defun config-emh-package ()
@@ -54,6 +56,7 @@ LISPDIR=%s\n" PREFIX LISPDIR))
     (setq emh-modules (append emh-modules
 			       '(auto-autoloads custom-load)))
     (princ (format "PACKAGEDIR=%s\n" PACKAGEDIR))
+    (config-emh-pixmap-dir PACKAGEDIR)
     ))
 
 (defun compile-emh-package ()
@@ -76,6 +79,37 @@ LISPDIR=%s\n" PREFIX LISPDIR))
 			 (expand-file-name EMH_PREFIX
 					   (expand-file-name "lisp"
 							     PACKAGEDIR)))
+  (if PIXMAPDIR (install-emh-icons))
   )
 
+(defun config-emh-pixmap-dir (&optional packagedir)
+  (let ((pixmap-dir (car command-line-args-left)))
+    (defvar PIXMAPDIR
+      (if (string= pixmap-dir "NONE")
+	  (if packagedir
+	      (expand-file-name "etc/emh/" packagedir)
+	    (expand-file-name "emh/icons/" data-directory))
+	pixmap-dir)))
+  (if PIXMAPDIR
+      (princ (format "PIXMAPDIR is %s\n" PIXMAPDIR)))
+  (setq command-line-args-left (cdr command-line-args-left)))
+
+(defun install-emh-icons ()
+  (if (not (file-directory-p PIXMAPDIR))
+      (make-directory PIXMAPDIR t))
+  (let* ((case-fold-search t)
+	 (icons (if (and (not (featurep 'xemacs))
+			 (boundp 'emacs-major-version)
+			 (>= emacs-major-version 21))
+		    (directory-files "./etc/icons" t "\\.xpm$")))
+	 icon dest)
+    (while icons
+      (setq icon  (car icons)
+	    icons (cdr icons)
+	    dest  (expand-file-name (file-name-nondirectory icon) PIXMAPDIR))
+      (princ (format "%s -> %s\n"
+		     (file-name-nondirectory icon)
+		     (substring (file-name-directory dest) 0 -1)))
+      (copy-file icon dest t))))
+
 ;;; EMH-MK ends here
diff --git a/Makefile b/Makefile
index 1f6da98..ceda946 100644
--- a/Makefile
+++ b/Makefile
@@ -15,24 +15,25 @@ PREFIX = NONE
 LISPDIR = NONE
 PACKAGEDIR = NONE
 VERSION_SPECIFIC_LISPDIR = NONE
+PIXMAPDIR = NONE
 
 FILES =	README.en Makefile EMH-MK EMH-CFG EMH-ELS *.el ChangeLog
 
 
 elc:
 	$(EMACS) $(FLAGS) -f compile-emh $(PREFIX) $(LISPDIR) \
-		$(VERSION_SPECIFIC_LISPDIR)
+		$(VERSION_SPECIFIC_LISPDIR) $(PIXMAPDIR)
 
 install:	elc
 	$(EMACS) $(FLAGS) -f install-emh $(PREFIX) $(LISPDIR) \
-		$(VERSION_SPECIFIC_LISPDIR)
+		$(VERSION_SPECIFIC_LISPDIR) $(PIXMAPDIR)
 
 
 package:
-	$(XEMACS) $(FLAGS) -f compile-emh-package $(PACKAGEDIR)
+	$(XEMACS) $(FLAGS) -f compile-emh-package $(PACKAGEDIR) $(PIXMAPDIR)
 
 install-package:	package
-	$(XEMACS) $(FLAGS) -f install-emh-package $(PACKAGEDIR)
+	$(XEMACS) $(FLAGS) -f install-emh-package $(PACKAGEDIR) $(PIXMAPDIR)
 
 
 clean:
diff --git a/emh-e21.el b/emh-e21.el
new file mode 100644
index 0000000..69513d7
--- /dev/null
+++ b/emh-e21.el
@@ -0,0 +1,130 @@
+;;; emh-e21.el --- EMH modules for Emacs 21.
+
+;; Copyright (C) 2002 TSUMURA Tomoaki <tsumura@tomo.gr.jp>
+
+;; Author: TSUMURA Tomoaki <tsumura@tomo.gr.jp>
+
+;; This file is part of emh.
+
+;; 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.
+
+;; 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, Inc., 59 Temple Place - Suite 330,
+;; Boston, MA 02111-1307, USA.
+
+;;; Code:
+
+;; All code is stolen from wl-e21.el
+(eval-when-compile
+  (defvar-maybe mh-folder-mode-map (make-sparse-keymap))
+)
+
+(defvar emh-folder-toolbar
+  '([mh-show
+     mh-show t "Show Mail"]
+    [mh-next-undeleted-msg
+     mh-next-undeleted-msg t "Next Message"]
+    [mh-previous-undeleted-msg
+     mh-previous-undeleted-msg t "Previous Message"]
+    [mh-inc-folder
+     mh-inc-folder t "Incorporate New Mails"]
+    [mh-delete-msg
+     mh-delete-msg t "Delete Message"]
+    [mh-send
+     mh-send t "New Message"]
+    [mh-reply
+     mh-reply t "Reply Message"]
+    [emh-forward
+     emh-forward t "Forward Message"]
+    [mh-rescan-folder
+     mh-rescan-folder t "Rescan Folder"]
+    [mh-quit
+     mh-quit t "Exit MH-E"]
+    )
+  "Folder buffer toolbar.")
+
+(defvar emh-draft-toolbar
+  '([mh-send-letter
+     mh-send-letter t "Send Letter"]
+    [mh-yank-cur-msg
+     mh-yank-cur-msg t "Yank and Cite Message"]
+    [mh-insert-signature
+     mh-insert-signature t "Insert Signature"]
+    [mime-edit-set-encrypt
+     mime-edit-set-encrypt t "PGP Encrypt"]
+    [mime-edit-set-sign
+     mime-edit-set-sign t "PGP Signature"]
+    [mh-fully-kill-draft
+     mh-fully-kill-draft t "Delete Draft"]
+    )
+  )
+
+(defun emh-e21-setup-toolbar (bar)
+  (when (and (display-images-p)
+	     (image-type-available-p 'xpm))
+    (let ((load-path (cons emh-icon-directory load-path))
+	  (props '(:type xpm :ascent center
+			 :color-symbols (("backgroundToolBarColor" . "None"))
+			 :file))
+	  (success t)
+	  icon up down disabled name)
+      (while bar
+	(setq icon (aref (pop bar) 0))
+	(unless (boundp icon)
+	  (setq name (symbol-name icon)
+		up (find-image `((,@props ,(concat name "-up.xpm")))))
+	  (if up
+	      (set icon (vector up up up up))
+	    (setq bar nil success nil))
+	  )
+	)
+      success)))
+
+(defun emh-e21-make-toolbar-buttons (keymap defs)
+  (let ((configs '((auto-resize-tool-bars . t)
+		   (auto-raise-tool-bar-buttons . t)
+		   (tool-bar-button-margin . 0)
+		   (tool-bar-button-relief . 2)))
+	config)
+    (while (setq config (pop configs))
+      (set (make-local-variable (car config)) (cdr config))))
+  (let ((keys (cdr (key-binding [tool-bar] t)))
+	item)
+    (while (setq item (pop keys))
+      (when (setq item (car-safe item))
+	(define-key keymap (vector 'tool-bar item) 'undefined))))
+  (let ((n (length defs))
+	def)
+    (while (>= n 0)
+      (setq n (1- n)
+	    def (nth n defs))
+      (define-key keymap (vector 'tool-bar (aref def 1))
+	(list 'menu-item (aref def 3) (aref def 1)
+	      :enable (aref def 2)
+	      :image (symbol-value (aref def 0)))))))
+
+(defun emh-e21-setup-folder-toolbar ()
+  (when (emh-e21-setup-toolbar emh-folder-toolbar)
+    (emh-e21-make-toolbar-buttons mh-folder-mode-map emh-folder-toolbar)))
+(add-hook 'mh-folder-mode-hook 'emh-e21-setup-folder-toolbar)
+
+(defun emh-e21-setup-draft-toolbar ()
+  (when (emh-e21-setup-toolbar emh-draft-toolbar)
+    (emh-e21-make-toolbar-buttons mime-edit-mode-map emh-draft-toolbar)))
+(add-hook 'mime-edit-mode-hook 'emh-e21-setup-draft-toolbar)
+
+;;; @ end
+;;;
+
+(provide 'emh-e21)
+
+;;; emh-e21.el ends here
diff --git a/emh.el b/emh.el
index 2da4435..243e555 100644
--- a/emh.el
+++ b/emh.el
@@ -58,6 +58,17 @@
   :group 'emh
   :type 'boolean)
 
+(defcustom emh-icon-directory (if (fboundp 'locate-data-directory)
+				  (locate-data-directory "emh")
+				(let ((icons (expand-file-name 
+					      "emh/icons/"
+					      data-directory)))
+				  (if (file-directory-p icons)
+				      icons)))
+  "*Directory to load the icon files from, or nil if none."
+  :group 'emh
+  :type '(choice (const :tag "none" nil)
+                 string))
 
 ;;; @ functions
 ;;;
@@ -344,6 +355,12 @@ digest are inserted into the folder after that message."
 
 (eval-after-load "bbdb" '(require 'mime-bbdb))
 
+;;; @ Toolbar
+
+(if (and (not (featurep 'xemacs))
+	 (boundp 'emacs-major-version)
+	 (>= emacs-major-version 21))
+    (require 'emh-e21))
 
 ;;; @ end
 ;;;
diff --git a/etc/icons/emh-forward-up.xpm b/etc/icons/emh-forward-up.xpm
new file mode 100644
index 0000000..09aac0d
--- /dev/null
+++ b/etc/icons/emh-forward-up.xpm
@@ -0,0 +1,51 @@
+/* XPM */
+static char *emh-buttons_04[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32       12            1",
+/* colors */
+". c #ffffff",
+"# c #ffcccc",
+"a c #ff9999",
+"b c #ff6666",
+"c c #ff6633",
+"d c #ff3333",
+"e c #ff3300",
+"f c #9999cc",
+"g c #336699",
+"h c #006699",
+"i c None",
+"j c #000000",
+/* pixels */
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiii.b#iiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiideciiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiad#iiiiiiiiiiiiiii",
+"iiiiiiiiiii#daiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiicediiiiiiiiiiiiiiiiii",
+"iiiiiiiii#i.b.iiiiiiii.ghhgfiiii",
+"iiiiii.iaebiiiiiiiiii.ghhhhhfiii",
+"iiii.b#ibebiiiiiiiiiifhhhhhhgiii",
+"iiiiaec#iaiiiiiiiiiiifhhhhhhhiii",
+"iiiiaeediiiiiiiiiiiiifhhhhhhhiii",
+"iiiiaeedc#iiiiiiiiiii#hhhhhhgiii",
+"iiiiacdeaiiiiiiiiiiiiifhhhhg.iii",
+"iiiiiiiiiiiiii#cb.iiiifhhhhfiiii",
+"iiiii##########ded.iifhhhhhhfiii",
+"iiiiieeeeeeeeeeeeediighhhhhhg.ii",
+"iiiiiccccccccccdeeaifhhhhhhhhfii",
+"iiiiiiiiiiiiii#deaiighhhhhhhhgii",
+"iiiiiiiiiiiiii###iiighhhhhhhhhii",
+"iiiiiiiiiiiiiiiiiiiihhhhhhhhhh#i",
+"iiiiiiiiiiiiiiiiiiiihhhhhhhhhh#i",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiijjjjiiiiiiiiiiiiiiiiiiiiiijii",
+"iiijiiijjiijjijiijijjjiijjijjjii",
+"iiijiijiijijiijijjijiijijijiijii",
+"iiijjjjiijijiijijjijjjjijijiijii",
+"iiijiijiijijiiijjijjiijijijiijii",
+"iiijiiijjiijiiijiijijjjijiijjjii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii"
+};
diff --git a/etc/icons/mh-delete-msg-up.xpm b/etc/icons/mh-delete-msg-up.xpm
new file mode 100644
index 0000000..8879875
--- /dev/null
+++ b/etc/icons/mh-delete-msg-up.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char *emh-buttons_15[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32       15            1",
+/* colors */
+". c #ffffff",
+"# c #ffcccc",
+"a c #ff6633",
+"b c #ff3333",
+"c c #ff3300",
+"d c #ccffff",
+"e c #cccccc",
+"f c #cc3333",
+"g c #999999",
+"h c #66cccc",
+"i c #666666",
+"j c #339999",
+"k c #333333",
+"l c #000000",
+"m c None",
+/* pixels */
+"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+"mmmmmmmmmmmmmmekgemmmmmmmmmmmmmm",
+"mmmmmmmmmmmm#akllligmmmmmmmmmmmm",
+"mmmmmmmmmm.acclikeilliemmmmmmmmm",
+"mmmmmmmmm.bccfk.ki..gllgmmmmmmmm",
+"mmmmmmmmmacb#ig.elgilklemmmmmmmm",
+"mmmmmmmm#cb#mlkg.ikgegkmmmmmmmmm",
+"mmmmmmm.bc#mmmgklie..kf#mmmmmmmm",
+"mmmmmmmacammmmmmeilkilcfjaemmmmm",
+"mmmmmmmbc#mmmmmmhjjikkccfcjhmmmm",
+"mmmmmm#cbmmmmmmdjjjjjccccfjjdmmm",
+"mmmmmmacammmmmmdjjjjjicccijjdmmm",
+"mmmmmmac#mmmmmmdjjjjjjiffjjjdmmm",
+"mmmmmmcc.mmmmmmdjhjjjjjjjjhjdmmm",
+"mmmmm.ccmmmmmmmdjhhhhhhhhhhjdmmm",
+"mmmmm#cammmmmmmdjhhhhhhhhhhjdmmm",
+"mmmmm#cammmmmmmdjhhhhhhhhhhjdmmm",
+"mmmmm.##mmmmmmmdjhhhhhhhhhhjdmmm",
+"mmmmmmmmmmmmmmmdjhhhhhhhhhhjdmmm",
+"mmmmmmmmmmmmmmmdjhhhhhhhhhhjdmmm",
+"mmmmmmmmmmmmmmmdjhhhhhhhhhhjdmmm",
+"mmmmmmmmmmmmmmm.jhhhhhhhhhhj.mmm",
+"mmmmmmmmmmmmmmmmdjjjhhhhjjjdmmmm",
+"mmmmmmmmmmmmmmmmmmdhhhhhhdmmmmmm",
+"mmmmmmlllmmmmmmlmmmmmlmmmmmmmmmm",
+"mmmmmmlmmlmmllmlmmllmllmmllmmmmm",
+"mmmmmmlmmlmlmmllmlmmllmmlmmlmmmm",
+"mmmmmmlmmlmlllllmlllllmmllllmmmm",
+"mmmmmmlmmlmlmmmlmlmmmlmmlmmmmmmm",
+"mmmmmmlllmmmllllmmlllmlmmlllmmmm",
+"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm",
+"mmmmmmmmmmmmmmmmmmmmmmmmmmmmmmmm"
+};
diff --git a/etc/icons/mh-fully-kill-draft-up.xpm b/etc/icons/mh-fully-kill-draft-up.xpm
new file mode 100644
index 0000000..7012572
--- /dev/null
+++ b/etc/icons/mh-fully-kill-draft-up.xpm
@@ -0,0 +1,53 @@
+/* XPM */
+static char *emh-buttons_06[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32       14            1",
+/* colors */
+". c #ffffff",
+"# c #ffcccc",
+"a c #ff9999",
+"b c #ff6666",
+"c c #ff3333",
+"d c #ff0000",
+"e c #cccccc",
+"f c #cc9999",
+"g c #cc3333",
+"h c #cc0000",
+"i c #9999cc",
+"j c #333333",
+"k c #000000",
+"l c None",
+/* pixels */
+"llllllllllllllllllllllllllllllll",
+"llllllllllllllllllllllllllllllll",
+"lllllll#cllllllllllllll#llllllll",
+"llllll#cclllllllllllll#d#lllllll",
+"llllll#dc.llllllllllllbdalllllll",
+"lllllladdhkkkkkkkkkkkhdg#lllllll",
+"llllllacddb.........#ddjllllllll",
+"lllllllljddcaeeeeeeecdhjllllllll",
+"llllllllghcddcfiiiigddcjllllllll",
+"lllllllljbcdcddaee#dddfjllllllll",
+"lllllllljeacdddbifcddbejllllllll",
+"llllllllje#afcccbcddc.ejllllllll",
+"llllllllje.efcdddddcb.ejllllllll",
+"llllllllje..#ecddddbe.ejllllllll",
+"llllllllje.eggcdddgii.ejllllllll",
+"llllllllje.adddcdddce.ejllllllll",
+"llllllllje#dcdbcccddc#ejllllllll",
+"lllllllljebdddeeeccddcgjllllllll",
+"lllllllljfdddbfiie#cdddc#lllllll",
+"lllllllljhdcb#......#cddca#lllll",
+"llll.l.#cdhhgjjjjjjjjjjgcdc.llll",
+"llll#ccddcafeeeeeeeeeeee#a.lllll",
+"lllll#dcdbllllllllllllllllllllll",
+"llllll#.a#llllllllllllllllllllll",
+"lllllllllllkklllllllkkllllllllll",
+"llllllllllkllklkllkllkklllllllll",
+"lllllllllkllllkkllklkkllllllllll",
+"lllllllllkllllkkllklkkllllllllll",
+"llllllllllklklkkllklkkllllllllll",
+"lllllllllllkkkklkkklklklllllllll",
+"llllllllllllllllllllllllllllllll",
+"llllllllllllllllllllllllllllllll"
+};
diff --git a/etc/icons/mh-inc-folder-up.xpm b/etc/icons/mh-inc-folder-up.xpm
new file mode 100644
index 0000000..538dafe
--- /dev/null
+++ b/etc/icons/mh-inc-folder-up.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char *emh-buttons_02[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32       14            1",
+/* colors */
+". c #ffffff",
+"# c #ffcccc",
+"a c #ff3300",
+"b c #cccccc",
+"c c #cc9999",
+"d c #cc6666",
+"e c #999999",
+"f c #996666",
+"g c #993333",
+"h c #666666",
+"i c #663333",
+"j c #333333",
+"k c #000000",
+"l c None",
+/* pixels */
+"llllllllllllllllllllllllllllllll",
+"llllllllllllllllllllllllllllllll",
+"llllllllllllllllllllllllllllllll",
+"lllllllllllllllllllll##ccc.lllll",
+"llllllllllllllll.#ccddddddd#llll",
+"llllllllllll.ccddddddddddddd#lll",
+"lllllllllll#dfigddddddddddddclll",
+"llllllllll#dgiiiifddddddddddd.ll",
+"llllllllllcfiiiiiiddddddddddd#ll",
+"lllllllll#diiiiiiigdddddddddd#ll",
+"lllllllllcfiiiggiiidddddddddd#ll",
+"llllllllldiiigaagiifddddddddd#ll",
+"llllllll.dgggaaaiiigdddddddc#lll",
+"llllllll#dagaaaiiiiiddddc#.lllll",
+"llllllll#gaaaaiiiiigdddcllllllll",
+"lllllllcikaaagikjifdcdd#llllllll",
+"llllllckjeaaaafkgdc.#dd#llllllll",
+"lllllckh..if##kgd#ll#dd#llllllll",
+"llllekebejkh.hj#llll#dd#llllllll",
+"ll.hkjjkhe..bkblllll#dd#llllllll",
+"lbjkkhe.....hhllllll#dd#llllllll",
+"lejkjheb...bkbllllll#dd#llllllll",
+"llllbehjkjhjelllllll.##lllllllll",
+"llllllllbehj.lllllllllllllllllll",
+"lllkkklllllllllllllllkllllllllll",
+"lllkllkllkkllkkllkklllkllklkklll",
+"lllkllklkllkkllkkllklkkllkkllkll",
+"lllkkkllkkkkklllkkkklklklkkkkkll",
+"lllklkllklllkllkkllllklkklklllll",
+"lllkllkllkkklkkllkkklkllkllkkkll",
+"llllllllllllllllllllllllllllllll",
+"llllllllllllllllllllllllllllllll"
+};
+
diff --git a/etc/icons/mh-insert-signature-up.xpm b/etc/icons/mh-insert-signature-up.xpm
new file mode 100644
index 0000000..73af881
--- /dev/null
+++ b/etc/icons/mh-insert-signature-up.xpm
@@ -0,0 +1,45 @@
+/* XPM */
+static char *emh-buttons_07[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32        6            1",
+/* colors */
+". c #ffffff",
+"# c #cccccc",
+"a c #999999",
+"b c #666666",
+"c c None",
+"d c #000000",
+/* pixels */
+".................ccccccccccccccc",
+"..................cccccccccccccc",
+"...................ccccccccccccc",
+"....................cccccccccccc",
+".....................ccccccccccc",
+"......................cccccccccc",
+".......................ccccccccc",
+".......................ccccccccc",
+"...........#............cccccccc",
+"..........a##............ccccccc",
+".......##.aa......a.......cccccc",
+"......#..a.a....#aba.......ccccc",
+".....##..a###.##bbba........cccc",
+".....#...b#..abab##..........ccc",
+".....a..ab.baab##............ccc",
+"......aa.b#bbbb............ccccc",
+"........#a.b.a#..........ccccccc",
+"........b...#b.........ccccccccc",
+".......##...aa.......ccccccccccc",
+"....#ba#...###.....ccccccccccccc",
+"...........##...cccccccccccccccc",
+"..............cccccccccccccccccc",
+"............cccccccccccccccccccc",
+"..........cccccccccccccccccccccc",
+"..ddd.d.cccccccccccdcccccccccccc",
+".d...dccddddddcdddcdddccdcddcddc",
+"..ddccddccddccdcccddcdccdcdcdccd",
+"ccccddddccddccdcddddcdccdcdcdddd",
+"cdcccdddccddccddccddcdccdcdcdccc",
+"ccdddcdcddddccdcdddcdcdddcdccddd",
+"ccccccccccdccccccccccccccccccccc",
+"cccccccdddcccccccccccccccccccccc",
+};
diff --git a/etc/icons/mh-next-undeleted-msg-up.xpm b/etc/icons/mh-next-undeleted-msg-up.xpm
new file mode 100644
index 0000000..8bb40e9
--- /dev/null
+++ b/etc/icons/mh-next-undeleted-msg-up.xpm
@@ -0,0 +1,52 @@
+/* XPM */
+static char *emh-buttons_09[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32       12            1",
+/* colors */
+". c #ffffff",
+"# c #ffcccc",
+"a c #ff9999",
+"b c #ff6666",
+"c c #ff3333",
+"d c #ff3300",
+"e c #cccccc",
+"f c #999999",
+"g c #666666",
+"h c #333333",
+"i c #000000",
+"j c None",
+/* pixels */
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjj.jjjjjjfhhhhhhhhhhhhhgjj",
+"jjjjjjjjacajjjjfihfeeeeeeefiihjj",
+"jjjjjjjjcd#jjjjfgghe.....ehgfhjj",
+"jjjjjjj#dcjjjjjfg.fif...fif.ehjj",
+"jjjjjjjadbjjeffhhgggigggihf.ehjj",
+"jjjjjjjcd#jjfihgggggggggiih.ehjj",
+"jjjjjj#dd.jjfghg.......ghfh.ehjj",
+"jjjjjjadbjjjfg.ghe...ehg.eh.ehjj",
+"jjjjjjcdaeeeggeegifefihe.eiiihjj",
+"jjjjj#dd.fihhhhhhhhhhhih.ehjjjjj",
+"jjjjjadbjfhif.......eihh.ehjjjjj",
+"jjjjjcdajfgeig.....fifeh.ehjjjjj",
+"jjjb#dd.jfg.ehhe..ghe.eihhhjjjjj",
+"jj.dcdba#fg...gifhh...eheeejjjjj",
+"jj.cdddcjfg....fig....ehjjjjjjjj",
+"jjjadddajfg...........ehjjjjjjjj",
+"jjj.cb#jjfhgggggggggggghjjjjjjjj",
+"jjjjjjjjjeffffffffffffffjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjijjjijjjjjjjjjijjjjjjjjj",
+"jjjjjjjjiijjijjiijijjiiijjjjjjjj",
+"jjjjjjjjijijijijjijiijijjjjjjjjj",
+"jjjjjjjjijijijiiiijjijijjjjjjjjj",
+"jjjjjjjjijjiijijjjjiijijjjjjjjjj",
+"jjjjjjjjijjjijjiiiijjijijjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj"
+};
+
diff --git a/etc/icons/mh-previous-undeleted-msg-up.xpm b/etc/icons/mh-previous-undeleted-msg-up.xpm
new file mode 100644
index 0000000..2f41e74
--- /dev/null
+++ b/etc/icons/mh-previous-undeleted-msg-up.xpm
@@ -0,0 +1,51 @@
+/* XPM */
+static char *emh-buttons_10[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32       12            1",
+/* colors */
+". c #ffffff",
+"# c #ffcccc",
+"a c #ff9999",
+"b c #ff6666",
+"c c #ff3333",
+"d c #ff3300",
+"e c #cccccc",
+"f c #999999",
+"g c #666666",
+"h c #333333",
+"i c #000000",
+"j c None",
+/* pixels */
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjj##jjjjeeeeeeeeeeeeeeejj",
+"jjjjjjj#bdcjjjjhihhhhhhhhhhiifjj",
+"jjjjjj.ddddajjjhihe.......gigfjj",
+"jjjjjjabcddcjjjhegif.....hh.gfjj",
+"jjjjjjj#ddabjjjhe.fig..eig..gfjj",
+"jjjjjjjadb.#hiiiiiiiiiiiiig.gfjj",
+"jjjjjjjcdajjhig........fihg.gfjj",
+"jjjjjj#dd.jjhfhhe.....giegg.gfjj",
+"jjjjjjadbjjjhe.gif...hhe.ghghfjj",
+"jjjjjjcdaghhihhhiihhhihe.ghffejj",
+"jjjjj#dd.hihgggggggggiie.gfjjjjj",
+"jjjjjadbjhgig......ehghe.gfjjjjj",
+"jjjjjcdajheehh....fig.hfegfjjjjj",
+"jjjj#dd.jhe..ghe.gif..hhhhfjjjjj",
+"jjjjadbjjhe...fihhe...hejjjjjjjj",
+"jjjjcdajjhe....eg.....hejjjjjjjj",
+"jjjj#a.jjhe...........hejjjjjjjj",
+"jjjjjjjjjhiiiiiiiiiiiiiejjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjiiiijjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjijjjijiijiijjijjijjjjjjj",
+"jjjjjjjjijjjijijijjijijjijjjjjjj",
+"jjjjjjjjiiiijjijiiiijjijijjjjjjj",
+"jjjjjjjjijjjjjijijjjjjiijjjjjjjj",
+"jjjjjjjjijjjjjijjiiijjjijjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj"
+};
diff --git a/etc/icons/mh-quit-up.xpm b/etc/icons/mh-quit-up.xpm
new file mode 100644
index 0000000..ddadd4a
--- /dev/null
+++ b/etc/icons/mh-quit-up.xpm
@@ -0,0 +1,54 @@
+/* XPM */
+static char *emh-buttons_03[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32       14            1",
+/* colors */
+". c #ffcccc",
+"# c #ffcc33",
+"a c #ff6633",
+"b c #ff3300",
+"c c #cccccc",
+"d c #cc6600",
+"e c #cc3300",
+"f c #999999",
+"g c #996633",
+"h c #996600",
+"i c #993300",
+"j c #663300",
+"k c #000000",
+"l c None",
+/* pixels */
+"llllllllllllllllllllllllllllllll",
+"llllllllllllllllllllllllllllllll",
+"llllllllllllllllllllllllllllllll",
+"lllllllllllllllcfffffffffffcllll",
+"lllllllllllllllfkkkkkkkkkjjgllll",
+"lllllllllllllllfkkkkkkjjihhgllll",
+"lllllllllllllllfkkkjjihdddhgllll",
+"lllllllllllllllfkjjhddddddhgllll",
+"llllllllllll...gkjddddddddhgllll",
+"lllllllllllllabbijddddddddhgllll",
+"llllllllllllllabejddddddddhgllll",
+"llll.aaaaaaaaaabejddddddddhgllll",
+"llllabbbbbbbbbbbejddddddddhgllll",
+"llll...........bej####ddddhgllll",
+"lllllllllllll.bbej####ddddhgllll",
+"llllllllllll.aaejjd##dddddhgllll",
+"lllllllllllllllfkjddddddddhgllll",
+"lllllllllllllllfkjddddddddhgllll",
+"lllllllllllllllfkjddddddddhgllll",
+"llllllllllllllllcjdddddddijgllll",
+"llllllllllllllllcjddddijgfclllll",
+"llllllllllllllllcjdhjjfcllllllll",
+"llllllllllllllllcjjfclllllllllll",
+"llllllllllllllll.c.lllllllllllll",
+"lllllllllllkkkkllllklkllllllllll",
+"lllllllllllklllkllkllkklllllllll",
+"lllllllllllkllllkklklkllllllllll",
+"lllllllllllkkkkllklklkllllllllll",
+"lllllllllllkllllkklklkllllllllll",
+"lllllllllllkkkkkllkkllklllllllll",
+"llllllllllllllllllllllllllllllll",
+"llllllllllllllllllllllllllllllll"
+};
+
diff --git a/etc/icons/mh-reply-up.xpm b/etc/icons/mh-reply-up.xpm
new file mode 100644
index 0000000..c2f1577
--- /dev/null
+++ b/etc/icons/mh-reply-up.xpm
@@ -0,0 +1,52 @@
+/* XPM */
+static char *emh-buttons_12[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32       13            1",
+/* colors */
+". c #ffffff",
+"# c #ffcccc",
+"a c #ff9999",
+"b c #ff6666",
+"c c #ff6633",
+"d c #ff3333",
+"e c #ff3300",
+"f c #ccccff",
+"g c #9999cc",
+"h c #336699",
+"i c #006699",
+"j c None",
+"k c #000000",
+/* pixels */
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjj.ggg.jjjjjj",
+"jjjjjjjjjjjjjjjjjjjjfhiiihfjjjjj",
+"jjjjjjjjjjabajceajj.hiiiiihjjjjj",
+"jjjjjjabajceajceajjfiiiiiiifjjjj",
+"jjjjjjcecj#a#jjjjjjgiiiiiiifjjjj",
+"jjjad.#a#jjjjjjjjjjfiiiiiiifjjjj",
+"jj.eeajjjjjjjjjjjjjjhiiiiihjjjjj",
+"jj#edjjjjjjjjjjjjjjj.hiiii.jjjjj",
+"jjjdeb.jjjjjjjjjjjjjgiiiiihjjjjj",
+"jjj#eeda#jjjj#cb.jjfiiiiiiigjjjj",
+"jjjj#deeedcaa#ded.jhiiiiiiihjjjj",
+"jjjjjj#bdeeeeeeeed.iiiiiiiiifjjj",
+"jjjjjjjjj##aacdeebfiiiiiiiiigjjj",
+"jjjjjjjjjjjjj.debjgiiiiiiiiihjjj",
+"jjjjjjjjjjjjj###jjgiiiiiiiiihjjj",
+"jjjjjjjjjjjjjjjjjj.ffffffffffjjj",
+"jjjjjjjkkkjjjjjjjjjjjkjjjjjjjjjj",
+"jjjjjjjkjjkjjkkjkkkjjkjkjjkjjjjj",
+"jjjjjjjkjjkjkjjkkjjkjkjkjjkjjjjj",
+"jjjjjjjkkkjjkkkkkjjkjkjjkjkjjjjj",
+"jjjjjjjkjkjjkjjjkjjkjkjjkkjjjjjj",
+"jjjjjjjkjjkjjkkkkkkjjkjjjkjjjjjj",
+"jjjjjjjjjjjjjjjjkjjjjjjjkjjjjjjj",
+"jjjjjjjjjjjjjjjjkjjjjjjkjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj"
+};
diff --git a/etc/icons/mh-rescan-folder-up.xpm b/etc/icons/mh-rescan-folder-up.xpm
new file mode 100644
index 0000000..f3127e7
--- /dev/null
+++ b/etc/icons/mh-rescan-folder-up.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char *emh-buttons_08[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32        9            1",
+/* colors */
+". c #ffffff",
+"# c #cccccc",
+"a c #99cc99",
+"b c #999999",
+"c c #666666",
+"d c #339933",
+"e c #333333",
+"f c #000000",
+"g c None",
+/* pixels */
+"gggggggggggggggggggggggggggggggg",
+"gggggggggggggggggggggggggggggggg",
+"gggggggggggggggggggggggggggggggg",
+"gggggggggggggggggggggggggggggggg",
+"gggggggggggggggggggggggggggggggg",
+"gggggggggggggggggggggggggggggggg",
+"gggggggggg#bbbbbbbbbbbbb#ggggggg",
+"ggggggggggbfeeeeeeeeeeffbggggggg",
+"gggggggg#beffcccccccccfebggggggg",
+"gggggggg#ffeeeeeeeeeefecbggggggg",
+"gggggggbcffcccccccccfeecbg.ggggg",
+"gggggggffeeeeeeeeeeff#ecedaggggg",
+"gggggggfee#......#eef#ecedaggggg",
+"gggggggf.cfb....#fc.f#ebddaggggg",
+"gggggg#f..bfc..bfb..f#fdddaggggg",
+"ggggg.df...#eecf#...f#edddaggggg",
+"gggggadf.....cc.....feddddaggggg",
+"gggggdddddddddddddddddddddgggggg",
+"gggggdddddddddddddddddddd.gggggg",
+"gggggddddddddddddddddddd#ggggggg",
+"gggggddddddddddddddddddagggggggg",
+"gggggdddddddddddddddddaggggggggg",
+"gggggaaaaaaaaaaaaaaaaa.ggggggggg",
+"gggggggggggggggggggggggggggggggg",
+"ggggfffggggggggggggggggggggggggg",
+"ggggfggfggffggfffgffgfffgfffgggg",
+"ggggfggfgfggffgggfggfgggffggfggg",
+"ggggfffggffffgffgfggggffffggfggg",
+"ggggfgfggfggggggffggffggffggfggg",
+"ggggfggfggffffffggffggffffggfggg",
+"gggggggggggggggggggggggggggggggg",
+"gggggggggggggggggggggggggggggggg"
+};
diff --git a/etc/icons/mh-send-letter-up.xpm b/etc/icons/mh-send-letter-up.xpm
new file mode 100644
index 0000000..3a41b93
--- /dev/null
+++ b/etc/icons/mh-send-letter-up.xpm
@@ -0,0 +1,52 @@
+/* XPM */
+static char *emh-buttons_05[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32       12            1",
+/* colors */
+". c #ffffff",
+"# c #ffcccc",
+"a c #ff6666",
+"b c #ff3333",
+"c c #ff3300",
+"d c #cccccc",
+"e c #999999",
+"f c #666666",
+"g c #333333",
+"h c #330000",
+"i c #000000",
+"j c None",
+/* pixels */
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjbbbbbbbbbbbbbbbbjjj",
+"jjjjjjjjjjjjjbbbbbbbbbbbbbbbbjjj",
+"jjjjjjjjjjjjjbhiiiiiihbbbbbbbjjj",
+"jjjjjjjjjjjjdhfge...ggbbbbbbbjjj",
+"jjjjjjjjjjjeif.eg..ehbbbbbbbbjjj",
+"jjjjjjjjj.fid.efid.gbbbbbbbbbjjj",
+"jjjjjjjjdgiffiged.ehbbbbbbbbbjjj",
+"jjjjjjjeiiife.....iaaaaabbbbbjjj",
+"jjjjjjdgiifd.....fg#####bbbbbjjj",
+"jjjjjjjjdefgigfedgaaaaaabbbbbjjj",
+"jjjjj#aaa.jjjbhhif##.###bbbbbjjj",
+"jjjj#cccc#jjjbbbbbbb#abbbbbbbjjj",
+"jjjj#accc#jjjbbbbbbb#abbbbbbbjjj",
+"jjjj#bcbc#jjjbbbbbbbabbbbbbbbjjj",
+"jjj.bcb#bjjjjbbbbbbbbbbbbbbbbjjj",
+"jjjbcb...jjjjaaaaaabbbaaaaaaajjj",
+"jj.bb#jjjjjjjjjjjjjabb#jjjjjjjjj",
+"jjj.#jjjjjjjjjjjjjjabb#jjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjabb#jjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjabb#jjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjj###.jjjjjjjjj",
+"jjjjjjjjiiijjjjjjjjjjjjjijjjjjjj",
+"jjjjjjjijjjijiijjiiijjiiijjjjjjj",
+"jjjjjjjjiijjijjijijjiijjijjjjjjj",
+"jjjjjjjjjjiiiiiijijjiijjijjjjjjj",
+"jjjjjjjijjjiijjjjijjiijjijjjjjjj",
+"jjjjjjjjiiijjiiijijjijiiijjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj",
+"jjjjjjjjjjjjjjjjjjjjjjjjjjjjjjjj"
+};
+
diff --git a/etc/icons/mh-send-up.xpm b/etc/icons/mh-send-up.xpm
new file mode 100644
index 0000000..06cde26
--- /dev/null
+++ b/etc/icons/mh-send-up.xpm
@@ -0,0 +1,51 @@
+/* XPM */
+static char *emh-buttons_01[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32       11            1",
+/* colors */
+". c #ffffff",
+"# c #ffffcc",
+"a c #ffcccc",
+"b c #ffcc66",
+"c c #ffcc33",
+"d c #ffcc00",
+"e c #ff0000",
+"f c #cccccc",
+"g c #333333",
+"h c #000000",
+"i c None",
+/* pixels */
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiii#iiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiii.c#iiiiiii",
+"iiiiiiiiiiiiiiiiiiiiii#dbiiiiiii",
+"iiiiiiiiiiiiiiiiii###icdd#####ii",
+"iiiiiiiiiiiiiiiiiibdddddddddciii",
+"iiiiiigggggggggggggddddddddc.iii",
+"iiiiiigfffffffffffffddddddd#iiii",
+"iiiiiigf.aaa.......bdddddddbiiii",
+"iiiiiigfaeeb......#ddddddddd#iii",
+"iiiiiigfaeeb......bcbbdddbgcc#ii",
+"iiiiiigfaeeb..........bdc.hiiiii",
+"iiiiiigf..............#d#.hiiiii",
+"iiiiiigf.....ffffffffffb..hiiiii",
+"iiiiiigf.....ffffffffff...hiiiii",
+"iiiiiigf.......ffffffff...hiiiii",
+"iiiiiigf.......ffffffff...hiiiii",
+"iiiiiigf..................hiiiii",
+"iiiiiigf..................hiiiii",
+"iiiiiighhhhhhhhhhhhhhhhhhhhiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiihiiihiiiiiiiiiiiiiiiiiii",
+"iiiiiiiihhiihiihhihiihihiiiiiiii",
+"iiiiiiiihihihihiihhihhihiiiiiiii",
+"iiiiiiiihihihihhhhhihhihiiiiiiii",
+"iiiiiiiihiihhihiiiihhihiiiiiiiii",
+"iiiiiiiihiiihiihhhihiihiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii",
+"iiiiiiiiiiiiiiiiiiiiiiiiiiiiiiii"
+};
+
diff --git a/etc/icons/mh-show-up.xpm b/etc/icons/mh-show-up.xpm
new file mode 100644
index 0000000..a4b9900
--- /dev/null
+++ b/etc/icons/mh-show-up.xpm
@@ -0,0 +1,47 @@
+/* XPM */
+static char *emh-buttons_11[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32        8            1",
+/* colors */
+". c #ffffff",
+"# c #cccccc",
+"a c #9999cc",
+"b c #999999",
+"c c #666666",
+"d c #333333",
+"e c #000000",
+"f c None",
+/* pixels */
+"ffffffffffffffffffffffffffffffff",
+"ffffffffffffffffffffffffffffffff",
+"ffffffffffffffffffffffffffffffff",
+"fff#eeeeeeeeeeeeeee#ffffffffffff",
+"fff#d.............d#ffffffffffff",
+"fff#d..#########..d#ffffffffffff",
+"fff#d.#aaaaaaaaa#.d#ffffffffffff",
+"fff#d..#########..d#f#cbffffffff",
+"fff#d.#aaaaaaaaa#.d#becdd#ffffff",
+"fff#d..######.....ded#..cebfffff",
+"fff#d.#aaaaaa#....dc.....#dd#fff",
+"fff#d.............dcccccccceebff",
+"fff#d.#bbbbbbbbb#.ddddddddddddff",
+"fff#d.............d#........#dff",
+"fff#d.#bbbbbbbbb#.d#........#dff",
+"fff#d.............d#........#dff",
+"fff#d.#bbbbbb.....d#........#dff",
+"fff#d.............d#........#dff",
+"fff#d.............d#........#dff",
+"fff#d.............dccccccccccdff",
+"fff#d.............dcbbbbbbbbbbff",
+"fff#d.............d#ffffffffffff",
+"fff#dcccccccccccccd#ffffffffffff",
+"fff#bbbbbbbbbbbbbbb#ffffffffffff",
+"ffffffffeeefefffffffffffffffffff",
+"fffffffefffeeeeffeeffeffefefffff",
+"ffffffffeeffeffeeffefefeefefffff",
+"ffffffffffeeeffeeffefefeefefffff",
+"fffffffefffeeffeeffeffeefeffffff",
+"ffffffffeeefeffefeefffeffeffffff",
+"ffffffffffffffffffffffffffffffff",
+"ffffffffffffffffffffffffffffffff"
+};
diff --git a/etc/icons/mh-yank-cur-msg-up.xpm b/etc/icons/mh-yank-cur-msg-up.xpm
new file mode 100644
index 0000000..6ab69e8
--- /dev/null
+++ b/etc/icons/mh-yank-cur-msg-up.xpm
@@ -0,0 +1,45 @@
+/* XPM */
+static char *emh-buttons_16[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32        6            1",
+/* colors */
+". c #ffffff",
+"# c #cccccc",
+"a c #999999",
+"b c #666666",
+"c c None",
+"d c #000000",
+/* pixels */
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ccccccc...................cccccc",
+"ccccccc..aba..............cccccc",
+"ccccccc....ab#............cccccc",
+"ccccccc...aba.............cccccc",
+"ccccccc..a#...............cccccc",
+"ccccccc...................cccccc",
+"ccccccc...................cccccc",
+"ccccccc..aba..............cccccc",
+"ccccccc....ab#............cccccc",
+"ccccccc...aba.............cccccc",
+"ccccccc..a#...............cccccc",
+"ccccccc...................cccccc",
+"ccccccc...................cccccc",
+"ccccccc..aba..............cccccc",
+"ccccccc....ab#............cccccc",
+"ccccccc...aba.............cccccc",
+"ccccccc..a#...............cccccc",
+"ccccccc...................cccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc",
+"ccccccccdcccdccccccccdcccccccccc",
+"cccccccccdcddddcdddccdcddccccccc",
+"cccccccccdcdcccddccdcddccccccccc",
+"ccccccccccdccddddccdcddccccccccc",
+"ccccccccccdcdccddccdcdcdcccccccc",
+"ccccccccccdccddddccdcdcddccccccc",
+"cccccccccccccccccccccccccccccccc",
+"cccccccccccccccccccccccccccccccc"
+};
diff --git a/etc/icons/mime-edit-set-encrypt-up.xpm b/etc/icons/mime-edit-set-encrypt-up.xpm
new file mode 100644
index 0000000..048e7fb
--- /dev/null
+++ b/etc/icons/mime-edit-set-encrypt-up.xpm
@@ -0,0 +1,48 @@
+/* XPM */
+static char *emh-buttons_13[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32        9            1",
+/* colors */
+". c #ffffcc",
+"# c #ffcc99",
+"a c #ffcc66",
+"b c #ff9933",
+"c c #ff9900",
+"d c #ff6600",
+"e c #ff3300",
+"f c None",
+"g c #000000",
+/* pixels */
+"ffffffffffffffffffffffffffffffff",
+"ffffffffffffffffffffffffffffffff",
+"ffffffffffffffffffffffffffffffff",
+"ffffffffffffffffffffffffffffffff",
+"ffffffffffffffffffffffffffffffff",
+"fffffffffffffff#aba.ffffffffffff",
+"fffffffffffff.bccccb#fffffffffff",
+"fffffffffffffbcb##bcc.ffffffffff",
+"ffffffffffff#cb.fffacbffffffffff",
+"ffffffffffffac#ffff.cc.fffffffff",
+"ffffffffffffcc.fffffac#fffffffff",
+"ffffffffbbbbccbbbbbbbcbbbbffffff",
+"ffffffffccccccccccccccccccffffff",
+"ffffffffccccccccccccccccccffffff",
+"ffffffffcccdddcccdccddccccffffff",
+"ffffffffcccededdeeecedecccffffff",
+"ffffffffcccecddeccdcecedccffffff",
+"ffffffffccceeececeeceeecccffffff",
+"ffffffffcccecccdedececccccffffff",
+"ffffffffcccdcccccdccdcccccffffff",
+"ffffffffccccccccccccccccccffffff",
+"ffffffffccccccccccccccccccffffff",
+"ffffffffccccccccccccccccccffffff",
+"ffffggggffffffffffffffffffffgfff",
+"ffffgfffgggffggfggfgffggggffggff",
+"ffffgfffgffggffggffgffggffgfgfff",
+"ffffgggggffggfffgfffgfggffgfgfff",
+"ffffgfffgffggffggfffggfgffgfgfff",
+"ffffgggggffgfggfgffffgfgggfffgff",
+"ffffffffffffffffffffgffgffffffff",
+"fffffffffffffffffffgfffgffffffff",
+"ffffffffffffffffffffffffffffffff"
+};
diff --git a/etc/icons/mime-edit-set-sign-up.xpm b/etc/icons/mime-edit-set-sign-up.xpm
new file mode 100644
index 0000000..95c7827
--- /dev/null
+++ b/etc/icons/mime-edit-set-sign-up.xpm
@@ -0,0 +1,57 @@
+/* XPM */
+static char *emh-buttons_14[] = {
+/* width height num_colors chars_per_pixel */
+"    32    32       18            1",
+/* colors */
+". c #ffffff",
+"# c #ffcccc",
+"a c #ffcc66",
+"b c #ff9999",
+"c c #ff3333",
+"d c #cccccc",
+"e c #cc9966",
+"f c #cc9933",
+"g c #999999",
+"h c #999933",
+"i c #996633",
+"j c #666666",
+"k c #666633",
+"l c #663333",
+"m c #333300",
+"n c #330000",
+"o c #000000",
+"p c None",
+/* pixels */
+"pppppppppppppppppppppppppppppppp",
+"pppppppppppppppppppppppppppppppp",
+"pp.##...#..###.ppppppppppppppppp",
+"pp#cbc.cbc#bbbbdpppppppppppppppp",
+"pp#b.cbb..#bbdckojdppppppppppppp",
+"pp#ccbbb#cbbcc#aakogpppppppppppp",
+"pp#b..#cbcbb#aaaaafodppppppppppp",
+"pp.#pp..##j##aaffaaio.pppppppppp",
+"pppppppppglaakomnokaljpppppppppp",
+"pppppppppmhammeaafmkeodppppppppp",
+"ppppppppdoainaaikheoelgppppppppp",
+"ppppppppdmaliaknkohkkhmppppppppp",
+"ppppppppglamfamhaimhmaoppppppppp",
+"ppppppppgkamfamienlkkamdpppppppp",
+"ppppppppgkaliainhifofamgpppppppp",
+"ppppppppglaimaakonoiaakgpppppppp",
+"ppppppppdmaaohaaafaaaakgpppppppp",
+"ppppppppdoaahoeaaaaaaakgpppppppp",
+"pppppppppmeaaiokaaaaaamdpppppppp",
+"pppppppppjkaaaemoeaaaaodpppppppp",
+"pppppppppdoaaaaaaaaaaeoppppppppp",
+"pppppppppplkaaaaaaaaaegppppppppp",
+"ppppppppppdj##...ppppppppppppppp",
+"pppppppppppppppppppppppppppppppp",
+"pppppppppoooppoppppppppppppppppp",
+"ppppppppopppopppooopoooppppppppp",
+"pppppppppoopppooppopoppopppppppp",
+"pppppppppppoopooppopoppopppppppp",
+"ppppppppopppopooppopoppopppppppp",
+"pppppppppoooppopooopoppopppppppp",
+"ppppppppppppppppppoppppppppppppp",
+"pppppppppppppppooopppppppppppppp"
+};