diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
new file mode 100644
index 000000000000..6131ff72d8ba
--- /dev/null
+++ b/mail/claws-mail-fancy/Makefile
@@ -0,0 +1,19 @@
+# Created by: Pawel Pekala <c0rn@o2.pl>
+
+PORTNAME=	fancy
+
+COMMENT=	Webkit based HTML renderer plugin for Claws Mail
+
+.include "../claws-mail/Makefile.ver"
+
+.if ${MASTER_OPTIONS:MGTK2}
+BROKEN=	does not build for GTK2 version
+.endif
+.if ${MASTER_OPTIONS:MGTK3}
+LIB_DEPENDS=	libwebkit2gtk-4.0.so:www/webkit2-gtk3
+.endif
+
+CLAWS_PLUGINS_BUILD=	${PORTNAME}
+
+.include "${.CURDIR}/../claws-mail/Makefile.claws"
+.include <bsd.port.mk>
diff --git a/mail/claws-mail-fancy/pkg-descr b/mail/claws-mail-fancy/pkg-descr
new file mode 100644
index 000000000000..7399f2f0fc96
--- /dev/null
+++ b/mail/claws-mail-fancy/pkg-descr
@@ -0,0 +1,3 @@
+This plugin renders HTML e-mail using the WebKit library.
+
+WWW: https://www.claws-mail.org/plugins.php
diff --git a/mail/claws-mail-gdata/Makefile b/mail/claws-mail-gdata/Makefile
index 231131418769..5662326c1dc9 100644
--- a/mail/claws-mail-gdata/Makefile
+++ b/mail/claws-mail-gdata/Makefile
@@ -1,11 +1,9 @@
 PORTNAME=	gdata
 
 COMMENT=	Plugin providing Google Contacts in the Tab-address completion
 WWW=		https://www.claws-mail.org/plugin.php?plugin=gdata
 
-LIB_DEPENDS=	libgdata.so:devel/libgdata
-
-CLAWS_PLUGINS_BUILD=	${PORTNAME}
+BROKEN=	temporarily removed from Claws Mail build
 
 .include "../claws-mail/Makefile.claws"
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-litehtml_viewer/Makefile b/mail/claws-mail-litehtml_viewer/Makefile
index 428d80352bf5..7773d290353c 100644
--- a/mail/claws-mail-litehtml_viewer/Makefile
+++ b/mail/claws-mail-litehtml_viewer/Makefile
@@ -1,18 +1,9 @@
 PORTNAME=	litehtml_viewer
 
 COMMENT=	Viewer plugin for HTML emails, using the litehtml library
 WWW=		https://www.claws-mail.org/plugins.php
 
-USES+=		compiler:c++11-lang gnome
-USE_GNOME=	cairo glib20
-LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
-		libgumbo.so:devel/gumbo \
-		libcurl.so:ftp/curl
-
-CLAWS_PLUGINS_BUILD=	${PORTNAME}
-
-post-configure:
-	@${RM} ${WRKSRC}/version
+BROKEN=	requires newer libgumbo, not yet ported
 
 .include "../claws-mail/Makefile.claws"
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-pdf_viewer/Makefile b/mail/claws-mail-pdf_viewer/Makefile
index 50b9ee0da111..23b92717b8b5 100644
--- a/mail/claws-mail-pdf_viewer/Makefile
+++ b/mail/claws-mail-pdf_viewer/Makefile
@@ -1,14 +1,13 @@
 PORTNAME=	pdf_viewer
-PORTREVISION=	1
 
 COMMENT=	PDF and PostScript viewer plugin for Claws Mail
 WWW=		https://www.claws-mail.org/plugin.php?plugin=pdf_viewer
 
 LIB_DEPENDS=	libpoppler-glib.so:graphics/poppler-glib
 
 USES+=		ghostscript
 
 CLAWS_PLUGINS_BUILD=	${PORTNAME}
 
 .include "../claws-mail/Makefile.claws"
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-plugins/Makefile b/mail/claws-mail-plugins/Makefile
index c962fee3037d..13499141c68e 100644
--- a/mail/claws-mail-plugins/Makefile
+++ b/mail/claws-mail-plugins/Makefile
@@ -1,31 +1,34 @@
 PORTNAME=	claws-mail-plugins
 CATEGORIES=	mail news
 
 MAINTAINER=	portmaster@BSDforge.com
 COMMENT=	claws-mail plugins meta-port
 WWW=		https://www.claws-mail.org/plugins.php
 
 USES=		metaport
 
 .include "${.CURDIR}/../claws-mail/Makefile.ver"
 .include "${.CURDIR}/../claws-mail/Makefile.claws.plugins"
 
 # pgpcore, pgpinline, pgpmime, smime
 CLAWS_PLUGINS+=	pgp
 
 .for _addon in ${CLAWS_PLUGINS:O}
 . if exists(../claws-mail-${_addon})
+_BROKEN!=	${MAKE} -C ../claws-mail-${_addon} -V BROKEN
+.  if ${_BROKEN} == ""
 OPTIONS_DEFINE+=	${_addon:tu}
 ${_addon:tu}_DESC!=	${MAKE} -C ../claws-mail-${_addon} -V COMMENT
+.  endif
 . endif
 .endfor
 
 .include <bsd.port.options.mk>
 
 .for _addon in ${CLAWS_PLUGINS}
 . if ${PORT_OPTIONS:M${_addon:tu}} != ""
 RUN_DEPENDS+=	claws-mail-${_addon}>=0:mail/claws-mail-${_addon}
 . endif
 .endfor
 
 .include <bsd.port.mk>
diff --git a/mail/claws-mail/Makefile.ver b/mail/claws-mail/Makefile.ver
index c4b79c88c63b..fd641b9f3a03 100644
--- a/mail/claws-mail/Makefile.ver
+++ b/mail/claws-mail/Makefile.ver
@@ -1,10 +1,10 @@
 .if !defined(MASTER_OPTIONS)
 MASTER_OPTIONS!=	${MAKE} -C ${.CURDIR}/../claws-mail -V PORT_OPTIONS
 .endif
 
 .if ${MASTER_OPTIONS:MGTK2}
-PORTVERSION=	3.19.1
+PORTVERSION=	3.20.0
 .endif
 .if ${MASTER_OPTIONS:MGTK3}
-PORTVERSION=	4.1.1
+PORTVERSION=	4.2.0
 .endif
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 1c240e132d37..fc1e9579f580 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,5 +1,6 @@
-TIMESTAMP = 1691825727
-SHA256 (claws-mail-3.19.1.tar.xz) = ac57fa557cf15c62e5f8fad247585fc609f0a696f6da54ed42cc000b6c6d6813
-SIZE (claws-mail-3.19.1.tar.xz) = 6580844
-SHA256 (claws-mail-4.1.1.tar.xz) = b189e700c1896f5e0deb0b76d4bfa820eb7ac1935ee10aa9afbada3cf53a0344
-SIZE (claws-mail-4.1.1.tar.xz) = 6523688
+TIMESTAMP = 1700554558
+SHA256 (claws-mail-3.20.0.tar.xz) = 1f2f3d2b2ca39c0c860c7afc5490c790936afbb50cf31debdb2beda728c8d6e5
+SIZE (claws-mail-3.20.0.tar.xz) = 6687376
+TIMESTAMP = 1700554614
+SHA256 (claws-mail-4.2.0.tar.xz) = 7c8ab1732d74197df06d61a6b7ebc7c580ecf6e92eb1ef6ae5b0107533f1af07
+SIZE (claws-mail-4.2.0.tar.xz) = 6674872