diff --git a/.mbsyncrc b/.mbsyncrc
index b389ddd..79d54ec 100644
--- a/.mbsyncrc
+++ b/.mbsyncrc
@@ -4,6 +4,8 @@ User username@gmail.com
 PassCmd "gpg2 -q --for-your-eyes-only --no-tty -d ~/.mailpass.gpg"
 SSLType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
+Timeout 30
+#Timeout 0 <-- use on first sync
 
 # Remote store
 IMAPStore gmail-remote
@@ -18,7 +20,7 @@ Inbox ~/mbsync/inbox
 
 Channel gmail-default
 Master :gmail-remote:
-Slave :gmail-local:inbox
+Slave :gmail-local:
 Patterns INBOX
 
 Channel gmail-sent
@@ -29,6 +31,14 @@ Channel gmail-starred
 Master :gmail-remote:"[Gmail]/Starred"
 Slave :gmail-local:starred
 
+Channel gmail-drafts
+Master :gmail-remote:"[Gmail]/Drafts"
+Slave :gmail-local:drafts
+
+Channel gmail-trash
+Master :gmail-remote:"[Gmail]/Trash"
+Slave :gmail-local:trash
+
 Create slave
 SyncState *
 
@@ -36,3 +46,5 @@ Group gmail
 Channel gmail-default
 Channel gmail-sent
 Channel gmail-starred
+Channel gmail-drafts
+Channel gmail-trash
diff --git a/config.org b/config.org
index 6586c48..77ce8a8 100644
--- a/config.org
+++ b/config.org
@@ -555,3 +555,25 @@ great for git-gutter
           )
     )
 #+END_SRC
+* mu4e
+#+BEGIN_SRC emacs-lisp
+  (add-to-list 'load-path "/usr/share/emacs/site-lisp/mu4e")
+  (use-package mu4e
+    :config
+    (setq mu4e-maildir (expand-file-name "~/mbsync"))
+    (setq mu4e-sent-folder "/sent")
+    (setq mu4e-drafts-folder "/drafts")
+    (setq mu4e-trash-folder "/trash")
+
+    ;;GMail/IMAP takes care of this
+    (setq mu4e-sent-messages-behavior 'delete)
+    (setq mu4e-get-mail-command "mbsync -q gmail")
+    (setq mu4e-update-interval 120)
+    (setq mu4e-maildir-shortcuts
+    '(("/INBOX" . ?i)
+      ("/sent" . ?s)))
+    (setq mu4e-view-show-images t)
+    (setq mu4e-use-fancy-chars t)
+    (setq mu4e-view-show-addresses t)
+    )
+#+END_SRC