diff --git a/+mail.el b/+mail.el
new file mode 100644
index 0000000..481f3d7
--- /dev/null
+++ b/+mail.el
@@ -0,0 +1,43 @@
+;;; +mail.el -*- lexical-binding: t; -*-
+;; Mu4e configuration
+;;
+;; Set up the default email identity
+(setq user-full-name "Amin Kasrou Aouam")
+;; Use msmtp to send email
+(setq sendmail-program (executable-find "msmtp")
+      send-mail-function #'smtpmail-send-it
+      message-sendmail-f-is-evil t
+      message-sendmail-extra-arguments '("--read-envelope-from")
+      message-send-mail-function #'message-send-mail-with-sendmail)
+;; Account configuration
+(set-email-account! "gmail"
+                    '((mu4e-sent-folder       . "/gmail/sent")
+                      (mu4e-drafts-folder     . "/gmail/drafts")
+                      (mu4e-trash-folder      . "/gmail/trash")
+                      (mu4e-refile-folder     . "/gmail/archive")
+                      (smtpmail-smtp-user     . "akasroua@gmail.com")
+                      (user-mail-address      . "akasroua@gmail.com"))
+                    t)
+(set-email-account! "ugent"
+                    '((mu4e-sent-folder       . "/ugent/sent")
+                      (mu4e-drafts-folder     . "/ugent/drafts")
+                      (mu4e-trash-folder      . "/ugent/trash")
+                      (mu4e-refile-folder     . "/ugent/archive")
+                      (smtpmail-smtp-user     . "amin.kasrouaouam@ugent.be")
+                      (user-mail-address      . "amin.kasrouaouam@ugent.be"))
+                    t)
+(set-email-account! "disroot"
+                    '((mu4e-sent-folder       . "/disroot/sent")
+                      (mu4e-drafts-folder     . "/disroot/drafts")
+                      (mu4e-trash-folder      . "/disroot/trash")
+                      (mu4e-refile-folder     . "/disroot/archive")
+                      (smtpmail-smtp-user     . "akasroua@disroot.org")
+                      (user-mail-address      . "akasroua@disroot.org"))
+                    t)
+;; Configure mu4e contexts
+(setq mu4e-context-policy 'ask-if-none
+      mu4e-compose-context-policy 'ask-if-none)
+;; Run lazy check when syncing
+(setq mu4e-index-lazy-check t)
+;; Use ISO dates
+(setq mu4e-headers-date-format "%Y-%m-%d %H:%M")
diff --git a/config.el b/config.el
index 023fa62..bd317bc 100644
--- a/config.el
+++ b/config.el
@@ -125,3 +125,5 @@
    magit-delta-default-light-theme "OneHalfLight")
   :config
   (magit-delta-mode))
+;; Set up the mail stack
+(after! mu4e (load! "+mail"))
diff --git a/init.el b/init.el
index 340cd69..a5c4891 100644
--- a/init.el
+++ b/init.el
@@ -182,7 +182,7 @@
 
 
        :email
-       ;;(mu4e +org +gmail)
+       (mu4e +org +gmail)
        ;;notmuch
        ;;(wanderlust +gmail)