diff --git a/README.org b/README.org
index 731923f..eea6c46 100644
--- a/README.org
+++ b/README.org
@@ -198,11 +198,9 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
 
   (add-hook 'prog-mode-hook #'(lambda () (display-line-numbers-mode +1)))
 
-  (use-package word-wrap-mode
-    :ensure t
-    :diminish
-    :init
-    (global-word-wrap-whitespace-mode +1))
+  (with-eval-after-load 'diminish
+    (diminish 'visual-line-mode))
+  (global-visual-line-mode +1)
 
   (use-package which-key
     :ensure t
@@ -389,8 +387,8 @@ Loading this file is handled automatically on my [[https://git.xenia.me.uk/xenia
     :ensure t
     :diminish
     :init
-    (add-hook 'magit-pre-refresh-hook 'diff-hl-magit-pre-refresh)
-    (add-hook 'magit-post-refresh-hook 'diff-hl-magit-post-refresh)
+    (add-hook 'magit-pre-refresh-hook #'diff-hl-magit-pre-refresh)
+    (add-hook 'magit-post-refresh-hook #'diff-hl-magit-post-refresh)
     :config
     (global-diff-hl-mode)
     :custom
@@ -1043,7 +1041,8 @@ Set fill column to 88 and enable display in python buffers
      :map mu4e-view-mode-map
      ("o n" . mu4e-org-store-and-capture))
     :custom
-    (add-hook 'mu4e-compose-mode-hook #'(lambda () (auto-save-mode -1))) ; Don't auto-save to drafts
+    (add-hook 'mu4e-compose-mode-hook (lambda () (auto-save-mode -1))) ; Don't auto-save to drafts
+    (add-hook 'mu4e-headers-mode-hook (lambda () (visual-line-mode -1))) ; Disable visual-line / word wrapping in mu4e headers
     (mu4e-completing-read-function #'completing-read-default)
     (mu4e-split-view 'vertical)
     (mu4e-attachment-dir "~/Downloads")