diff --git a/README.org b/README.org
index dbc92288..e4e1d6fc 100644
--- a/README.org
+++ b/README.org
@@ -1073,13 +1073,13 @@ If on a:
 
   ;; shortcuts in the jumplist by pressing "J" in the mu4e buffer
   (setq mu4e-maildir-shortcuts
-	'((:maildir "/office/Archive"               :key ?a)
-          (:maildir "/office/INBOX"                  :key ?i)
-          (:maildir "/outlook/INBOX"                 :key ?l)
-          (:maildir "/office/Junk Email"             :key ?j)
-          (:maildir "/office/INBOX/Website Forms"    :key ?f)
-          (:maildir "/gmail/INBOX"                   :key ?g)
-          (:maildir "/office/Sent Items"                   :key ?s)))
+	'((:maildir "/office/Archive"                :key ?a)
+	  (:maildir "/office/INBOX"                  :key ?i)
+	  (:maildir "/outlook/INBOX"                 :key ?l)
+	  (:maildir "/office/Junk Email"             :key ?j)
+	  (:maildir "/office/INBOX/Website Forms"    :key ?f)
+	  (:maildir "/gmail/INBOX"                   :key ?g)
+	  (:maildir "/office/Sent Items"             :key ?s)))
 
   ;; (add-to-list mu4e-headers-actions ("org capture message" . mu4e-org-store-and-capture))
 
@@ -1087,14 +1087,25 @@ If on a:
 	'((:name "Unread messages"
 		 :query "flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\" AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\""
 		 :key 117)
-          (:name "Today's messages" :query "date:today..now" :key 116)
-          (:name "Last 7 days" :query "date:7d..now" :hide-unread t :key 119)
-          (:name "Messages with images" :query "mime:image/*" :key 112)))
+	  (:name "Today's messages"
+		 :query "date:today..now"
+		 :key 116)
+	  (:name "Last 7 days"
+		 :query "date:7d..now"
+		 :hide-unread t
+		 :key 119)
+	  (:name "Messages with images"
+		 :query "mime:image/*"
+		 :key 112)))
 
   (setq mu4e-mu-binary "/usr/bin/mu")
 
-  (add-hook 'mu4e-headers-mode-hook (display-line-numbers-mode -1))
-  (add-hook 'mu4e-headers-mode-hook (toggle-truncate-lines +1))
+  (defun chris/setup-mu4e-headers ()
+    (toggle-truncate-lines -1)
+    (display-line-numbers-mode -1))
+
+  (remove-hook 'mu4e-main-mode-hook '(display-line-numbers-mode -1))
+  (add-hook 'mu4e-headers-mode-hook #'chris/setup-mu4e-headers)
   
   (mu4e t)
   :general
@@ -1244,9 +1255,21 @@ Let's add our own eshell prompt. and set the password cache to a significantly h
   ;;; last line only.
   (setq-default eshell-prompt-regexp "^ ")
   (setq eshell-destroy-buffer-when-process-dies t)
+
+  (defun chris/pop-eshell ()
+    "Make an eshell frame on the bottom"
+    (interactive)
+    (unless pop-eshell
+      (setq pop-eshell (eshell 100))
+      (with-current-buffer pop-eshell
+	(eshell/clear-scrollback)
+	(rename-buffer "*eshell-pop*")
+	(display-buffer-in-side-window pop-eshell '((side . bottom))))))
+
   :general
   (chris/leader-keys
-    "oe" 'eshell)
+    "oe" 'chris/pop-eshell
+    "oE" 'eshell)
   (general-def '(normal insert) eshell-mode-map
     "C-d" 'kill-this-buffer))
 #+end_src
diff --git a/init.el b/init.el
index 0ca7da1f..f0f80f6e 100644
--- a/init.el
+++ b/init.el
@@ -794,13 +794,13 @@ If on a:
 
   ;; shortcuts in the jumplist by pressing "J" in the mu4e buffer
   (setq mu4e-maildir-shortcuts
-	'((:maildir "/office/Archive"               :key ?a)
-          (:maildir "/office/INBOX"                  :key ?i)
-          (:maildir "/outlook/INBOX"                 :key ?l)
-          (:maildir "/office/Junk Email"             :key ?j)
-          (:maildir "/office/INBOX/Website Forms"    :key ?f)
-          (:maildir "/gmail/INBOX"                   :key ?g)
-          (:maildir "/office/Sent Items"                   :key ?s)))
+	'((:maildir "/office/Archive"                :key ?a)
+	  (:maildir "/office/INBOX"                  :key ?i)
+	  (:maildir "/outlook/INBOX"                 :key ?l)
+	  (:maildir "/office/Junk Email"             :key ?j)
+	  (:maildir "/office/INBOX/Website Forms"    :key ?f)
+	  (:maildir "/gmail/INBOX"                   :key ?g)
+	  (:maildir "/office/Sent Items"             :key ?s)))
 
   ;; (add-to-list mu4e-headers-actions ("org capture message" . mu4e-org-store-and-capture))
 
@@ -808,14 +808,25 @@ If on a:
 	'((:name "Unread messages"
 		 :query "flag:unread AND NOT flag:trashed AND NOT maildir:\"/outlook/Junk\" AND NOT maildir:\"/office/Junk Email\" AND NOT maildir:\"/outlook/Deleted\" AND NOT maildir:\"/office/Deleted Items\""
 		 :key 117)
-          (:name "Today's messages" :query "date:today..now" :key 116)
-          (:name "Last 7 days" :query "date:7d..now" :hide-unread t :key 119)
-          (:name "Messages with images" :query "mime:image/*" :key 112)))
+	  (:name "Today's messages"
+		 :query "date:today..now"
+		 :key 116)
+	  (:name "Last 7 days"
+		 :query "date:7d..now"
+		 :hide-unread t
+		 :key 119)
+	  (:name "Messages with images"
+		 :query "mime:image/*"
+		 :key 112)))
 
   (setq mu4e-mu-binary "/usr/bin/mu")
 
-  (add-hook 'mu4e-headers-mode-hook (display-line-numbers-mode -1))
-  (add-hook 'mu4e-headers-mode-hook (toggle-truncate-lines +1))
+  (defun chris/setup-mu4e-headers ()
+    (toggle-truncate-lines -1)
+    (display-line-numbers-mode -1))
+
+  (remove-hook 'mu4e-main-mode-hook '(display-line-numbers-mode -1))
+  (add-hook 'mu4e-headers-mode-hook #'chris/setup-mu4e-headers)
   
   (mu4e t)
   :general
@@ -942,9 +953,21 @@ If on a:
   ;;; last line only.
   (setq-default eshell-prompt-regexp "^ ")
   (setq eshell-destroy-buffer-when-process-dies t)
+
+  (defun chris/pop-eshell ()
+    "Make an eshell frame on the bottom"
+    (interactive)
+    (unless pop-eshell
+      (setq pop-eshell (eshell 100))
+      (with-current-buffer pop-eshell
+	(eshell/clear-scrollback)
+	(rename-buffer "*eshell-pop*")
+	(display-buffer-in-side-window pop-eshell '((side . bottom))))))
+
   :general
   (chris/leader-keys
-    "oe" 'eshell)
+    "oe" 'chris/pop-eshell
+    "oE" 'eshell)
   (general-def '(normal insert) eshell-mode-map
     "C-d" 'kill-this-buffer))