diff --git a/configuration.org b/configuration.org
index 4e38626..04e64b6 100644
--- a/configuration.org
+++ b/configuration.org
@@ -2107,32 +2107,6 @@ This will be replaced with something self-hosted, eventually.
    ("C-f" . keyfreq-show)))
 #+END_SRC
 
-** Mailing with Wanderlust
-
-#+BEGIN_SRC emacs-lisp
-(use-package wanderlust
-  :no-require t
-  :init
-  (require 'wl)
-  (setq elmo-maildir-folder-path (expand-file-name "mail" (or (getenv "XDG_CACHE_HOME") "~/.cache"))
-        wl-folders-file (expand-file-name
-                         (convert-standard-filename "wl-folders")
-                         user-emacs-directory))
-  :config
-  (when (boundp 'mail-user-agent)
-    (setq mail-user-agent 'wl-user-agent))
-  (when (fboundp 'define-mail-user-agent)
-    (define-mail-user-agent
-      'wl-user-agent
-      'wl-user-agent-compose
-      'wl-draft-send
-      'wl-draft-kill
-      'mail-send-hook))
-  :bind
-  (:map gpolonkai/pers-map
-   ("m" . wl)))
-#+END_SRC
-
 ** EditorConfig
 
 [[http://editorconfig.org/][EditorConfig]] is a nice tool to unify, well, configuration of different editors.
@@ -2192,6 +2166,50 @@ Then configure ~real-auto-save-mode~
   :commands pacfiles)
 #+END_SRC
 
+** Mailing with mu4e
+
+#+BEGIN_SRC emacs-lisp
+(use-package mu4e
+  :ensure nil
+  :config
+  (setq mu4e-contexts
+        `( ,(make-mu4e-context
+             :name "Private"
+             :enter-func (lambda () (mu4e-message "Entering Private Context"))
+             :leave-func (lambda () (mu4e-message "Leaving Private Context"))
+             :match-func (lambda (msg)
+                           (when msg
+                             (mu4e-message-contact-field-matches msg
+                               :to "gergely@polonkai.eu")))
+             :vars '((user-mail-address . "gergely@polonkai.eu")
+                     (mu4e-maildir . "~/.cache/mail/Polonkai")
+                     (mu4e-sent-folder . "/[Gmail].Sendur p&APM-stur")
+                     (mu4e-drafts-folder . "/[Gmail].Dr&APY-g")
+                     (mu4e-trash-folder . "/[Gmail].Rusl")
+                     (mu4e-refile-folder . "/[Gmail].Dr&APY-g")))
+           ,(make-mu4e-context
+             :name "GT2"
+             :enter-func (lambda () (mu4e-message "Entering GT2 Context"))
+             :leave-func (lambda () (mu4e-message "Leaving GT2 Context"))
+             :match-func (lambda (msg)
+                           (when msg
+                             (or
+                              (mu4e-message-contact-field-matches msg
+                                :to "gergo@gt2.io")
+                              (mu4e-message-contact-field-matches msg
+                                                                  :to "gergo@benchmarked.games"))))
+             :vars '((user-mail-address . "gergo@benchmarked.games")
+                     (mu4e-maildir . "~/.cache/mail/GT2")
+                     (mu4e-sent-folder . "/[Gmail].Sent Mail")
+                     (mu4e-drafts-folder . "/[Gmail].Drafts")
+                     (mu4e-trash-folder . "/[Gmail].Trash")
+                     (mu4e-refile-folder . "/[Gmail].Drafts"))))
+        mu4e-context-policy 'pick-first)
+  :bind
+  (:map gpolonkai/pers-map
+   ("m" . mu4e)))
+#+END_SRC
+
 * Make programming a bit easier
 
 ** Electric case
diff --git a/customizations.el b/customizations.el
index 894d64c..1636c26 100644
--- a/customizations.el
+++ b/customizations.el
@@ -133,6 +133,7 @@
      mediawiki
      meson-mode
      minions
+     mu4e
      multiple-cursors
      neotree
      ng2-mode
@@ -179,7 +180,6 @@
      vala-mode
      vala-snippets
      wakatime-mode
-     wanderlust
      web-mode
      with-editor
      xlicense
diff --git a/wl-folders b/wl-folders
deleted file mode 100644
index 1c9f2c6..0000000
--- a/wl-folders
+++ /dev/null
@@ -1,2 +0,0 @@
-.Polonkai/INBOX  "Personal Inbox"
-.GT2/INBOX       "GT2 Inbox"
\ No newline at end of file