diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 846da586a64b..6902372c4597 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	dbmail
-PORTVERSION=	3.2.4
+PORTVERSION=	3.2.5
 DISTVERSIONPREFIX=	v
-PORTREVISION=	1
 CATEGORIES=	mail
 
 MAINTAINER=	bofh@FreeBSD.org
diff --git a/mail/dbmail/distinfo b/mail/dbmail/distinfo
index 9f43b55168e8..6a9b342be171 100644
--- a/mail/dbmail/distinfo
+++ b/mail/dbmail/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1591622979
-SHA256 (dbmail-dbmail-v3.2.4_GH0.tar.gz) = 33c5d00f7a2d0a30ac90a220f9942c040fb4c8769a5940392294a874b1f9d549
-SIZE (dbmail-dbmail-v3.2.4_GH0.tar.gz) = 2461068
+TIMESTAMP = 1596742176
+SHA256 (dbmail-dbmail-v3.2.5_GH0.tar.gz) = 54cea77c0be8098c62035adf46ba7d951ab8e121374f916c70498161884115f0
+SIZE (dbmail-dbmail-v3.2.5_GH0.tar.gz) = 2463966
diff --git a/mail/dbmail/files/patch-src_dm__imapsession.c b/mail/dbmail/files/patch-src_dm__imapsession.c
deleted file mode 100644
index 6d1f89b5da5e..000000000000
--- a/mail/dbmail/files/patch-src_dm__imapsession.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- src/dm_imapsession.c.orig	2020-07-23 04:06:59 UTC
-+++ src/dm_imapsession.c
-@@ -804,9 +804,10 @@ static void _fetch_headers(ImapSession *self, body_fet
- 			"m.mailbox_idnr = %" PRIu64 " "
- 			"AND m.message_idnr %s "
- 			"AND status < %d "
--			//"AND n.headername %s IN ('%s') "	//old, from the sql point of view is slow
--			"having seq %s %d "			//patch Cosmin Cioranu, removing the above conditions needs a restriction, patched added
--			"ORDER BY message_idnr, seq",
-+			//"AND n.headername %s IN ('%s') "	//old, from the sql point of view is slow, CC 2020
-+			"GROUP By m.message_idnr, n.headername, v.headervalue "
-+			"having seq %s %d "
-+			"ORDER BY m.message_idnr, seq",
- 			not?"":fieldorder->str,
- 			DBPFX, DBPFX, DBPFX, DBPFX,
- 			self->mailbox->id, p_string_str(range),
diff --git a/mail/dbmail/files/patch-src_dm__misc.c b/mail/dbmail/files/patch-src_dm__misc.c
deleted file mode 100644
index f3cde4915f64..000000000000
--- a/mail/dbmail/files/patch-src_dm__misc.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- src/dm_misc.c.orig	2020-06-29 22:53:45 UTC
-+++ src/dm_misc.c
-@@ -131,6 +131,10 @@ int drop_privileges(char *newuser, char *newgroup)
- 
- int get_opened_fd_count(void)
- {
-+#if defined(__FreeBSD__) || defined(__APPLE__) || defined(__SUNPRO_C) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__)
-+	// BSD like systems don't use proc
-+	return 0;
-+#else
- 	DIR* dir = NULL;
- 	struct dirent* entry = NULL;
- 	char buf[32];
-@@ -147,6 +151,7 @@ int get_opened_fd_count(void)
- 	closedir(dir);
- 
- 	return fd_count - 2; /* exclude '.' and '..' entries */
-+#endif
- }
- 
- void create_unique_id(char *target, uint64_t message_idnr)
diff --git a/mail/dbmail/pkg-plist b/mail/dbmail/pkg-plist
index 853eb600b707..bf4fe854614c 100644
--- a/mail/dbmail/pkg-plist
+++ b/mail/dbmail/pkg-plist
@@ -51,6 +51,7 @@ sbin/dbmail-util
 %%DATADIR%%/mysql/upgrades/32002.mysql
 %%DATADIR%%/mysql/upgrades/32003.mysql
 %%DATADIR%%/mysql/upgrades/32004.mysql
+%%DATADIR%%/mysql/upgrades/32005.mysql
 %%DATADIR%%/oracle/dbmail_grant.sql
 %%DATADIR%%/oracle/dbmail_schema.sql
 %%DATADIR%%/oracle/dbmail_ts.sql
@@ -68,6 +69,7 @@ sbin/dbmail-util
 %%DATADIR%%/postgresql/upgrades/32002.psql
 %%DATADIR%%/postgresql/upgrades/32003.psql
 %%DATADIR%%/postgresql/upgrades/32004.psql
+%%DATADIR%%/postgresql/upgrades/32005.psql
 %%DATADIR%%/sqlite/2_1_7-2_2_0.sqlite
 %%DATADIR%%/sqlite/2_2-3_0.sqlite
 %%DATADIR%%/sqlite/2_2_5-2_3_0.sqlite
@@ -81,6 +83,7 @@ sbin/dbmail-util
 %%DATADIR%%/sqlite/upgrades/32002.sqlite
 %%DATADIR%%/sqlite/upgrades/32003.sqlite
 %%DATADIR%%/sqlite/upgrades/32004.sqlite
+%%DATADIR%%/sqlite/upgrades/32005.sqlite
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/CHANGELOG.md
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL