diff --git a/modules/email/wanderlust/README.org b/modules/email/wanderlust/README.org
index 21f236458..3c9f17333 100644
--- a/modules/email/wanderlust/README.org
+++ b/modules/email/wanderlust/README.org
@@ -15,6 +15,9 @@
 - +gmail ::
   Enable gmail-specific configuration for mail ~To~ or ~From~ a gmail address.
 
+- +xface ::
+  Enable support of [X-Face] powered by [compface].
+
 ** Packages
 - [[doom-package:wanderlust]]
 
@@ -52,3 +55,6 @@
 #+begin_quote
  󱌣 This module has no appendix yet. [[doom-contrib-module:][Write one?]]
 #+end_quote
+
+[X-Face]: https://en.wikipedia.org/wiki/X-Face
+[compface]: http://freecode.com/projects/compface/
diff --git a/modules/email/wanderlust/config.el b/modules/email/wanderlust/config.el
index 23b7bf70a..3175268c3 100644
--- a/modules/email/wanderlust/config.el
+++ b/modules/email/wanderlust/config.el
@@ -20,8 +20,13 @@
         wl-init-file (expand-file-name "wl.el" doom-user-dir)
         wl-folders-file (expand-file-name "folders.wl" doom-user-dir))
 
-  (setq wl-message-truncate-lines t
-        wl-summary-width 120
+  ;; macOS allows file names up to 255 characters,
+  ;; use half of that size as threshold to switch to hashing
+  (setq elmo-msgdb-path-encode-threshold 128)
+
+  (setq wl-message-truncate-lines nil
+        wl-summary-width nil
+        wl-forward-subject-prefix "Fwd: "
         wl-message-ignored-field-list
         '(".*Received:"
           ".*Path:"
@@ -29,6 +34,7 @@
           "^References:"
           "^Replied:"
           "^Errors-To:"
+          "^Mail-.*-To:"
           "^Lines:"
           "^Sender:"
           ".*Host:"
@@ -40,7 +46,14 @@
           "^MIME.*:"
           "^In-Reply-To:"
           "^Content-Transfer-Encoding:"
-          "^List-.*:")
+          "^Content-Disposition:"
+          "^List-.*:"
+          "^Received-SPF:"
+          "^DKIM-.*:"
+          "^SPF-.*:"
+          "^Autocrypt:"
+          "^ARC-.*:"
+          "^Authentication-Results:")
         wl-message-visible-field-list
         '("^Message-Id:"
           "^User-Agent:"
@@ -66,9 +79,18 @@
           wl-draft-folder "%[Gmail]/Drafts"
           wl-trash-folder "%[Gmail]/Trash"
           wl-fcc-force-as-read t
-          wl-default-spec "%"))
+          wl-default-spec "%")
 
-  (setq wl-message-id-domain wl-local-domain)
+    (setq wl-message-id-domain wl-local-domain))
+
+  ;; Use x-face only when compface installed
+  (when (modulep! +xface)
+    (autoload 'x-face-decode-message-header "x-face-e21")
+    (setq wl-highlight-x-face-function 'x-face-decode-message-header))
+
+  ;; Use alert for alerting
+  (when (fboundp 'alert)
+    (setq wl-biff-notify-hook '((lambda () (alert "You have new mail!" :title "Wanderlust")))))
 
   (when (modulep! :editor evil)
     ;; Neither `wl-folder-mode' nor `wl-summary-mode' are correctly defined as
diff --git a/modules/email/wanderlust/packages.el b/modules/email/wanderlust/packages.el
index 4d9a109a9..48203a6bd 100644
--- a/modules/email/wanderlust/packages.el
+++ b/modules/email/wanderlust/packages.el
@@ -5,7 +5,13 @@
 ;;      depends on flim, flim on apel), but they all have non-standard default
 ;;      branches which straight cannot detect without our help.
 (package! apel :recipe (:branch "apel-wl") :pin "82eb2325bd149dc57b43a9ce9402c6c6183e4052")
-(package! flim :recipe (:branch "flim-1_14-wl") :pin "80b8121f05a5a0d7fcfe3e54085467a646dd2028")
-(package! semi :recipe (:branch "semi-1_14-wl") :pin "9370961ddcee78e389e44b36d38c3d93f8351619")
+(package! flim :recipe (:branch "flim-1_14-wl") :pin "abdd2315006eb31476249223569808adb1c0f7b2")
+(package! semi :recipe (:branch "semi-1_14-wl") :pin "9063a4485b148a767ea924f0e7cc78d3524ba256")
 
-(package! wanderlust :pin "8369b2d5170a174652294835dd9a18ed21a38cb2")
+(package! wanderlust :pin "9fd2c65e8d690625f35035a71e73f51f740dbe04")
+
+(when (modulep! +xface)
+  (package! x-face-e21
+    :recipe (:host nil :repo "https://salsa.debian.org/debian/x-face-el.git"
+             :files ("debian/x-face-e21.el"))
+             :pin "871156a776cc1bc9dd035205b6875c55db6ae215"))