diff --git a/init.el b/init.el
index 22cbc72..3a204ca 100644
--- a/init.el
+++ b/init.el
@@ -74,7 +74,10 @@
 
 (setq backup-directory-alist '(("." . "~/.local/state/emacs/backups")))
 
-(savehist-mode +1)
+(use-package savehist
+  :demand
+  :config
+  (savehist-mode +1))
 
 (use-package dired
   :custom
@@ -715,7 +718,9 @@
   :custom
   (corfu-cycle t)
   (corfu-auto nil)
+  (corfu-preselect 'directory)
   :config
+  (require 'corfu-history)
   (when (require 'nerd-icons-corfu nil :noerror)
     (add-to-list 'corfu-margin-formatters #'nerd-icons-corfu-formatter))
   (when (require 'corfu-popupinfo nil :noerror)
@@ -724,6 +729,12 @@
              (not (display-graphic-p)))
     (corfu-terminal-mode +1)))
 
+(use-package corfu-history
+  :requires (corfu savehist)
+  :functions corfu-history
+  :config
+  (add-to-list 'savehist-additional-variables #'corfu-history))
+
 (use-package corfu-popupinfo
   :requires corfu
   :defines corfu-popupinfo-map
diff --git a/mu4e-custom.el b/mu4e-custom.el
index 3d99ef7..1ae6742 100644
--- a/mu4e-custom.el
+++ b/mu4e-custom.el
@@ -29,6 +29,7 @@
   (mu4e-context-policy 'pick-first)
   (mu4e-compose-context-policy 'ask)
   (mu4e-compose-signature-auto-include nil)
+  (mu4e-compose-complete-only-personal t)
   (mu4e-search-full nil)
   (mu4e-search-include-related t)
   (mu4e-search-threads t)