@@ -1228,12 +1228,8 @@ mu4e-update-interval 1800
                     mu4e-index-cleanup nil
                     mu4e-index-lazy-check t
 
-                    mu4e-mu-home (expand-file-name "~/.cache/mu/alanpearce.eu")
-                    mu4e-maildir (expand-file-name "~/mail/personal/alanpearce/")
-                    mu4e-sent-folder "/Sent"
-                    mu4e-drafts-folder "/Drafts"
-                    mu4e-refile-folder "/Archive"
-                    mu4e-trash-folder "/Trash"
+                    mu4e-maildir (expand-file-name "~/mail")
+                    mu4e-mu-home (expand-file-name "~/.cache/mu")
 
                     mu4e-change-filenames-when-moving t
 
@@ -1242,7 +1238,8 @@ mu4e-compose-format-flowed t
                     message-send-mail-function #'message-send-mail-with-sendmail
                     sendmail-program "msmtp"
 
-                    mu4e-maildir-shortcuts '(("/INBOX" . ?i))
+                    mu4e-get-mail-command "mbsync -a"
+
                     mu4e-contexts
                     (list
                      (make-mu4e-context
@@ -1252,14 +1249,11 @@ (when msg
                                       (mu4e-message-contact-field-matches
                                        msg :to "alan@alanpearce\..*")))
                       :vars `((user-mail-address . "alan@alanpearce.eu")
-                              (mu4e-maildir . ,(expand-file-name "~/mail/personal/alanpearce"))
-                              (mu4e-mu-home . ,(expand-file-name "~/.cache/mu/alanpearce.eu"))
                               (mu4e-sent-messages-behavior . sent)
-                              (mu4e-get-mail-command . "mbsync personal")
-                              (mu4e-sent-folder . "/Sent")
-                              (mu4e-drafts-folder . "/Drafts")
-                              (mu4e-refile-folder . "/Archive")
-                              (mu4e-trash-folder . "/Trash")))
+                              (mu4e-sent-folder . "/personal/alanpearce/Sent")
+                              (mu4e-drafts-folder . "/personal/alanpearce/Drafts")
+                              (mu4e-refile-folder . "/personal/alanpearce/Archive")
+                              (mu4e-trash-folder . "/personal/alanpearce/Trash")
                      (make-mu4e-context
                       :name "Riseup"
                       :match-func (lambda (msg)
@@ -1267,14 +1261,11 @@ (when msg
                                       (mu4e-message-contact-field-matches
                                        msg :to "alanpearce@riseup.net")))
                       :vars `((user-mail-address . "alanpearce@riseup.net")
-                              (mu4e-maildir . ,(expand-file-name "~/mail/personal/riseup"))
-                              (mu4e-mu-home . ,(expand-file-name "~/.cache/mu/riseup.net"))
                               (mu4e-sent-messages-behavior . sent)
-                              (mu4e-get-mail-command . "mbsync riseup")
-                              (mu4e-sent-folder . "/Sent")
-                              (mu4e-drafts-folder . "/Drafts")
-                              (mu4e-refile-folder . "/Archive")
-                              (mu4e-trash-folder . "/Trash")))
+                              (mu4e-sent-folder . "/riseup/Sent")
+                              (mu4e-drafts-folder . "/riseup/Drafts")
+                              (mu4e-refile-folder . "/riseup/Archive")
+                              (mu4e-trash-folder . "/riseup/Trash")
                      (make-mu4e-context
                       :name "Satoshipay"
                       :match-func (lambda (msg)
@@ -1282,14 +1273,11 @@ (when msg
                                       (mu4e-message-contact-field-matches
                                        msg :to "alan@satoshipay.io")))
                       :vars `((user-mail-address . "alan@satoshipay.io")
-                              (mu4e-maildir . ,(expand-file-name "~/mail/satoshipay"))
-                              (mu4e-mu-home . ,(expand-file-name "~/.cache/mu/satoshipay.io"))
                               (mu4e-sent-messages-behavior . sent)
-                              (mu4e-get-mail-command . "mbsync satoshipay")
-                              (mu4e-drafts-folder . "/[Gmail]/.Drafts")
-                              (mu4e-sent-folder .   "/[Gmail]/.Sent Mail")
-                              (mu4e-refile-folder . "/[Gmail]/.All Mail")
-                              (mu4e-trash-folder .  "/[Gmail]/.Bin"))))
+                              (mu4e-drafts-folder . "/satoshipay/[Gmail]/.Drafts")
+                              (mu4e-sent-folder .   "/satoshipay/[Gmail]/.Sent Mail")
+                              (mu4e-refile-folder . "/satoshipay/[Gmail]/.All Mail")
+                              (mu4e-trash-folder .  "/satoshipay/[Gmail]/.Bin")
                     mu4e-user-mail-address-list (append
                                                  (delq nil
                                                        (mapcar (lambda (context)