-TERMUX_PKG_DESCRIPTION="Mail client"
-TERMUX_PKG_VERSION=1.5.24
-TERMUX_PKG_BUILD_REVISION=1
-TERMUX_PKG_SRCURL=https://bitbucket.org/mutt/mutt/downloads/mutt-${TERMUX_PKG_VERSION}.tar.gz
-TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS="--enable-smtp --enable-imap --enable-pop --with-mailpath=$TERMUX_PREFIX/var/mail --with-ssl --enable-compressed --without-idn --enable-hcache"
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-exec-shell=$TERMUX_PREFIX/bin/sh"
-# The mutt autoconf guesses no for working (v)snprintf and uses broken local versions - avoid that:
-TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" mutt_cv_c99_snprintf=yes mutt_cv_c99_vsnprintf=yes"
-# TERMUX_PKG_EXTRA_CONFIGURE_ARGS+=" --with-sasl"
-# bin/{flea,muttbug}: File bug against mutt:
-TERMUX_PKG_RM_AFTER_INSTALL="bin/flea bin/muttbug"
+TERMUX_PKG_DESCRIPTION="Mail client with patches from neomutt"
+TERMUX_PKG_VERSION=1.9.4
+TERMUX_PKG_SHA256=f4d1bf26350c1ac81b551f98e5a4fd80d7fecd86919aa8165e69fde87de1b5df
+TERMUX_PKG_SRCURL=ftp://ftp.mutt.org/pub/mutt/mutt-${TERMUX_PKG_VERSION}.tar.gz
+TERMUX_PKG_DEPENDS="libandroid-support, ncurses, gdbm, openssl, libsasl, mime-support"
+TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
+mutt_cv_c99_snprintf=yes
+mutt_cv_c99_vsnprintf=yes
+--disable-gpgme
+--enable-compressed
+--enable-hcache
+--enable-imap
+--enable-pop
+--enable-sidebar
+--enable-smtp
+--with-exec-shell=$TERMUX_PREFIX/bin/sh
+--with-mailpath=$TERMUX_PREFIX/var/mail
+--without-idn
+--with-sasl
+--with-ssl
+"
+TERMUX_PKG_RM_AFTER_INSTALL="
+bin/flea
+bin/muttbug
+share/man/man1/muttbug.1
+share/man/man1/flea.1
+etc/mime.types
+"
+TERMUX_PKG_CONFFILES="etc/Muttrc"