diff --git a/mu4e/mu4e-main.el b/mu4e/mu4e-main.el
index 6ea6657d..fc277c9f 100644
--- a/mu4e/mu4e-main.el
+++ b/mu4e/mu4e-main.el
@@ -1,6 +1,6 @@
 ;;; mu4e-main.el -- part of mu4e, the mu mail user agent -*- lexical-binding: t -*-
 ;;
-;; Copyright (C) 2011-2016 Dirk-Jan C. Binnema
+;; Copyright (C) 2011-2020 Dirk-Jan C. Binnema
 
 ;; Author: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
 ;; Maintainer: Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
@@ -87,18 +87,18 @@ when STR is clicked (using RET or mouse-2); if FUNC-OR-SHORTCUT is
 a string, execute the corresponding keyboard action when it is
 clicked."
   (let ((newstr
-	 (replace-regexp-in-string
-	  "\\[\\(..?\\)\\]"
-	  (lambda(m)
-	    (format "[%s]"
-		    (propertize (match-string 1 m) 'face 'mu4e-highlight-face)))
-	  str))
-	(map (make-sparse-keymap))
-	(func (if (functionp func-or-shortcut)
-		  func-or-shortcut
-		(if (stringp func-or-shortcut)
-                    (lambda()(interactive)
-			   (execute-kbd-macro func-or-shortcut))))))
+	        (replace-regexp-in-string
+	          "\\[\\(..?\\)\\]"
+	          (lambda(m)
+	            (format "[%s]"
+		            (propertize (match-string 1 m) 'face 'mu4e-highlight-face)))
+	          str))
+	       (map (make-sparse-keymap))
+	       (func (if (functionp func-or-shortcut)
+		             func-or-shortcut
+		             (if (stringp func-or-shortcut)
+                   (lambda()(interactive)
+			               (execute-kbd-macro func-or-shortcut))))))
     (define-key map [mouse-2] func)
     (define-key map (kbd "RET") func)
     (put-text-property 0 (length newstr) 'keymap map newstr)
@@ -111,96 +111,96 @@ clicked."
 ;; buffer switching at the end.
 (defun mu4e~main-view-real (ignore-auto noconfirm)
   (let ((buf (get-buffer-create mu4e~main-buffer-name))
-	(inhibit-read-only t))
+	       (inhibit-read-only t))
     (with-current-buffer buf
       (erase-buffer)
       (insert
-       "* "
-	(propertize "mu4e - mu for emacs version " 'face 'mu4e-title-face)
-	(propertize  mu4e-mu-version 'face 'mu4e-header-key-face)
+        "* "
+	      (propertize "mu4e - mu for emacs version " 'face 'mu4e-title-face)
+	      (propertize  mu4e-mu-version 'face 'mu4e-header-key-face)
 
-       ;; show some server properties; in this case; a big C when there's
-       ;; crypto support, a big G when there's Guile support
-       " "
-       (propertize
-	(concat
-	  (when (plist-get mu4e~server-props :crypto) "C")
-	  (when (plist-get mu4e~server-props :guile)  "G")
-	  (when (plist-get mu4e~server-props :mux)  "X"))
-	 'face 'mu4e-title-face)
+        ;; show some server properties; in this case; a big C when there's
+        ;; crypto support, a big G when there's Guile support
+        " "
+        (propertize
+	        (concat
+	          (when (plist-get mu4e~server-props :crypto) "C")
+	          (when (plist-get mu4e~server-props :guile)  "G")
+	          (when (plist-get mu4e~server-props :mux)  "X"))
+	        'face 'mu4e-title-face)
 
-       "\n\n"
-       (propertize "  Basics\n\n" 'face 'mu4e-title-face)
-	(mu4e~main-action-str
-	  "\t* [j]ump to some maildir\n" 'mu4e-jump-to-maildir)
-	(mu4e~main-action-str
-	  "\t* enter a [s]earch query\n" 'mu4e-search)
-	(mu4e~main-action-str
-	  "\t* [C]ompose a new message\n" 'mu4e-compose-new)
-       "\n"
-       (propertize "  Bookmarks\n\n" 'face 'mu4e-title-face)
-       ;; TODO: it's a bit uncool to hard-code the "b" shortcut...
-       (mapconcat
-	(lambda (bm)
-	  (mu4e~main-action-str
-	    (concat "\t* [b" (make-string 1 (plist-get bm :key)) "] "
-	      (plist-get bm :name))
-	    (concat "b" (make-string 1 (plist-get bm :key)))))
-	 (mu4e-bookmarks) "\n")
-       "\n\n"
-       (propertize "  Misc\n\n" 'face 'mu4e-title-face)
+        "\n\n"
+        (propertize "  Basics\n\n" 'face 'mu4e-title-face)
+	      (mu4e~main-action-str
+	        "\t* [j]ump to some maildir\n" 'mu4e-jump-to-maildir)
+	      (mu4e~main-action-str
+	        "\t* enter a [s]earch query\n" 'mu4e-search)
+	      (mu4e~main-action-str
+	        "\t* [C]ompose a new message\n" 'mu4e-compose-new)
+        "\n"
+        (propertize "  Bookmarks\n\n" 'face 'mu4e-title-face)
+        ;; TODO: it's a bit uncool to hard-code the "b" shortcut...
+        (mapconcat
+	        (lambda (bm)
+	          (mu4e~main-action-str
+	            (concat "\t* [b" (make-string 1 (plist-get bm :key)) "] "
+	              (plist-get bm :name))
+	            (concat "b" (make-string 1 (plist-get bm :key)))))
+	        (mu4e-bookmarks) "\n")
+        "\n\n"
+        (propertize "  Misc\n\n" 'face 'mu4e-title-face)
 
-	(mu4e~main-action-str "\t* [;]Switch context\n" 'mu4e-context-switch)
+	      (mu4e~main-action-str "\t* [;]Switch context\n" 'mu4e-context-switch)
 
-	(mu4e~main-action-str "\t* [U]pdate email & database\n"
-	  'mu4e-update-mail-and-index)
+	      (mu4e~main-action-str "\t* [U]pdate email & database\n"
+	        'mu4e-update-mail-and-index)
 
-	;; show the queue functions if `smtpmail-queue-dir' is defined
-	(if (file-directory-p smtpmail-queue-dir)
-	  (mu4e~main-view-queue)
-	 "")
-	"\n"
-	(mu4e~main-action-str "\t* [N]ews\n" 'mu4e-news)
-	(mu4e~main-action-str "\t* [A]bout mu4e\n" 'mu4e-about)
-	(mu4e~main-action-str "\t* [H]elp\n" 'mu4e-display-manual)
-	(mu4e~main-action-str "\t* [q]uit\n" 'mu4e-quit))
+	      ;; show the queue functions if `smtpmail-queue-dir' is defined
+	      (if (file-directory-p smtpmail-queue-dir)
+	        (mu4e~main-view-queue)
+	        "")
+	      "\n"
+	      (mu4e~main-action-str "\t* [N]ews\n" 'mu4e-news)
+	      (mu4e~main-action-str "\t* [A]bout mu4e\n" 'mu4e-about)
+	      (mu4e~main-action-str "\t* [H]elp\n" 'mu4e-display-manual)
+	      (mu4e~main-action-str "\t* [q]uit\n" 'mu4e-quit))
       (mu4e-main-mode)
       )))
 
 (defun mu4e~main-view-queue ()
   "Display queue-related actions in the main view."
   (concat
-   (mu4e~main-action-str "\t* toggle [m]ail sending mode "
-			 'mu4e~main-toggle-mail-sending-mode)
-   "(currently "
-   (propertize (if smtpmail-queue-mail "queued" "direct")
-	       'face 'mu4e-header-key-face)
-   ")\n"
-   (let ((queue-size (mu4e~main-queue-size)))
-     (if (zerop queue-size)
-	 ""
-       (mu4e~main-action-str
-	(format "\t* [f]lush %s queued %s\n"
-		(propertize (int-to-string queue-size)
-			    'face 'mu4e-header-key-face)
-		(if (> queue-size 1) "mails" "mail"))
-	'smtpmail-send-queued-mail)))))
+    (mu4e~main-action-str "\t* toggle [m]ail sending mode "
+			'mu4e~main-toggle-mail-sending-mode)
+    "(currently "
+    (propertize (if smtpmail-queue-mail "queued" "direct")
+	    'face 'mu4e-header-key-face)
+    ")\n"
+    (let ((queue-size (mu4e~main-queue-size)))
+      (if (zerop queue-size)
+	      ""
+        (mu4e~main-action-str
+	        (format "\t* [f]lush %s queued %s\n"
+		        (propertize (int-to-string queue-size)
+			        'face 'mu4e-header-key-face)
+		        (if (> queue-size 1) "mails" "mail"))
+	        'smtpmail-send-queued-mail)))))
 
 (defun mu4e~main-queue-size ()
   "Return, as an int, the number of emails in the queue."
   (condition-case nil
-      (with-temp-buffer
-	(insert-file-contents (expand-file-name smtpmail-queue-index-file
-						smtpmail-queue-dir))
-	(count-lines (point-min) (point-max)))
+    (with-temp-buffer
+	    (insert-file-contents (expand-file-name smtpmail-queue-index-file
+						                  smtpmail-queue-dir))
+	    (count-lines (point-min) (point-max)))
     (error 0)))
 
 (defun mu4e~main-view ()
   "Create the mu4e main-view, and switch to it."
   (if (eq mu4e-split-view 'single-window)
-      (if (buffer-live-p (mu4e-get-headers-buffer))
-	  (switch-to-buffer (mu4e-get-headers-buffer))
-	(mu4e~main-menu))
+    (if (buffer-live-p (mu4e-get-headers-buffer))
+	    (switch-to-buffer (mu4e-get-headers-buffer))
+	    (mu4e~main-menu))
     (mu4e~main-view-real nil nil)
     (switch-to-buffer mu4e~main-buffer-name)
     (goto-char (point-min)))
@@ -217,7 +217,7 @@ clicked."
     (mu4e-error "`smtpmail-queue-dir' does not exist"))
   (setq smtpmail-queue-mail (not smtpmail-queue-mail))
   (message (concat "Outgoing mail will now be "
-		   (if smtpmail-queue-mail "queued" "sent directly")))
+		         (if smtpmail-queue-mail "queued" "sent directly")))
   (unless (eq mu4e-split-view 'single-window)
     (let ((curpos (point)))
       (mu4e~main-view-real nil nil)
@@ -227,36 +227,29 @@ clicked."
   "mu4e main view in the minibuffer."
   (interactive)
   (let ((key
-	  (read-key
-	   (mu4e-format
-	    "%s"
-	    (concat
-	     (mu4e~main-action-str "[j]ump " 'mu4e-jump-to-maildir)
-	     (mu4e~main-action-str "[s]earch " 'mu4e-search)
-	     (mu4e~main-action-str "[C]ompose " 'mu4e-compose-new)
-	     (mu4e~main-action-str "[b]ookmarks " 'mu4e-headers-search-bookmark)
-	     (mu4e~main-action-str "[;]Switch context " 'mu4e-context-switch)
-	     (mu4e~main-action-str "[U]pdate " 'mu4e-update-mail-and-index)
-	     (mu4e~main-action-str "[N]ews " 'mu4e-news)
-	     (mu4e~main-action-str "[A]bout " 'mu4e-about)
-	     (mu4e~main-action-str "[H]elp " 'mu4e-display-manual))))))
+	        (read-key
+	          (mu4e-format
+	            "%s"
+	            (concat
+	              (mu4e~main-action-str "[j]ump " 'mu4e-jump-to-maildir)
+	              (mu4e~main-action-str "[s]earch " 'mu4e-search)
+	              (mu4e~main-action-str "[C]ompose " 'mu4e-compose-new)
+	              (mu4e~main-action-str "[b]ookmarks " 'mu4e-headers-search-bookmark)
+	              (mu4e~main-action-str "[;]Switch context " 'mu4e-context-switch)
+	              (mu4e~main-action-str "[U]pdate " 'mu4e-update-mail-and-index)
+	              (mu4e~main-action-str "[N]ews " 'mu4e-news)
+	              (mu4e~main-action-str "[A]bout " 'mu4e-about)
+	              (mu4e~main-action-str "[H]elp " 'mu4e-display-manual))))))
     (unless (member key '(?\C-g ?\C-\[))
       (let ((mu4e-command (lookup-key mu4e-main-mode-map (string key) t)))
-	(if mu4e-command
-	    (condition-case err
-		(let ((mu4e-hide-index-messages t))
-		  (call-interactively mu4e-command))
-	      (error (when (cadr err) (message (cadr err)))))
-	  (message (mu4e-format "key %s not bound to a command" (string key))))
-	(when (or (not mu4e-command) (eq mu4e-command 'mu4e-context-switch))
-	  (sit-for 1)
-	  (mu4e~main-menu))))))
-
-;; (progn
-;;   (define-key mu4e-compose-mode-map (kbd "C-c m") 'mu4e~main-toggle-mail-sending-mode)
-;;   (define-key mu4e-view-mode-map (kbd "C-c m")    'mu4e~main-toggle-mail-sending-mode)
-;;   (define-key mu4e-compose-mode-map (kbd "C-c m") 'mu4e~main-toggle-mail-sending-mode)
-;;   (define-key mu4e-headers-mode-map (kbd "C-c m") 'mu4e~main-toggle-mail-sending-mode)
-;; )
+	      (if mu4e-command
+	        (condition-case err
+		        (let ((mu4e-hide-index-messages t))
+		          (call-interactively mu4e-command))
+	          (error (when (cadr err) (message (cadr err)))))
+	        (message (mu4e-format "key %s not bound to a command" (string key))))
+	      (when (or (not mu4e-command) (eq mu4e-command 'mu4e-context-switch))
+	        (sit-for 1)
+	        (mu4e~main-menu))))))
 
 (provide 'mu4e-main)