diff --git a/mail-mta/msmtp/files/msmtp-1.8.31-fix-disable-nls.patch b/mail-mta/msmtp/files/msmtp-1.8.31-fix-disable-nls.patch
deleted file mode 100644
index c52c42af9d0d6..0000000000000
--- a/mail-mta/msmtp/files/msmtp-1.8.31-fix-disable-nls.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Subject: [PATCH] Fix header encoding when building with --disable-nls.
-
-With disabled NLS, msmtp now assumes that UTF-8 is the current codeset,
-which is a better guess than ASCII, which is what nl_langinfo() returns.
-
-This fixes github issue #203.
----
-URL: https://github.com/marlam/msmtp/commit/c6baa5b39e811ea4459a35ae0de88163f65bf8a2
----
- src/tools.c | 6 ++++++
- 1 file changed, 6 insertions(+)
-
-diff --git a/src/tools.c b/src/tools.c
-index b65b4c5..9d78fc8 100644
---- a/src/tools.c
-+++ b/src/tools.c
-@@ -1012,7 +1012,13 @@ char *encode_for_header(const char *s)
-         size_t b64_s_len = BASE64_LENGTH(s_len);
-         char* encoding =
- #ifdef HAVE_LANGINFO_H
-+            /* With disabled NLS, nl_langinfo() always seems to return
-+             * ANSI_X3.4-1968 (i.e. ASCII). We want to assume UTF-8 instead. */
-+# ifdef ENABLE_NLS
-                 nl_langinfo(CODESET);
-+# else
-+                "UTF-8";
-+# endif
- #else
- # ifdef W32_NATIVE
-                 w32_langinfo_codeset();
diff --git a/mail-mta/msmtp/files/msmtp-fix-tests-without-msmtpd.patch b/mail-mta/msmtp/files/msmtp-fix-tests-without-msmtpd.patch
deleted file mode 100644
index a7c5cf17f1d19..0000000000000
--- a/mail-mta/msmtp/files/msmtp-fix-tests-without-msmtpd.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-https://github.com/marlam/msmtp/pull/200
-https://bugs.gentoo.org/948087
-
-From fce1dfefd7af8175708deabc3e55f8682d181d22 Mon Sep 17 00:00:00 2001
-From: Gabi Falk <gabifalk@gmx.com>
-Date: Wed, 13 Aug 2025 09:00:00 +0000
-Subject: [PATCH] tests: skip msmtpd-dependent tests if msmtpd is not built
-
-Link: https://bugs.gentoo.org/948087
----
- tests/test-auth-plain.sh      | 8 +++++++-
- tests/test-header-handling.sh | 8 +++++++-
- 2 files changed, 14 insertions(+), 2 deletions(-)
-
-diff --git a/tests/test-auth-plain.sh b/tests/test-auth-plain.sh
-index 27d406e..a670dcd 100755
---- a/tests/test-auth-plain.sh
-+++ b/tests/test-auth-plain.sh
-@@ -2,9 +2,15 @@
- 
- set -e
- 
-+msmtpd=../src/msmtpd
-+if [ ! -x $msmtpd ]; then
-+	echo 'msmtpd is not built'
-+	exit 77
-+fi
-+
- # Start an msmtpd with PLAIN authentication
- echo "Starting msmtpd"
--../src/msmtpd --interface=::1 --port=12345 --auth='testuser,echo testpassword' \
-+$msmtpd --interface=::1 --port=12345 --auth='testuser,echo testpassword' \
- 	--command='cat > out-auth-plain-mail.txt; echo > out-auth-plain-rcpt.txt' &
- MSMTPD_PID=$!
- trap "kill $MSMTPD_PID" EXIT
-diff --git a/tests/test-header-handling.sh b/tests/test-header-handling.sh
-index e58cde4..9109bd3 100755
---- a/tests/test-header-handling.sh
-+++ b/tests/test-header-handling.sh
-@@ -2,9 +2,15 @@
- 
- set -e
- 
-+msmtpd=../src/msmtpd
-+if [ ! -x $msmtpd ]; then
-+	echo 'msmtpd is not built'
-+	exit 77
-+fi
-+
- # Start an msmtpd that dumps the mail and the recipient lists so we can check them
- echo "Starting msmtpd"
--../src/msmtpd --interface=::1 --port=12346 \
-+$msmtpd --interface=::1 --port=12346 \
- 	--command='cat > out-header-handling-mail.txt; echo > out-header-handling-rcpt.txt' &
- MSMTPD_PID=$!
- trap "kill $MSMTPD_PID" EXIT