diff --git a/bin/setup-neomutt b/bin/setup-neomutt
--- a/bin/setup-neomutt
+++ b/bin/setup-neomutt
@@ -17,14 +17,17 @@ fi
 cd sandbox/neomutt
 
 ./prepare \
+  --enable-quick-build \
  --with-ssl --with-sasl \
  --enable-hcache \
  --enable-imap --enable-smtp \
- --enable-sidebar >/dev/null
+ --with-regex \
+  >/dev/null
 
 make -s -j3
 
 cd ~/bin
-ln -sf ../sandbox/neomutt/mutt
-ln -sf ../sandbox/neomutt/pgpewrap
+for BIN in mutt mutt_dotlock pgpewrap; do
+  ln -sf ../sandbox/neomutt/$BIN
+done