diff --git a/config-ext.org b/config-ext.org
index 99eecee..15b8d24 100644
--- a/config-ext.org
+++ b/config-ext.org
@@ -191,254 +191,6 @@
   (setq auth-source-debug t)
   (setq auth-sources '((:source "~/.emacs.d/secrets/.authinfo.gpg")))
 #+end_src
-** email
-#+begin_src emacs-lisp
-  (setq user-mail-address "bensonchu457@gmail.com"
-        user-full-name "Benson Chu")
-
-  (setq smtpmail-smtp-server "smtp.gmail.com"
-        smtpmail-smtp-service 587
-        send-mail-function 'smtpmail-send-it
-        message-send-mail-function 'smtpmail-send-it)
-
-  (mailcap-add "text/html" "/usr/bin/xdg-open %s ")
-
-  (setq mail-specify-envelope-from t
-        message-sendmail-envelope-from 'header
-        mail-envelope-from 'header)
-
-  (use-package notmuch
-    :commands notmuch
-    :bind (:map notmuch-message-mode-map
-                ("C-c C-c" . #'my/choose-email-address-and-send)
-                :map notmuch-search-mode-map
-                ("z" . #'notmuch-search-tree-current-thread)
-                ("A" . #'notmuch-search-show-all)
-                ("D" . #'notmuch-search-delete-all)
-                ("f" . #'notmuch-search-filter-for-domain)
-                ("F" . #'notmuch-search-filter-for-sender)
-                ("d" . #'my/notmuch-search-delete-mail)
-                ("<mouse-1>" . nil)
-                :map notmuch-tree-mode-map
-                ("<tab>" . #'notmuch-tree-explore-here)
-                ("<down>" . #'notmuch-tree-next-message)
-                ("<up>" . #'notmuch-tree-prev-message)
-                ("U" . #'notmuch-tree-unfold-all)
-                ("u" . #'notmuch-tree-up-thread)
-                ("N" . #'notmuch-tree-next-sibling)
-                ("P" . #'notmuch-tree-prev-sibling)
-                ("t" . #'notmuch-tree-toggle-folding-thread)
-                ("/" . #'notmuch-tree-undo-read)
-                ("F" . #'notmuch-tree-focus)
-                ("S-SPC" . #'notmuch-tree-scroll-message-window-back))
-    :config
-    (require 'notmuch-nav)
-    (require 'notmuch-tree-hide)
-    (require 'notmuch-tree)
-    ;; (require 'notmuch-fold)
-
-    (defun my/notmuch-search-delete-mail ()
-      (interactive)
-      (cond ((string-match-p "tag:inbox" notmuch-search-query-string)
-             (notmuch-search-add-tag '("-inbox" "+archive")))
-            (t
-             (user-error "Haven't designated a tag for deleting mail in this folder")))
-      (next-line))
-
-    (setq notmuch-draft-tags '("+draft"))
-
-    (custom-set-faces
-     '(notmuch-tree-match-tree-face ((t (:family "Source Code Pro"))) t)
-     '(notmuch-tree-no-match-tree-face ((t (:family "Source Code Pro"))) t))
-    (set-face-attribute 'notmuch-search-unread-face nil :foreground "white")
-    (set-face-attribute 'notmuch-message-summary-face nil :background "steel blue" :foreground "snow")
-    (add-to-list 'notmuch-search-line-faces
-                 '("deleted" . font-lock-comment-face))
-
-    (defun notmuch-search-show-all ()
-      (interactive)
-      (let* ((query (replace-regexp-in-string "date:[^ ]+" "" notmuch-search-query-string))
-             (noand (replace-regexp-in-string "^ *and +" "" query))
-             (noand2 (replace-regexp-in-string " +and *" "" query)))
-        (notmuch-search noand2)))
-
-    (defun notmuch-search-tree-current-thread (arg)
-      (interactive "P")
-      (let* ((thread-id (notmuch-search-find-thread-id))
-             (input (notmuch-read-query (concat "Notmuch tree: " thread-id " and "))))
-        (notmuch-tree thread-id (unless (zerop (length input)) input) nil nil nil nil nil (unless arg #'notmuch-tree-hide-dead-trees))))
-
-    (defun notmuch-tree-focus (arg)
-      (interactive "P")
-      (notmuch-tree notmuch-tree-basic-query (notmuch-tree-get-message-id) nil nil nil nil nil (if (not arg) #'notmuch-tree-hide-dead-trees #'notmuch-tree-show-trail-and-alive-children)))
-
-    (defun notmuch-tree-undo-read (arg)
-      (interactive "P")
-      (if arg
-          (save-excursion
-            (beginning-of-buffer)
-            (while (text-property-search-forward
-                    'face 'notmuch-tag-deleted
-                    #'(lambda (value prop)
-                        (if (consp prop)
-                            (member value prop)
-                          (eq value prop))))
-              (notmuch-tree-add-tag '("+unread"))))
-        (notmuch-tree-add-tag '("+unread"))
-        (next-line)))
-
-    (setq notmuch-search-oldest-first nil
-          notmuch-saved-searches
-          '((:name "inbox" :query "tag:inbox" :key "i")
-            (:name "inbox today" :query "date:2020-07-25.. and tag:inbox" :key "t")
-            (:name "work" :query "tag:work" :key "w")
-            (:name "mailing lists" :query "tag:lists" :key "m")
-            (:name "emacs-devel" :query "tag:lists/emacs-devel and date:6M.." :key "e" :sort-order newest-first)
-            (:name "emacs bugs" :query "tag:lists/bug-gnu-emacs and date:30d.." :key "E")
-            (:name "emacs help" :query "tag:lists/help-gnu-emacs and date:30d.." :key "h")
-            (:name "org-mode" :query "tag:lists/emacs-orgmode and date:6M.." :key "o" :sort-order newest-first)
-            (:name "unread" :query "tag:unread" :key "u")
-            (:name "flagged" :query "tag:flagged" :key "f")
-            (:name "cs" :query "tag:cs" :key "c")
-            (:name "receipts" :query "tag:receipts" :key "R")
-            (:name "tracking" :query "tag:tracking" :key "T")
-            (:name "voicemail" :query "from:vm@italkbb.com" :key "v")
-            ;; (:name "sent" :query "tag:sent" :key "s")
-            ;; (:name "drafts" :query "tag:draft" :key "d")
-            (:name "all mail" :query "*" :key "a")))
-
-    (defun my/choose-email-address-and-send ()
-      (interactive)
-      (let ((resp (completing-read "Which email? " '("bchu3@cougarnet.uh.edu" "bensonchu457@gmail.com") nil t "^")))
-        (setq smtpmail-smtp-server
-              (if (string= resp "bensonchu457@gmail.com")
-                  "smtp.gmail.com"
-                "smtp.office365.com"))
-        (notmuch-mua-send-and-exit)))
-
-    (add-to-list 'notmuch-tagging-keys
-                 '("R" ("-inbox" "+recruiting") "Recruiting"))
-
-    (setf (cdr (assoc "d" notmuch-tagging-keys))
-          '(("+deleted") "Delete"))
-
-    (advice-add #'notmuch-tag-jump :after #'(lambda (&rest args) (next-line)))
-
-    (defun notmuch-search-filter-for-domain ()
-      (interactive)
-      (notmuch-search-show-thread)
-      (let* ((author (notmuch-show-get-from)))
-        (notmuch-bury-or-kill-this-buffer)
-        (string-match (rx (and (group (+ (not (any "." "@" "<")))
-                                      "."
-                                      (+ (not (any "." "@" "<" ">"))))
-                               (or ">" eol)))
-                      author)
-        (notmuch-search-filter (format "from:%s" (match-string 1 author)))))
-
-    (defun notmuch-search-filter-for-sender ()
-      (interactive)
-      (notmuch-search-show-thread)
-      (let ((author (notmuch-show-get-from)))
-        (notmuch-bury-or-kill-this-buffer)
-        (notmuch-search-filter (format "from:%s" author))))
-
-    (defun notmuch-search-delete-all ()
-      (interactive)
-      (let ((line-count (save-excursion (end-of-buffer) (line-number-at-pos (point)))))
-        (when (or (< line-count 20)
-                  (y-or-n-p "Are you sure? There seems to be a lot of emails... "))
-          (notmuch-search-tag-all '("+deleted")))))
-
-    (defun notmuch-add-child (child-id)
-      (interactive (list (read-string (format "Message id of new child (default: %s): "
-                                              (current-kill 0))
-                                      nil nil (current-kill 0))))
-      (let ((parent-id (notmuch-show-get-message-id t))
-            (child-file
-             (save-window-excursion
-               (notmuch-show (format "id:%s" child-id))
-               (notmuch-show-get-filename))))
-        (with-current-buffer (find-file-noselect child-file)
-          (beginning-of-buffer)
-          (if (save-excursion (re-search-forward "^In-Reply-To: " nil t))
-              (error "File already has reply message")
-            (save-excursion
-              (re-search-forward "^Date: ")
-              (end-of-line)
-              (insert (format "\nIn-Reply-To: <%s>"
-                              parent-id))
-              (save-buffer)))
-          (re-search-forward "^Message-ID: <\\(.*\\)>$")
-          (message (match-string 1)))
-        (notmuch-refresh-file child-id)))
-
-    (defun notmuch-refresh-file (id)
-      (interactive (list (read-string "Which id? ")))
-      (let ((thread-id
-             (replace-regexp-in-string
-              "\\n" ""
-              (shell-command-to-string
-               (format "notmuch search --output=threads id:%s" id)))))
-        (shell-command (format "notmuch reindex %s" thread-id)))
-      (shell-command (format "notmuch reindex id:%s" id)))
-
-    (defun notmuch-show-goto-file ()
-      (interactive)
-      (find-file (notmuch-show-get-filename))))
-
-  (use-exwm
-   :config
-   ;; (defvar offlineimap-timer nil)
-   ;; (defvar offlineimap-process nil)
-
-   ;; (defun run-offlineimap ()
-   ;;   (interactive)
-   ;;   (if (and (processp offlineimap-process)
-   ;;            (process-live-p offlineimap-process))
-   ;;       (message "offlineimap already running...")
-   ;;     (message "offlineimap starting...")
-   ;;     (when (and (timerp offlineimap-timer)
-   ;;                (not (timer--triggered offlineimap-timer)))
-   ;;       (cancel-timer offlineimap-timer))
-   ;;     (call-process-shell-command "timedatectl" nil "*offlineimap-output*")
-   ;;     (set-process-sentinel
-   ;;      (setq offlineimap-process
-   ;;            (start-process-shell-command "offlineimap" "*offlineimap-output*" "offlineimap"))
-   ;;      #'(lambda (process event)
-   ;;          (when (string-match-p "exited abnormally with code 1" event)
-   ;;            (with-current-buffer (process-buffer offlineimap-process)
-   ;;              (when (string-match-p "get_password_emacs"(buffer-string))
-   ;;                (erase-buffer)
-   ;;                (message "Oops, didn't grab a password. ")
-   ;;                (setq offlineimap-timer (run-with-timer 300 nil #'run-offlineimap)))))
-   ;;          (when (string-match-p "^finished" event)
-   ;;            (message "Offlineimap finished")
-   ;;            (setq offlineimap-timer (run-with-timer 300 nil #'run-offlineimap)))))))
-
-   ;; (defun stop-offlineimap ()
-   ;;   (interactive)
-   ;;   (when (timerp offlineimap-timer)
-   ;;     (cancel-timer offlineimap-timer))
-   ;;   (when (processp offlineimap-process)
-   ;;     (set-process-sentinel offlineimap-process
-   ;;                           nil)))
-
-   ;; (add-to-list 'exwm-init-hook
-   ;;              #'run-offlineimap
-   ;;              t)
-
-   (defun run-mbsync ()
-     (interactive)
-     (when (not (and (executable-find "afew")
-                     (executable-find "mbsync")
-                     (executable-find "notmuch"))))
-     (start-process-shell-command "mbsync" "*mbsync*"
-                                  (expand-file-name "shell/update-mail.sh"
-                                                    user-emacs-directory)))
-
-   (run-at-time 60 t #'run-mbsync))
-#+end_src
 ** debbugs
 #+begin_src emacs-lisp
   (use-package debbugs)
diff --git a/init.el b/init.el
index 6ddf4bd..f288956 100644
--- a/init.el
+++ b/init.el
@@ -79,6 +79,9 @@
    (expand-file-name "config-programming.org"
                      user-emacs-directory))
 
+  (when (file-exists-p "~/.config/emacs-mail.el")
+    (load-file "~/.config/emacs-mail.el"))
+
   (org-babel-load-file
    (expand-file-name "config-ext.org"
                      user-emacs-directory))
diff --git a/shell/update-mail.sh b/shell/update-mail.sh
deleted file mode 100755
index b74d263..0000000
--- a/shell/update-mail.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-notmuch new
-afew -v -m --all
-notmuch new
-
-mbsync fm
-notmuch new
-afew -v -t --new
-notmuch tag +inbox -archive -- path:fastmail/INBOX/**
diff --git a/submodule/mu b/submodule/mu
deleted file mode 160000
index a2c27c0..0000000
--- a/submodule/mu
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit a2c27c0c5a8baf834d7c71fc2463dfdc305297d4