 ;;; mu4e-conf.el -- Settings for mu4e.
-(eval-when-compile
-  (require 'smtpmail)
-  (require 'mu4e))
-
-;; Dependencies:
+;;
+;;; Commentary:
+;;
+;;; Code:
+(require 'smtpmail)
+(require 'mu4e)
 (require 'org-mu4e)
 (require 'mu4e-query-fragments)
-(require 'smtpmail-async)
 
 ;; Functions:
 (defun pjones:mu4e-match-func-devalot (msg)

;; General Settings:
(custom-set-variables
  '(mail-user-agent 'mu4e-user-agent)
  '(message-send-mail-function 'async-smtpmail-send-it)
  '(message-kill-buffer-on-exit t)
  '(smtpmail-queue-dir "~/mail/queue/cur")

  '(mu4e-maildir "~/mail")
  '(mu4e-mu-home "~/.cache/mu")

                 (mu4e-trash-folder           . "/rfa/Deleted Items")
                 (mu4e-refile-folder          . "/rfa/Archive")
                 (mu4e-compose-signature      . ,(pjones:mu4e-read-signature "scors"))
                 (smtpmail-queue-dir          . "~/mail/queue/rfa/cur")
                 (smtpmail-smtp-server        . "outlook.office365.com")
                 (smtpmail-smtp-service       . 587)
                 (smtpmail-stream-type        . starttls)
