diff --git a/net-mail/dbmail/Manifest b/net-mail/dbmail/Manifest
index 9e639dc..71657c4 100644
--- a/net-mail/dbmail/Manifest
+++ b/net-mail/dbmail/Manifest
@@ -5,7 +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-group_concat.patch 728 BLAKE2B 94d10c34dcba9094f37a9311be778e5adb89ecba9ad30df0d1680c1658c07a99e9b0d713ce53f9f9794acc2e3364057d474d7201207d97e0593f089573cac7b9 SHA512 7801359c1282524e663a2c983ee127056d4d98574c332578701c6fdfafe5e3ab5e279f581ed207f97015a1175d896e4bedd2ecd666039dbb041887a299f15085
+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
 AUX dbmail-imapd.initd 726 BLAKE2B 98627190c184c837480c7fcbe5ee2afa7118de0a299a89c9d7b9a38fdb0b389df734504f79bb361d52324000e1dd2e6d20c64af47e1d81e2808e2cb3c8acc028 SHA512 3a9b175dfa189d74a241f770f701e07d0555e94c45ab162256d60972e4368bea7f9f040f2fa0e1d35969253d8c17fedf1d68f11e975084146d41219067f46486
diff --git a/net-mail/dbmail/files/dbmail-3.2.4-group_concat.patch b/net-mail/dbmail/files/dbmail-3.2.4-group_concat.patch
index 88888c3..09662f3 100644
--- a/net-mail/dbmail/files/dbmail-3.2.4-group_concat.patch
+++ b/net-mail/dbmail/files/dbmail-3.2.4-group_concat.patch
@@ -1,8 +1,8 @@
 Binary files dbmail-3.2.4.orig/src/.dm_mailboxstate.c.swp and dbmail-3.2.4/src/.dm_mailboxstate.c.swp differ
 diff -uriN dbmail-3.2.4.orig/src/dm_mailboxstate.c dbmail-3.2.4/src/dm_mailboxstate.c
 --- dbmail-3.2.4.orig/src/dm_mailboxstate.c	2020-06-08 02:19:38.000000000 -0500
-+++ dbmail-3.2.4/src/dm_mailboxstate.c	2021-11-08 18:46:00.000000000 -0600
-@@ -233,7 +233,7 @@
++++ dbmail-3.2.4/src/dm_mailboxstate.c	2021-11-08 19:09:07.000000000 -0600
+@@ -233,10 +233,10 @@
  	
  	memset(query, 0, sizeof(query));
  	snprintf(query, DEF_QUERYSIZE-1,
@@ -10,4 +10,8 @@ diff -uriN dbmail-3.2.4.orig/src/dm_mailboxstate.c dbmail-3.2.4/src/dm_mailboxst
 +		"SELECT k.message_idnr, string_agg(distinct keyword, ',') FROM %skeywords k "
  		"LEFT JOIN %smessages m ON k.message_idnr=m.message_idnr "
  		"WHERE m.mailbox_idnr = ? %s "
- 		"group by m.message_idnr",
+-		"group by m.message_idnr",
++		"group by k.message_idnr",
+ 		DBPFX, DBPFX,
+ 		filterCondition);
+