diff --git a/mail/claws-mail-acpi_notifier/Makefile b/mail/claws-mail-acpi_notifier/Makefile
new file mode 100644
index 0000000000000..bda87448e0fc2
--- /dev/null
+++ b/mail/claws-mail-acpi_notifier/Makefile
@@ -0,0 +1,8 @@
+PORTNAME=	acpi_notifier
+
+COMMENT=	ACPI mail LED notifier plugin for Claws Mail
+
+CLAWS_PLUGINS_BUILD=	${PORTNAME}
+
+.include "../claws-mail/Makefile.claws"
+.include <bsd.port.mk>
diff --git a/mail/claws-mail-acpi_notifier/pkg-descr b/mail/claws-mail-acpi_notifier/pkg-descr
new file mode 100644
index 0000000000000..e0f931227f4aa
--- /dev/null
+++ b/mail/claws-mail-acpi_notifier/pkg-descr
@@ -0,0 +1,3 @@
+This plugin handles various ACPI mail LEDs.
+
+WWW: https://www.claws-mail.org/plugins.php
diff --git a/mail/claws-mail-keyword_warner/Makefile b/mail/claws-mail-keyword_warner/Makefile
new file mode 100644
index 0000000000000..431c9f9f24bee
--- /dev/null
+++ b/mail/claws-mail-keyword_warner/Makefile
@@ -0,0 +1,8 @@
+PORTNAME=	keyword_warner
+
+COMMENT=	Configurable keyword warning plugin for Claws Mail
+
+CLAWS_PLUGINS_BUILD=	${PORTNAME}
+
+.include "../claws-mail/Makefile.claws"
+.include <bsd.port.mk>
diff --git a/mail/claws-mail-keyword_warner/pkg-descr b/mail/claws-mail-keyword_warner/pkg-descr
new file mode 100644
index 0000000000000..0be408a37458b
--- /dev/null
+++ b/mail/claws-mail-keyword_warner/pkg-descr
@@ -0,0 +1,4 @@
+Warns when the user composes a message mentioning an attachment in
+the message body without attaching any files to the message.
+
+WWW: https://www.claws-mail.org/plugin.php?plugin=attachwarner
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 03f22ae0a5642..19833dd3c9fcb 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -1,7 +1,6 @@
 # Created by: Pawel Pekala <c0rn@o2.pl>
 
 PORTNAME=	pdf_viewer
-PORTREVISION=	7
 
 COMMENT=	PDF and PostScript viewer plugin for Claws Mail
 
diff --git a/mail/claws-mail-plugins/Makefile b/mail/claws-mail-plugins/Makefile
index fb3a39b563ca4..f40f14d9768cb 100644
--- a/mail/claws-mail-plugins/Makefile
+++ b/mail/claws-mail-plugins/Makefile
@@ -1,7 +1,7 @@
 # Created by: Rozhuk Ivan <rozhuk.im@gmail.com>
 
 PORTNAME=	claws-mail-plugins
-PORTVERSION=	3.18.0
+PORTVERSION=	3.19.0
 CATEGORIES=	mail news
 
 MAINTAINER=	portmaster@BSDforge.com
diff --git a/mail/claws-mail/Makefile.claws b/mail/claws-mail/Makefile.claws
index 3a213edd4e5fe..2d5520300f3e3 100644
--- a/mail/claws-mail/Makefile.claws
+++ b/mail/claws-mail/Makefile.claws
@@ -1,4 +1,4 @@
-PORTVERSION=	3.18.0
+PORTVERSION=	3.19.0
 CATEGORIES?=	mail
 MASTER_SITES=	http://www.claws-mail.org/download.php?file=releases/
 
diff --git a/mail/claws-mail/Makefile.claws.plugins b/mail/claws-mail/Makefile.claws.plugins
index da608d289646f..b7cce74c255f0 100644
--- a/mail/claws-mail/Makefile.claws.plugins
+++ b/mail/claws-mail/Makefile.claws.plugins
@@ -10,6 +10,7 @@ CLAWS_PLUGINS=	acpi_notifier \
 		fancy \
 		fetchinfo \
 		gdata \
+		keyword_warner \
 		libravatar \
 		litehtml_viewer \
 		mailmbox \
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 42a80325ecb1d..125ee93c2bcef 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,4 +1,3 @@
-TIMESTAMP = 1626114302
-SHA256 (claws-mail-3.18.0.tar.xz) = cb5819e66b4bb3bbd44eb79c58f516a932389367a7900554321c24b509ece6bb
-SHA512 (claws-mail-3.18.0.tar.xz) = 3f73e11fc75234c44c0faf266a196c7f1c80b837fb920fc4a3979ede81f37efd180c006ab6436ae9c2dffde2d6c3bf6340a90d93e1e3fa8821fb09693d030811
-SIZE (claws-mail-3.18.0.tar.xz) = 6517632
+TIMESTAMP = 1649055723
+SHA256 (claws-mail-3.19.0.tar.xz) = 0d0c757a9975da1f97bf5309cd051c18ad6c765fefe9319276aa3a9e48229fa2
+SIZE (claws-mail-3.19.0.tar.xz) = 6543188