diff --git a/modules/app/email/config.el b/modules/app/email/config.el
index 0ed9596a5..ebcabf5b2 100644
--- a/modules/app/email/config.el
+++ b/modules/app/email/config.el
@@ -96,16 +96,18 @@
     (add-hook 'mu4e-compose-mode-hook #'flyspell-mode))
 
   ;; Wrap text in messages
-  (add-hook! 'mu4e-view-mode-hook
-    (setq-local truncate-lines nil))
+  (setq-hook! 'mu4e-view-mode-hook truncate-lines nil)
 
   (when (fboundp 'imagemagick-register-types)
     (imagemagick-register-types))
 
-  (after! evil
-    (dolist (mode '(mu4e-main-mode mu4e-view-mode mu4e-headers-mode
-                    mu4e-compose-mode mu4e~update-mail-mode))
-      (evil-set-initial-state mode 'normal))))
+  (set-evil-initial-state!
+    '(mu4e-main-mode
+      mu4e-view-mode
+      mu4e-headers-mode
+      mu4e-compose-mode
+      mu4e~update-mail-mode)
+    'normal))
 
 
 (def-package! mu4e-maildirs-extension