diff -pruN 4:24.12.3-4/debian/changelog 4:24.12.3-5/debian/changelog
--- 4:24.12.3-4/debian/changelog	2025-05-27 18:20:42.000000000 +0000
+++ 4:24.12.3-5/debian/changelog	2025-10-05 12:08:36.000000000 +0000
@@ -1,3 +1,11 @@
+messagelib (4:24.12.3-5) unstable; urgency=medium
+
+  [ Patrick Franz ]
+  * Backport patch to fix build failures with GpgME 2 (Closes:
+    #1117244).
+
+ -- Patrick Franz <deltaone@debian.org>  Sun, 05 Oct 2025 14:08:36 +0200
+
 messagelib (4:24.12.3-4) unstable; urgency=medium
 
   [ Patrick Franz ]
diff -pruN 4:24.12.3-4/debian/patches/series 4:24.12.3-5/debian/patches/series
--- 4:24.12.3-4/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ 4:24.12.3-5/debian/patches/series	2025-10-05 12:01:41.000000000 +0000
@@ -0,0 +1,2 @@
+# Fixed in 25.04
+upstream_gpgme_include.patch
diff -pruN 4:24.12.3-4/debian/patches/upstream_gpgme_include.patch 4:24.12.3-5/debian/patches/upstream_gpgme_include.patch
--- 4:24.12.3-4/debian/patches/upstream_gpgme_include.patch	1970-01-01 00:00:00.000000000 +0000
+++ 4:24.12.3-5/debian/patches/upstream_gpgme_include.patch	2025-10-05 12:00:41.000000000 +0000
@@ -0,0 +1,25 @@
+From 17595829dc644e7142e94ae70c1224cd18dd7d5e Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sat, 1 Feb 2025 22:05:26 +0100
+Subject: [PATCH] Fix gpgme include
+
+---
+ messagecomposer/autotests/encryptjobtest.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/messagecomposer/autotests/encryptjobtest.cpp b/messagecomposer/autotests/encryptjobtest.cpp
+index fe4eb2e59..c2707b6d5 100644
+--- a/messagecomposer/autotests/encryptjobtest.cpp
++++ b/messagecomposer/autotests/encryptjobtest.cpp
+@@ -35,7 +35,7 @@
+ #include <cstdlib>
+ 
+ #include <QTest>
+-#include <decryptionresult.h>
++#include <gpgme++/decryptionresult.h>
+ 
+ QTEST_MAIN(EncryptJobTest)
+ 
+-- 
+GitLab
+