diff --git a/init.el b/init.el
index 9a13ee1..2b26053 100644
--- a/init.el
+++ b/init.el
@@ -247,7 +247,10 @@
   (("C-c m" . mu4e)
    :map mu4e-view-mode-map
    ("o n" . mu4e-org-store-and-capture))
-  :hook ((mu4e-main-mode mu4e-headers-mode) . (lambda () (visual-line-mode -1)))
+  :hook (((mu4e-main-mode mu4e-headers-mode) . (lambda () (visual-line-mode -1)))
+         ((mu4e-view-mode) . (lambda ()
+                               (setq fill-column 120)
+                               (olivetti-mode +1))))
   :init
   (setq mail-user-agent 'mu4e-user-agent
         read-mail-command 'mu4e)
@@ -677,7 +680,7 @@
   (org-journal-file-type 'yearly)
   (org-journal-file-format "journal-%Y.org")
   (org-journal-date-format "%A, %F")
-  (org-journal-encrypt-journal t)
+  (org-journal-encrypt-journal nil)
   (org-journal-carryover-items nil))
 
 (use-package org-clock