diff --git a/mail/aerc/Makefile b/mail/aerc/Makefile
index 51f2045f65de..a0b243570b67 100644
--- a/mail/aerc/Makefile
+++ b/mail/aerc/Makefile
@@ -1,120 +1,120 @@
 PORTNAME=	aerc
-DISTVERSION=	0.19.0
+DISTVERSION=	0.20.0
 CATEGORIES=	mail
 
 MAINTAINER=	iamsleepy@ryuki.me
 COMMENT=	Email client for your terminal
 WWW=		https://aerc-mail.org/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	base64:converters/base64 \
 		scdoc:textproc/scdoc
 
 USES=		desktop-file-utils gmake go:modules ncurses:port python \
 		shebangfix
 
 USE_GITHUB=	nodefault
 
 GH_TUPLE=	ProtonMail:go-crypto:v1.1.4:protonmail_go_crypto/vendor/github.com/ProtonMail/go-crypto \
 		arran4:golang-ical:v0.3.1:arran4_golang_ical/vendor/github.com/arran4/golang-ical \
 		cloudflare:circl:v1.4.0:cloudflare_circl/vendor/github.com/cloudflare/circl \
 		containerd:console:v1.0.4:containerd_console/vendor/github.com/containerd/console \
 		creack:pty:v1.1.24:creack_pty/vendor/github.com/creack/pty \
 		danwakefield:fnmatch:cbb64ac3d964:danwakefield_fnmatch/vendor/github.com/danwakefield/fnmatch \
 		davecgh:go-spew:v1.1.1:davecgh_go_spew/vendor/github.com/davecgh/go-spew \
 		emersion:go-imap-sortthread:v1.2.0:emersion_go_imap_sortthread/vendor/github.com/emersion/go-imap-sortthread \
 		emersion:go-imap:v1.2.1:emersion_go_imap/vendor/github.com/emersion/go-imap \
 		emersion:go-maildir:v0.5.0:emersion_go_maildir/vendor/github.com/emersion/go-maildir \
 		emersion:go-mbox:v1.0.3:emersion_go_mbox/vendor/github.com/emersion/go-mbox \
 		emersion:go-message:v0.18.2:emersion_go_message/vendor/github.com/emersion/go-message \
 		emersion:go-msgauth:v0.6.8:emersion_go_msgauth/vendor/github.com/emersion/go-msgauth \
 		emersion:go-pgpmail:v0.2.2:emersion_go_pgpmail/vendor/github.com/emersion/go-pgpmail \
 		emersion:go-sasl:b788ff22d5a6:emersion_go_sasl/vendor/github.com/emersion/go-sasl \
 		emersion:go-smtp:v0.21.3:emersion_go_smtp/vendor/github.com/emersion/go-smtp \
 		fsnotify:fsevents:v0.2.0:fsnotify_fsevents/vendor/github.com/fsnotify/fsevents \
 		fsnotify:fsnotify:v1.8.0:fsnotify_fsnotify/vendor/github.com/fsnotify/fsnotify \
 		gatherstars-com:jwz:v1.4.0:gatherstars_com_jwz/vendor/github.com/gatherstars-com/jwz \
 		go-check:check:10cb98267c6c:go_check_check/vendor/gopkg.in/check.v1 \
 		go-ini:ini:v1.67.0:go_ini_ini/vendor/github.com/go-ini/ini \
 		go-yaml:yaml:v3.0.1:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \
 		golang:crypto:v0.31.0:golang_crypto/vendor/golang.org/x/crypto \
 		golang:image:v0.23.0:golang_image/vendor/golang.org/x/image \
 		golang:mod:v0.20.0:golang_mod/vendor/golang.org/x/mod \
 		golang:oauth2:v0.24.0:golang_oauth2/vendor/golang.org/x/oauth2 \
 		golang:snappy:v0.0.4:golang_snappy/vendor/github.com/golang/snappy \
 		golang:sync:v0.10.0:golang_sync/vendor/golang.org/x/sync \
 		golang:sys:v0.28.0:golang_sys/vendor/golang.org/x/sys \
 		golang:text:v0.21.0:golang_text/vendor/golang.org/x/text \
 		golang:tools:v0.24.0:golang_tools/vendor/golang.org/x/tools \
 		kr:pretty:v0.3.0:kr_pretty/vendor/github.com/kr/pretty \
 		lithammer:fuzzysearch:v1.1.8:lithammer_fuzzysearch/vendor/github.com/lithammer/fuzzysearch \
 		mattn:go-isatty:v0.0.20:mattn_go_isatty/vendor/github.com/mattn/go-isatty \
 		mattn:go-runewidth:v0.0.16:mattn_go_runewidth/vendor/github.com/mattn/go-runewidth \
 		mattn:go-sixel:v0.0.5:mattn_go_sixel/vendor/github.com/mattn/go-sixel \
 		onsi:gomega:v1.20.0:onsi_gomega/vendor/github.com/onsi/gomega \
 		pkg:errors:v0.9.1:pkg_errors/vendor/github.com/pkg/errors \
 		pmezard:go-difflib:v1.0.0:pmezard_go_difflib/vendor/github.com/pmezard/go-difflib \
 		rivo:uniseg:v0.4.7:rivo_uniseg/vendor/github.com/rivo/uniseg \
 		riywo:loginshell:7d26008be1ab:riywo_loginshell/vendor/github.com/riywo/loginshell \
 		rogpeppe:go-internal:v1.8.1:rogpeppe_go_internal/vendor/github.com/rogpeppe/go-internal \
 		soniakeys:quant:v1.0.0:soniakeys_quant/vendor/github.com/soniakeys/quant \
 		stretchr:testify:v1.10.0:stretchr_testify/vendor/github.com/stretchr/testify \
 		syndtr:goleveldb:v1.0.0:syndtr_goleveldb/vendor/github.com/syndtr/goleveldb
 
 # Additional distfiles to fetch from https://git.sr.ht
 _SRHT_TUPLE=	rjarry:aerc:${DISTVERSIONFULL}:"" \
 		rjarry:go-opt:v2.0.1:vendor/git.sr.ht/~rjarry/go-opt/v2 \
 		rockorager:go-jmap:v0.5.0:vendor/git.sr.ht/~rockorager/go-jmap \
 		rockorager:vaxis:v0.11.1:vendor/git.sr.ht/~rockorager/vaxis
 
 SHEBANG_FILES=	contrib/carddav-query filters/show-ics-details.py
 
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	GO_BUILDFLAGS="${GO_BUILDFLAGS}" \
 		VERSION="${DISTVERSION}"
 MAKE_ENV=	${GO_ENV} \
 		CC="${CC}" \
 		CFLAGS="${CFLAGS}" \
 		GOFLAGS="${GO_BUILDFLAGS}"
 
 OPTIONS_DEFINE=		HTML_FILTER NOTMUCH
 OPTIONS_DEFAULT=	HTML_FILTER NOTMUCH
 OPTIONS_SUB=		yes
 
 HTML_FILTER_DESC=	Install HTML filter (depends on w3m and socksify)
 NOTMUCH_DESC=		Fast indexing and searching support via notmuch
 
 HTML_FILTER_RUN_DEPENDS=	socksify:net/dante \
 				w3m:www/w3m
 NOTMUCH_LIB_DEPENDS=		libnotmuch.so:mail/notmuch
 NOTMUCH_VARS=			GO_BUILDFLAGS+="-tags=notmuch"
 
 .include <bsd.port.pre.mk>
 
 .for account project tag subdir in ${_SRHT_TUPLE:S/:/ /g}
 MASTER_SITES+=	https://git.sr.ht/~${account}/${project}/archive/${tag}${EXTRACT_SUFX}?dummy=/:${account}_${project:S/-/_/g}
 DISTFILES+=	${account}-${project}-${tag}_SRHT0${EXTRACT_SUFX}:${account}_${project:S/-/_/g}
 .endfor
 
 post-extract:
 .for account project tag subdir in ${_SRHT_TUPLE:S/:/ /g:[5..-1]}
 	@${MKDIR} ${WRKSRC}/${subdir:H}
 	@${MV} ${WRKDIR}/${project}-${tag} ${WRKSRC}/${subdir}
 .endfor
 
 do-build:
 	(cd ${WRKSRC} && ${DO_MAKE_BUILD} ${ALL_TARGET})
 
 do-install:
 	${REINPLACE_CMD} 's,PREFIX ?=.*,PREFIX= ${STAGEDIR}${PREFIX},' \
 	    ${WRKSRC}/${MAKEFILE}
 	(cd ${WRKSRC} && ${DO_MAKE_BUILD} ${INSTALL_TARGET})
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/bin/${PORTNAME}
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/libexec/aerc/filters/wrap
 	${STRIP_CMD} ${STAGEDIR}/${PREFIX}/libexec/aerc/filters/colorize
 
 .include <bsd.port.post.mk>
diff --git a/mail/aerc/distinfo b/mail/aerc/distinfo
index 1b1eb16526f3..4bdedf8ab0b5 100644
--- a/mail/aerc/distinfo
+++ b/mail/aerc/distinfo
@@ -1,99 +1,99 @@
 TIMESTAMP = 1736942664
-SHA256 (rjarry-aerc-0.19.0_SRHT0.tar.gz) = caf830959cf689db257ffb64893fd78f1a362a22fe774dd561340fc552d599eb
-SIZE (rjarry-aerc-0.19.0_SRHT0.tar.gz) = 473597
+SHA256 (rjarry-aerc-0.20.0_SRHT0.tar.gz) = 1a7d6172b5740ead40bf1400cd45f00400822bb6af00aef76d04b386a4292d8c
+SIZE (rjarry-aerc-0.20.0_SRHT0.tar.gz) = 474925
 SHA256 (rjarry-go-opt-v2.0.1_SRHT0.tar.gz) = d137f6cb477ef5a2d7984d89637d9ecc322b0de1cf9b5831f48dbfe02dda803c
 SIZE (rjarry-go-opt-v2.0.1_SRHT0.tar.gz) = 14484
 SHA256 (rockorager-go-jmap-v0.5.0_SRHT0.tar.gz) = 39fcd7aa248d4b65e001b49f4d1d4ccefe66b45384cb79c014cecabbea664708
 SIZE (rockorager-go-jmap-v0.5.0_SRHT0.tar.gz) = 25671
 SHA256 (rockorager-vaxis-v0.11.1_SRHT0.tar.gz) = 75ff23bc30e32efb1fb2cae99fa17bc2eb572f173ce8783bda4976cf025c4904
 SIZE (rockorager-vaxis-v0.11.1_SRHT0.tar.gz) = 104095
 SHA256 (ProtonMail-go-crypto-v1.1.4_GH0.tar.gz) = e54a53e5aa9f5b4cce3dcd67ad9ab2b812809a65eee9d428bba6c65245c9f002
 SIZE (ProtonMail-go-crypto-v1.1.4_GH0.tar.gz) = 511541
 SHA256 (arran4-golang-ical-v0.3.1_GH0.tar.gz) = 4670c22ecca6cd8e54b8b960935e7f7692f1349ef866ec6d84f4eb58da505da1
 SIZE (arran4-golang-ical-v0.3.1_GH0.tar.gz) = 26405
 SHA256 (cloudflare-circl-v1.4.0_GH0.tar.gz) = 3300152cc4812a96526550b0121c9a6f07fc668a2fa1b6f54a0ba15121a8821d
 SIZE (cloudflare-circl-v1.4.0_GH0.tar.gz) = 5497076
 SHA256 (containerd-console-v1.0.4_GH0.tar.gz) = 3b8f8b07ede2a7236d1ff2ef3e05e8e1a43f43a44dcb8e15f7d30ce910302430
 SIZE (containerd-console-v1.0.4_GH0.tar.gz) = 13622
 SHA256 (creack-pty-v1.1.24_GH0.tar.gz) = 76c93cd32c148c6ab86c7f8ddfeb000083ebf4852af62731e3f1aecb7c22c782
 SIZE (creack-pty-v1.1.24_GH0.tar.gz) = 21085
 SHA256 (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 7ebff38d382142f9220d2cfcb4731d0ae90cdef71238c94a15c35f8aa746007f
 SIZE (danwakefield-fnmatch-cbb64ac3d964_GH0.tar.gz) = 4955
 SHA256 (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 7d82b9bb7291adbe7498fe946920ab3e7fc9e6cbfc3b2294693fad00bf0dd17e
 SIZE (davecgh-go-spew-v1.1.1_GH0.tar.gz) = 42152
 SHA256 (emersion-go-imap-sortthread-v1.2.0_GH0.tar.gz) = 4e5829010b2f633b360ed11d449758e218dea2bf8c955b3d809548a78fa60a1b
 SIZE (emersion-go-imap-sortthread-v1.2.0_GH0.tar.gz) = 8976
 SHA256 (emersion-go-imap-v1.2.1_GH0.tar.gz) = 5491725275b90e05f2ed98e5273688e5f05a8a488b0c5ce504f60aa19c9d8791
 SIZE (emersion-go-imap-v1.2.1_GH0.tar.gz) = 103546
 SHA256 (emersion-go-maildir-v0.5.0_GH0.tar.gz) = 29d58eb5e0631ba5393cfbcb50a79d7e416b50b3496e027b7eb013714010abb9
 SIZE (emersion-go-maildir-v0.5.0_GH0.tar.gz) = 8347
 SHA256 (emersion-go-mbox-v1.0.3_GH0.tar.gz) = 54c85831ececafb417939741b00da573c5dab61a746834b9977e7dde8dba523e
 SIZE (emersion-go-mbox-v1.0.3_GH0.tar.gz) = 5692
 SHA256 (emersion-go-message-v0.18.2_GH0.tar.gz) = 9e37b922775a3bbad413a8269542ec3ebdf5195165b1640a4e6433bc41c28413
 SIZE (emersion-go-message-v0.18.2_GH0.tar.gz) = 48158
 SHA256 (emersion-go-msgauth-v0.6.8_GH0.tar.gz) = 44ab6e48d8b073ea9cd4c166b9d506fe213998b47d37da91d88c43e90e244c38
 SIZE (emersion-go-msgauth-v0.6.8_GH0.tar.gz) = 29769
 SHA256 (emersion-go-pgpmail-v0.2.2_GH0.tar.gz) = c3993995efab50b038e6ce62aa6d80ffd32b74ac5a1a78f7d37140453e16bcb1
 SIZE (emersion-go-pgpmail-v0.2.2_GH0.tar.gz) = 16251
 SHA256 (emersion-go-sasl-b788ff22d5a6_GH0.tar.gz) = 83dcf546c520708cf53dca5df3730c71b51901f08a52282c3515fd01d0ecbc75
 SIZE (emersion-go-sasl-b788ff22d5a6_GH0.tar.gz) = 6888
 SHA256 (emersion-go-smtp-v0.21.3_GH0.tar.gz) = aa42fe71cd9d71d3942a372ed14074ca3c277a6f09f685278280630ccef1d2ee
 SIZE (emersion-go-smtp-v0.21.3_GH0.tar.gz) = 42564
 SHA256 (fsnotify-fsevents-v0.2.0_GH0.tar.gz) = 23405fe675d45cbe685b176a6d897d3e5da0ece3f98211fc7473d5d4a0109a36
 SIZE (fsnotify-fsevents-v0.2.0_GH0.tar.gz) = 24025
 SHA256 (fsnotify-fsnotify-v1.8.0_GH0.tar.gz) = 3c4cbec6225307397717f18bb87ffc496e59d0f802a41fff572bf09e5dbf6e2b
 SIZE (fsnotify-fsnotify-v1.8.0_GH0.tar.gz) = 72325
 SHA256 (gatherstars-com-jwz-v1.4.0_GH0.tar.gz) = ee866f82a01e3d0169a4acd26f39f4db5085cfd286cda3f22b90eca51648f550
 SIZE (gatherstars-com-jwz-v1.4.0_GH0.tar.gz) = 2382370
 SHA256 (go-check-check-10cb98267c6c_GH0.tar.gz) = 0a42d9d5a49ebc30174e5840238e446f5fb16899bfaa6a6f63d12ab9953df293
 SIZE (go-check-check-10cb98267c6c_GH0.tar.gz) = 32375
 SHA256 (go-ini-ini-v1.67.0_GH0.tar.gz) = 06ba51234140118d1b6064f1817aa89cc971c6e7ce04cb9d286e6660d89296c8
 SIZE (go-ini-ini-v1.67.0_GH0.tar.gz) = 53531
 SHA256 (go-yaml-yaml-v3.0.1_GH0.tar.gz) = cf05411540d3e6ef8f1fd88434b34f94cedaceb540329031d80e23b74540c4e5
 SIZE (go-yaml-yaml-v3.0.1_GH0.tar.gz) = 91173
 SHA256 (golang-crypto-v0.31.0_GH0.tar.gz) = 36e325f89d4cd03ec568d92c74d6affd2b1fb88fcdc63aeb15d1df41e11200ca
 SIZE (golang-crypto-v0.31.0_GH0.tar.gz) = 1837859
 SHA256 (golang-image-v0.23.0_GH0.tar.gz) = 45e79e4f37e6e368255a1f86861f8f551b8fab5980fc68c7c024b08c65e41363
 SIZE (golang-image-v0.23.0_GH0.tar.gz) = 5103978
 SHA256 (golang-mod-v0.20.0_GH0.tar.gz) = 83b0516cc8b89e62deced06437230cf80981e2c9dc1d1caa589b3d0313600f50
 SIZE (golang-mod-v0.20.0_GH0.tar.gz) = 124271
 SHA256 (golang-oauth2-v0.24.0_GH0.tar.gz) = b14b6ae831727f39534bd617dbb53cd139074dbadcf58eafe8566145ed0231f0
 SIZE (golang-oauth2-v0.24.0_GH0.tar.gz) = 98494
 SHA256 (golang-snappy-v0.0.4_GH0.tar.gz) = 77df678795596f9dfecb5744deb984633d780460a7e9a59e0c7ecfe2052b644f
 SIZE (golang-snappy-v0.0.4_GH0.tar.gz) = 66129
 SHA256 (golang-sync-v0.10.0_GH0.tar.gz) = 2a7b7c36a89b444213ec3237a21dd1ca6ed351adf423666cc6bf853711a13f3d
 SIZE (golang-sync-v0.10.0_GH0.tar.gz) = 18099
 SHA256 (golang-sys-v0.28.0_GH0.tar.gz) = 62726b1ccbb09c7e8de2215756a26012751bdded12b5bacc6de83296db694ebf
 SIZE (golang-sys-v0.28.0_GH0.tar.gz) = 1519898
 SHA256 (golang-text-v0.21.0_GH0.tar.gz) = d64dbf40a8ae06c4805895e48553ecdadaed07089d8ed2168a0d61551d17ff22
 SIZE (golang-text-v0.21.0_GH0.tar.gz) = 8964782
 SHA256 (golang-tools-v0.24.0_GH0.tar.gz) = 7ebfbdf31af28c4fd3a6cf1dec7bbfdd83e5292ae1ba5eb8825f8d90221a66fc
 SIZE (golang-tools-v0.24.0_GH0.tar.gz) = 6977100
 SHA256 (kr-pretty-v0.3.0_GH0.tar.gz) = c264e7939bf8d989d388c1156ea0c8bdeb3659b789e83aac6bd4689e8613f3f6
 SIZE (kr-pretty-v0.3.0_GH0.tar.gz) = 10041
 SHA256 (lithammer-fuzzysearch-v1.1.8_GH0.tar.gz) = 2496ccfc16d85426eb70aaf94f773f8ca08caf96694de3ede3c29d5978e28e50
 SIZE (lithammer-fuzzysearch-v1.1.8_GH0.tar.gz) = 9373
 SHA256 (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 18fc42a278e60fb7a1dffa72f20539ae88d0e292db55b513ef514b7d369883a6
 SIZE (mattn-go-isatty-v0.0.20_GH0.tar.gz) = 4713
 SHA256 (mattn-go-runewidth-v0.0.16_GH0.tar.gz) = e98c1e4a82b8a6d026ee63385955cc178c91c77f106c7cf3d743736301106a8f
 SIZE (mattn-go-runewidth-v0.0.16_GH0.tar.gz) = 18490
 SHA256 (mattn-go-sixel-v0.0.5_GH0.tar.gz) = a060945b47882e8e9d98591b0c465a33b0cd01c11f78665bef3645550dec010a
 SIZE (mattn-go-sixel-v0.0.5_GH0.tar.gz) = 23712
 SHA256 (onsi-gomega-v1.20.0_GH0.tar.gz) = 335cfb76e3c0662b63f8f82270a8af485cabd2ec0b18292e4bcd2e2fdff19823
 SIZE (onsi-gomega-v1.20.0_GH0.tar.gz) = 283126
 SHA256 (pkg-errors-v0.9.1_GH0.tar.gz) = 56bfd893023daa498508bfe161de1be83299fcf15376035e7df79cbd7d6fa608
 SIZE (pkg-errors-v0.9.1_GH0.tar.gz) = 13415
 SHA256 (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 28f3dc1b5c0efd61203ab07233f774740d3bf08da4d8153fb5310db6cea0ebda
 SIZE (pmezard-go-difflib-v1.0.0_GH0.tar.gz) = 11398
 SHA256 (rivo-uniseg-v0.4.7_GH0.tar.gz) = dc7aedce4a8c174b01df8406ff7d92779e2df76cee2ad17fa2ff6777feddadec
 SIZE (rivo-uniseg-v0.4.7_GH0.tar.gz) = 458088
 SHA256 (riywo-loginshell-7d26008be1ab_GH0.tar.gz) = 5a4776948b8f26adb09c051b7910fc39115305ed2efac769f99e8f2a16d7a265
 SIZE (riywo-loginshell-7d26008be1ab_GH0.tar.gz) = 2068
 SHA256 (rogpeppe-go-internal-v1.8.1_GH0.tar.gz) = 489c93e5979d4bca3bed1cb738c11b5319a746f74ed079bbfcf95619e72314c2
 SIZE (rogpeppe-go-internal-v1.8.1_GH0.tar.gz) = 131837
 SHA256 (soniakeys-quant-v1.0.0_GH0.tar.gz) = 6656199c1599fa8b334dde6ddcf09d4147aadd52ec26668130c8fdd11f8d78eb
 SIZE (soniakeys-quant-v1.0.0_GH0.tar.gz) = 11246
 SHA256 (stretchr-testify-v1.10.0_GH0.tar.gz) = 06af5143ab5fc8f2fbf3d1420a5f002f6383cd7de911698dbd1822beacb27684
 SIZE (stretchr-testify-v1.10.0_GH0.tar.gz) = 112732
 SHA256 (syndtr-goleveldb-v1.0.0_GH0.tar.gz) = c80191f7f77b41d6cb3d1c6de1d42a9b8177656ee49c256d2df2b95a893cf8b8
 SIZE (syndtr-goleveldb-v1.0.0_GH0.tar.gz) = 142710