diff --git a/emacs/.config/doom/+mail.el b/emacs/.config/doom/+mail.el
index 246f058..e4cdd55 100644
--- a/emacs/.config/doom/+mail.el
+++ b/emacs/.config/doom/+mail.el
@@ -20,35 +20,7 @@
   (map!
    (:leader
      (:prefix "o"
-       (:desc "APP: Email" "e" #'=mail))))
-  :config
-  (setq notmuch-fcc-dirs '((".*onec.me" . "colin@onec.me/Sent")
-                           (".*15five.com" . "colin.powell@15five.com/Sent")))
-        notmuch-show-logo nil
-        notmuch-message-headers-visible nil
-        message-kill-buffer-on-exit t
-        message-send-mail-function 'message-send-mail-with-sendmail
-        mail-specify-envelope-from t
-        message-sendmail-envelope-from 'header
-        mail-envelope-from 'header
-        notmuch-search-oldest-first nil
-        send-mail-function 'sendmail-send-it
-        ;; sendmail-program "/usr/local/bin/msmtp"
-        notmuch-search-result-format '(("date" . "%12s ")
-                                       ("count" . "%-7s ")
-                                       ("authors" . "%-30s ")
-                                       ("subject" . "%-100s ")
-                                       ("tags" . "(%s)"))
-        notmuch-tag-formats '(("unread"
-                               (propertize tag 'face 'notmuch-tag-unread)))
-        notmuch-hello-sections '(notmuch-hello-insert-saved-searches
-                                 notmuch-hello-insert-alltags)
-        notmuch-saved-searches '(
-                                 (:name "inbox"   :query "tag:inbox not tag:deleted"                            :key "i")
-                                 (:name "sent"    :query "tag:sent"                                           :key "s")
-                                 (:name "archived":query "tag:archived"                                       :key "a")
-                                 (:name "drafts"  :query "tag:draft"                                          :key "d"))
-        notmuch-archive-tags '("-inbox" "-unread" "+archived"))
+       (:desc "APP: Email" "e" #'=mail)))))
   (set-evil-initial-state! '(notmuch-hello-mode
                              notmuch-show-mode
                              notmuch-search-mode
@@ -71,7 +43,6 @@
   (advice-add #'notmuch-hello-insert-saved-searches :override #'+mail/notmuch-hello-insert-saved-searches)
   (advice-add #'notmuch-hello-insert-buttons :override #'+mail/notmuch-hello-insert-buttons)
   ;; (set! :popup "\\*notmuch-hello\\*" '((size . 20) (side . left)) '((quit . t) (modeline . nil)))
-  (set-popup-rule! "\\*offlineimap\\*" :side 'bottom :size 0.4 :quit t)
   (push (lambda (buf) (string-match-p "^\\*notmuch" (buffer-name buf)))
         doom-real-buffer-functions)
 
@@ -151,7 +122,7 @@
             :desc "Send and Exit"       doom-localleader-key #'notmuch-mua-send-and-exit
             :desc "Kill Message Buffer" "k" #'notmuch-mua-kill-buffer
             :desc "Save as Draft"       "s" #'message-dont-send
-            :desc "Attach file"         "f" #'mml-attach-file))))
+            :desc "Attach file"         "f" #'mml-attach-file)))
 
 ; Use w3m to parse HTML email
 (setq mm-text-html-renderer 'w3m)
@@ -467,17 +438,6 @@ with `notmuch-hello-query-counts'."
       (widget-insert "\n"))))
 
 
-(defun +notmuch-exec-offlineimap ()
-  "Execute offlineimap"
-  (interactive)
-  (set-process-sentinel
-   (start-process-shell-command "offlineimap"
-                                "*offlineimap*"
-                                "offlineimap -o")
-   '(lambda (process event)
-      (notmuch-refresh-all-buffers)
-      (message "Done!"))))
-
 ; Kill email message buffers when you close them
 (setq message-kill-buffer-on-exit t)
 (setq message-default-mail-headers "Cc: \nBcc: \n")