diff --git a/mail/mailutils/Makefile b/mail/mailutils/Makefile
index 386fdfe05b4e..278597cb5239 100644
--- a/mail/mailutils/Makefile
+++ b/mail/mailutils/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mailutils
-PORTVERSION=	3.9
+PORTVERSION=	3.10
 CATEGORIES=	mail
 MASTER_SITES=	GNU GNU_ALPHA
 
@@ -23,12 +23,12 @@ USE_RC_SUBR=	comsatd imap4d pop3d
 INSTALL_TARGET=	install-strip
 TEST_TARGET=	check
 
-PLIST_SUB+=	LIBVERSION=6.0.0 LIBSUFX=6 VERSION=${PORTVERSION}
+PLIST_SUB+=	LIBVERSION=7.0.0 LIBSUFX=7 VERSION=${PORTVERSION}
 
 INFO=		${PORTNAME}
 PORTDOCS=	AUTHORS ChangeLog NEWS README* THANKS TODO
 
-OPTIONS_DEFINE=		DOCS FRIBIDI GNUTLS GSSAPI GUILE MH NNTP NLS PAM PYTHON
+OPTIONS_DEFINE=		DOCS FRIBIDI GNUTLS GSSAPI GUILE MH NLS PAM PYTHON
 OPTIONS_DEFAULT=	GDBM GNUTLS PAM
 OPTIONS_MULTI=		DB
 OPTIONS_MULTI_DB=	BDB GDBM KYOTOCABINET LDAP MYSQL PGSQL TOKYOCABINET
@@ -58,15 +58,13 @@ MH_CONFIGURE_ENABLE=	mh
 MH_USES=		emacs:noflavors
 MH_VARS=		EMACS_NO_DEPENDS=yes
 
-NNTP_CONFIGURE_ENABLE=	nntp
-
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
 PAM_CONFIGURE_ENABLE=	pam
 
 PYTHON_BINARY_ALIAS=	python-config=python${PYTHON_VER}-config
-PYTHON_USES=		python:2.7
+PYTHON_USES=		python:3.0+
 PYTHON_CONFIGURE_ENABLE=python
 
 BDB_USES=		bdb
@@ -101,7 +99,8 @@ post-patch:
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e '/need_charset_alias=/s|true|false|' \
 		${WRKSRC}/lib/gnu/Makefile.in
-	@${REINPLACE_CMD} -e '/chown/,+1s|ch|#&|' ${WRKSRC}/dotlock/Makefile.in
+	@${REINPLACE_CMD} -e '/chown/,+1s|ch|#&|' \
+		${WRKSRC}/dotlock/Makefile.in ${WRKSRC}/mda/mda/Makefile.in
 	@${REINPLACE_CMD} -e 's,-E,& -P,' ${WRKSRC}/libmu_scm/Makefile.in
 
 post-install-DOCS-on:
diff --git a/mail/mailutils/distinfo b/mail/mailutils/distinfo
index 977469b02c7e..d5ff47f23ebb 100644
--- a/mail/mailutils/distinfo
+++ b/mail/mailutils/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1584095355
-SHA256 (mailutils-3.9.tar.xz) = 5f736c63b4976c94eaeddadb94d9c257760e6cb2a9fa189cd59600aaa8703dbc
-SIZE (mailutils-3.9.tar.xz) = 3075268
+TIMESTAMP = 1597431667
+SHA256 (mailutils-3.10.tar.xz) = 097e3dd529576e92a5400b623d0b5a31126c88dc60cc38d55f7fadd764cf559f
+SIZE (mailutils-3.10.tar.xz) = 3102328
diff --git a/mail/mailutils/pkg-plist b/mail/mailutils/pkg-plist
index 5ad91e566e3b..e003f7f1b4b8 100644
--- a/mail/mailutils/pkg-plist
+++ b/mail/mailutils/pkg-plist
@@ -1,3 +1,4 @@
+bin/decodemail
 @(root,mail,2755) bin/dotlock
 bin/frm
 bin/from
@@ -94,7 +95,6 @@ include/mailutils/monitor.h
 include/mailutils/msgset.h
 include/mailutils/mu_auth.h
 include/mailutils/nls.h
-include/mailutils/nntp.h
 include/mailutils/observer.h
 include/mailutils/opool.h
 include/mailutils/opt.h
@@ -147,7 +147,6 @@ include/mailutils/sys/message_stream.h
 include/mailutils/sys/mime.h
 include/mailutils/sys/monitor.h
 include/mailutils/sys/msgset.h
-include/mailutils/sys/nntp.h
 include/mailutils/sys/nullstream.h
 include/mailutils/sys/observer.h
 include/mailutils/sys/pop3.h
@@ -161,6 +160,7 @@ include/mailutils/sys/streamref.h
 include/mailutils/sys/streamtrans.h
 include/mailutils/sys/syslogstream.h
 include/mailutils/sys/temp_file_stream.h
+include/mailutils/sys/temp_stream.h
 include/mailutils/sys/tls-stream.h
 include/mailutils/sys/url.h
 include/mailutils/sys/xscript-stream.h
@@ -247,73 +247,73 @@ lib/mailutils/timestamp.so
 lib/mailutils/vacation.a
 lib/mailutils/vacation.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__init__.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__init__.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__init__.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/address.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/address.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/attribute.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/attribute.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/auth.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/auth.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/body.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/body.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/envelope.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/envelope.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/error.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/filter.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/filter.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/folder.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/folder.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/header.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/header.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/mailbox.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/mailbox.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/mailcap.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/mailcap.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/mailer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/mailer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/message.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/mime.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/mime.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/nls.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/nls.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/registrar.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/registrar.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/secret.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/secret.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/sieve.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/sieve.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/stream.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/stream.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/url.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/url.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/__pycache__/util.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/address.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/address.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/address.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/attribute.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/attribute.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/attribute.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/auth.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/auth.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/auth.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/body.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/body.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/body.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/c_api.a
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/c_api.so
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/envelope.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/envelope.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/envelope.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/error.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/error.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/error.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/filter.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/filter.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/filter.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/folder.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/folder.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/folder.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/header.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/header.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/header.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailbox.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailbox.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailbox.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailcap.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailcap.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailcap.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailer.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailer.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mailer.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/message.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/message.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/message.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mime.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mime.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/mime.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/nls.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/nls.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/nls.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/registrar.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/registrar.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/registrar.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/secret.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/secret.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/secret.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/sieve.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/sieve.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/sieve.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/stream.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/stream.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/stream.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/url.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/url.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/url.pyo
 %%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/util.py
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/util.pyc
-%%PYTHON%%%%PYTHON_SITELIBDIR%%/mailutils/util.pyo
 libexec/mailutils/mailutils-acl
 libexec/mailutils/mailutils-cflags
 libexec/mailutils/mailutils-dbm
@@ -336,7 +336,7 @@ man/man1/popauth.1.gz
 sbin/comsatd
 sbin/imap4d
 sbin/lmtpd
-sbin/mda
+@(root,mail,2755) sbin/mda
 sbin/pop3d
 share/aclocal/mailutils.m4
 %%MH%%%%EMACS_SITE_LISPDIR%%/mailutils-mh.el