diff --git a/configuration.org b/configuration.org
index 4ca7b07..b4a4dc3 100644
--- a/configuration.org
+++ b/configuration.org
@@ -2068,6 +2068,33 @@ 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)
+  :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))
+  (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))
+  :bind
+  (:map gpolonkai/pers-map
+   ("m" . "wl")))
+#+END_SRC
+
 * Make programming a bit easier
 
 ** Electric case
@@ -2947,7 +2974,7 @@ directory.  It is available from [[http://plantuml.com/download][here]].
  ("<C-return>" . isearch-exit-other-end)
  ("<S-return>" . isearch-exit-mark-match)
  :map gpolonkai/pers-map
- ("m" . hidden-mode-line-mode)
+ ("h" . hidden-mode-line-mode)
  ("C-i e" . "gergely@polonkai.eu")
  ("C-i w" . "http://gergely.polonkai.eu/")
  ("C-p" . package-list-packages)
diff --git a/customizations.el b/customizations.el
index 421520a..3d8720f 100644
--- a/customizations.el
+++ b/customizations.el
@@ -23,6 +23,7 @@
  '(inhibit-startup-echo-area-message (user-login-name))
  '(inhibit-startup-screen t)
  '(initial-scratch-message nil)
+ '(message-sendmail-envelope-from (quote header))
  '(minibuffer-prompt-properties
    (quote
     (read-only t cursor-intangible t face minibuffer-prompt)))
@@ -176,6 +177,7 @@
      vala-mode
      vala-snippets
      wakatime-mode
+     wanderlust
      web-mode
      with-editor
      xlicense
@@ -187,11 +189,13 @@
  '(safe-local-variable-values (quote ((bug-reference-bug-regexp . "#\\(?2:[0-9]+\\)"))))
  '(scroll-margin 2)
  '(send-mail-function (quote sendmail-send-it))
+ '(sendmail-program "/usr/bin/msmtp")
  '(sgml-basic-offset 4)
  '(show-trailing-whitespace t)
  '(suggest-key-bindings nil)
  '(tab-width 4)
- '(user-mail-address "gergely@polonkai.eu"))
+ '(user-mail-address "gergely@polonkai.eu")
+ '(wl-draft-send-mail-function (quote wl-draft-send-mail-with-sendmail)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/wl-folders b/wl-folders
new file mode 100644
index 0000000..1c9f2c6
--- /dev/null
+++ b/wl-folders
@@ -0,0 +1,2 @@
+.Polonkai/INBOX  "Personal Inbox"
+.GT2/INBOX       "GT2 Inbox"
\ No newline at end of file