diff --git a/config.el b/config.el
index 6303f12..c3df711 100644
--- a/config.el
+++ b/config.el
@@ -257,6 +257,43 @@
     (mu4e-compose-signature . "---"))
   t)
 
+(after! mu4e
+  (setq
+    mu4e-index-cleanup t
+    mu4e-index-lazy-check nil
+    mu4e-show-images t
+    message-kill-buffer-on-exit t)
+  (setq mu4e-bookmarks nil)
+
+  ;; spam
+  (mu4e-bookmark-define
+   "maildir:/matt@emenel.ca/Spam"
+   "Spam mail"
+   ?S)
+
+  ;; sent
+  (mu4e-bookmark-define
+   "maildir:/matt@emenel.ca/Sent"
+   "Sent mail"
+   ?s)
+
+  ;; unread
+  (mu4e-bookmark-define
+   (concat "flag:unread"
+           " and not maildir:/matt@emenel.ca/Spam"
+           " and not maildir:/matt@emenel.ca/Trash")
+   "All Unread"
+   ?u)
+
+  ;; inboxes
+  (mu4e-bookmark-define
+   "maildir:/matt@emenel.ca/Inbox"
+   "All Inboxes"
+   ?i)
+
+  (add-hook! mu4e-compose-mode
+    (ws-butler-mode -1)))
+
 ;; (after! mu4e
 ;;   (add-to-list 'mu4e-bookmarks
 ;;   '( :name  "Inbox"
diff --git a/modules/editor/meow/config.el b/modules/editor/meow/config.el
index 2e738f3..879176a 100644
--- a/modules/editor/meow/config.el
+++ b/modules/editor/meow/config.el
@@ -21,8 +21,8 @@
 (defun meow--eval-sexp ()
   (interactive)
   (cond ((derived-mode-p 'lisp-mode) (sly-eval-defun))
-      	((derived-mode-p 'sclang-mode) (sclang-eval-region-or-line)))
-  	(t (eros-eval-defun nil)))
+    	((derived-mode-p 'sclang-mode) (sclang-eval-region-or-line))
+	(t (eros-eval-defun nil))))
 
 (defun meow--post-isearch-function ()
   (unless isearch-mode-end-hook-quit
@@ -47,6 +47,9 @@
   (map! :map meow-beacon-state-keymap
         doom-leader-key nil)
   (meow/setup-leader)
+  (setq meow-tree-sitter-queries-dir "~/Source/_src/meow-tree-sitter/queries/")
+  (meow-tree-sitter-register-defaults)
   (pushnew! meow-mode-state-list '(sly-db-mode . motion))
-  (pushnew! meow-mode-state-list '(sly-inspector-mode . motion)))
+  (pushnew! meow-mode-state-list '(sly-inspector-mode . motion))
+  (pushnew! meow-mode-state-list '(mu4e-main-mode . insert)))
 ;; (pushnew! meow-mode-state-list '(custom-mode . motion)))
diff --git a/packages.el b/packages.el
index eac27a7..cd17843 100644
--- a/packages.el
+++ b/packages.el
@@ -28,6 +28,9 @@
            :host github
            :repo "accelbread/meow-vterm"))
 
+(package! meow-tree-sitter
+  :recipe (:local-repo "~/Source/_src/meow-tree-sitter/"))
+
 (package! kbd-mode
   :recipe (:type git
            :host github