diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 71657c4..e8a419b 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -5,6 +5,7 @@ AUX README.gentoo 1652 BLAKE2B beb9d27ac8de471d4ac8a3c4f626e7005d471477943b424b2
 AUX dbmail-2.0.11-lcrypt.patch 642 BLAKE2B 211081aff5d1597054be134f091fce21d36e083d254f53803cb87de66b77cbd35160d548f3d7d6b43c8dfdb93cd4a533dda009f7ce9d5c7f69f5a8fe1fbe9835 SHA512 aa3c25ab2206f104e4de6b20929d55c0e3ceeebd41a670dea553797486696b145feee47f720f4043a1b1fa6b37c73c1684eeb467eace5142e1090a08b63044ff
 AUX dbmail-2.0.4-01_quota.patch 5108 BLAKE2B 4b6ccfef889abcc50679d23e1f250fa46097f0f344cc080f218e06ab36e4ba44e01c33ced11fe4b508fcff40c7656fe80b5d11b94178e8e1028285d38c73a002 SHA512 3cbc50be3d2766185a37e627e7e2b7f737a083821755b099b6fade2aa3163ca291b368346a961c32dd40892dd3de64c6fa901980fa8c5d54e573a3b9d7e1d050
 AUX dbmail-2.0.4-fPIC.patch 2871 BLAKE2B 3c87fba8ccd33efc2b7d875f15c6e146f9493a7930b0e5103a0fa5da6c669a6ebaa86857e6bd8ce1ad9a52e0a4d1177c6133830c4f7b6b09b3a98f4f22ea610f SHA512 dffcc1f79bb1dd4e38aa1842c1aac38fde44ef56c0152013eecabb293154d2d0045596f13321f4c07aaee63e5cf02663305042db5842d612bef461c98fbb67ef
+AUX dbmail-3.2.4-fetch_headers.patch 875 BLAKE2B 42adddf0d337079f581dff4e666abe7d08e84516a2bd057900ab15fab16bb7245dd422d7925c04d00e8e8afa36c19e6fb829598e0577e477edb58b2749671a25 SHA512 38a80c0af3ce76558568b413f20c4b898437737256f74dd93365a4b8201a7db4522aacaf5cd1260640905acb3c691451b552f5a610bde0c6913b687b95b18d7f
 AUX dbmail-3.2.4-group_concat.patch 800 BLAKE2B 170453eaebcc4bd2c6f4bc433ef04014bc55e9f5f8141ca60fa04e0bd2556d76122fed50879bb44daf5621f1f100c6bc4874ab4d1374555163631822ba6f6d6f SHA512 f81ca3fae6c1b64c624d1476eb455815caa935ed1b3c129c47940785b4071bbb0f1d11c04947d7f266d8097e08314bd2e72d22491a03f79197a28e80340e2e31
 AUX dbmail-3.2.5-crypt.patch 874 BLAKE2B bd550f1f0c0fe06b87c380a41a3a4a870978511871b4fd2d8367cf683d5fc0e7f66df2ae29abd94c7efca449294de69ea500e0e9f67c7d45c9216e1c64385d46 SHA512 abf0b859cadbb5eeceacd3c23edf7d94c90c70ebf6308de42ccb69e9bfbf59b0ac697f80476f2422647e5433d6f5ad4fc67262b302011b53c841e57fdb9ec39a
 AUX dbmail-3.2.5-debug.patch 1475 BLAKE2B c0c466c6dd1cb0f6479e81a280ad4746db7b36d175f6bca50649f4b7833ce527c269743267c0cecc92831d3d41297cfa468581741bdbd42f979b008764640170 SHA512 4be630f5c2cd9aaf2eb3cf37fa61c64c5bfe03f916d9de7936e212dcd16b8129fdf0d746fef0ca86b93552251bd21beaafca43e4564a2728861d59a1cc3b2207
@@ -19,7 +20,7 @@ DIST dbmail-3.2.3.tar.gz 2444227 BLAKE2B baa812fb3e925e6d896762596426208fc2ac5fc
 DIST dbmail-3.2.4.tar.gz 2461068 BLAKE2B 2aea108bd314f2f0f3ac5c1764683aa093f07b9642a2a25db08c8b765387ddbc2d02972ea3ede7e86de09aa7bb2d7a4c8423d2e3ab6831a5c613b93c97ee0e82 SHA512 34df0b17307e3d4bd255b4f3f9df59791379fc0b090a73af9dfb02f416747051cbc7a34039384906ab30d6208efbe9c470de9c950d3ace6129292ec8c8fb1786
 DIST dbmail-3.2.5.tar.gz 2463966 BLAKE2B f4099c6f869dbb041d7eccdf20f3a34d36918237cc0386c71a1d339da8651b9301e676b25201856038045bb9590f880353c6ccafd57330f9cf48382c1b4c603c SHA512 6b0d7e1f6f7449869db1e094ffce9e1ef315c60784ea5ae5f814f2cf9a18c358b4c5d107a420c7317961ffa343fc59c9083789177514aee96523927688f276a0
 EBUILD dbmail-3.2.3-r102.ebuild 4749 BLAKE2B a5b5f821cd256bee124d0649b910718db20b679f76fde36ff5a82e51fbc15fade8380c99ebc367a68a2ecd7c7ab1b9c43c4ea00f27d1a8f5408968ec2db16071 SHA512 aabb8ce3bd21b133cf32bd9323a5970d8c173be6d13ba013e7d99107b7370545ac6dde716f395fcdd83e185358b87a0275f30a87ae0076817038eed959baac4c
-EBUILD dbmail-3.2.4-r2.ebuild 4983 BLAKE2B 70488d776e8ac42532b6d370c5084aee00add2fd5bb33eca0ab6d5ceadbc560397d5db6b340782e78ec1fe7c4613e3745fdc48771370d043d046593f0ff48b6f SHA512 0e90a0f1c524d637423fff6cc6f5a5d215a0eaaaa9c6aa06aab7c4bb4e2c47e45d0dbaa052b7ef457413fab53ed66b7e926c9b5f44ae18dd583a3a5960dee080
+EBUILD dbmail-3.2.4-r2.ebuild 5029 BLAKE2B a54c7b4cd5f796f49334336f518d7c38c6aff9f0e10c7ba992dbe227ab19fe826470a1eefdef551826511ae64d50dfe2e2d1e57692af65254da4affc09b456c7 SHA512 bf0b4655f8b64d1dd27e665c2f9fcff74f598069c34ee2ed0d6b00dc020bb6d07af6a85affd710f47119b632d8f127aff3f57bf153ffd8e36ab4fba86c26aa8e
 EBUILD dbmail-3.2.4.ebuild 4876 BLAKE2B dcd2aef5ad6572080af315eb5604137ec7b340f3b1b3858a0591a30ef5d95cd95569a7b68e4aeeed356464cfcbd6b37e34d0d89e790da296f7a639ec6031d5ce SHA512 50caa2e33bd1f8111df1d3c44a43093e6a776287122e70208ab6a63f4201b790cc8edf6ddd13a1b2ad1bc735b6ee40372c483e4c0c028b0d43125ad558ffad93
 EBUILD dbmail-3.2.5-r2.ebuild 2440 BLAKE2B 00c1740b96418850b8f8f71220ff06f4879df5ba0522930305e4fd087819639c4e291af1cb1a4cbc6e918ea85c36f840a40779099802ba612df8b5a4e0f674c4 SHA512 36c0abd2b88422e4497036dfbbaebcd749e605edbe31609c88fa60ee101a4c2ad7b6b1d2d40b648c0f22289fa29be3f0dd386764b6cd9acb057474fd6bcba282
 EBUILD dbmail-3.2.5.ebuild 2433 BLAKE2B 6830616ea4e99605fdc88cd30322bc5df24b3e673bd83a6189f43608586ba1643f4b1cb02eb1ddc7313832ce9c2bf1931ee4eb967ce1e7b38c1e76ddb1be0d0b SHA512 730b9793e00bf28e99eec82c14ba6e4dd28530b2382d26f4e54aacb6879fa14b55a0a237340e542f24e5e4cc7ad8738365360c5581c214af5bef43f62ebfae2a
diff --git a/net-mail/dbmail/dbmail-3.2.4-r2.ebuild b/net-mail/dbmail/dbmail-3.2.4-r2.ebuild
index 7b1862c..9640aaa 100644
--- a/net-mail/dbmail/dbmail-3.2.4-r2.ebuild
+++ b/net-mail/dbmail/dbmail-3.2.4-r2.ebuild
@@ -38,6 +38,7 @@ PATCHES="
 	${FILESDIR}/3.2-pgsql-RETURNING.patch 
 	${FILESDIR}/dbmail-3.2.5-crypt.patch
 	${FILESDIR}/dbmail-3.2.4-group_concat.patch
+	${FILESDIR}/dbmail-3.2.4-fetch_headers.patch
 	"
 
 src_configure() {
diff --git a/net-mail/dbmail/files/dbmail-3.2.4-fetch_headers.patch b/net-mail/dbmail/files/dbmail-3.2.4-fetch_headers.patch
new file mode 100644
index 0000000..810a378
--- /dev/null
+++ b/net-mail/dbmail/files/dbmail-3.2.4-fetch_headers.patch
@@ -0,0 +1,13 @@
+Binary files dbmail-3.2.4.group_concat/src/.dm_imapsession.c.swp and dbmail-3.2.4/src/.dm_imapsession.c.swp differ
+Binary files dbmail-3.2.4.group_concat/src/.dm_mailboxstate.c.swp and dbmail-3.2.4/src/.dm_mailboxstate.c.swp differ
+diff -uriN dbmail-3.2.4.group_concat/src/dm_imapsession.c dbmail-3.2.4/src/dm_imapsession.c
+--- dbmail-3.2.4.group_concat/src/dm_imapsession.c	2020-06-08 02:19:38.000000000 -0500
++++ dbmail-3.2.4/src/dm_imapsession.c	2021-11-09 03:31:07.000000000 -0600
+@@ -805,6 +805,7 @@
+ 			"AND m.message_idnr %s "
+ 			"AND status < %d "
+ 			//"AND n.headername %s IN ('%s') "	//old, from the sql point of view is slow
++			"GROUP By m.message_idnr, n.headername, v.headervalue "
+ 			"having seq %s %d "			//patch Cosmin Cioranu, removing the above conditions needs a restriction, patched added
+ 			"ORDER BY message_idnr, seq",
+ 			not?"":fieldorder->str,