diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile
index f6ab6d1e2131..fcbab13fb426 100644
--- a/mail/claws-mail-address_keeper/Makefile
+++ b/mail/claws-mail-address_keeper/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	address_keeper
-PORTVERSION=	1.0.2
+PORTVERSION=	1.0.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	claws-mail-
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Keeps all recipient addresses in an addressbook folder
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
@@ -24,6 +24,9 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
@@ -32,7 +35,4 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 .include <bsd.port.mk>
diff --git a/mail/claws-mail-address_keeper/distinfo b/mail/claws-mail-address_keeper/distinfo
index 98238a5437fe..5e93c01151b2 100644
--- a/mail/claws-mail-address_keeper/distinfo
+++ b/mail/claws-mail-address_keeper/distinfo
@@ -1,2 +1,2 @@
-SHA256 (address_keeper-1.0.2.tar.gz) = 55fa21e0979daeeb193684932e4f94b95effaff3c97f540ff470d9f90106655f
-SIZE (address_keeper-1.0.2.tar.gz) = 360137
+SHA256 (address_keeper-1.0.3.tar.gz) = 5bf241e8b525dcafade4c0fc1f46bab95c986ce2a8a915b87f85b5bad65847a6
+SIZE (address_keeper-1.0.3.tar.gz) = 360299
diff --git a/mail/claws-mail-archiver/Makefile b/mail/claws-mail-archiver/Makefile
index f1d0e80872ea..87ece30bcd7e 100644
--- a/mail/claws-mail-archiver/Makefile
+++ b/mail/claws-mail-archiver/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	archiver
-PORTVERSION=	0.6.8
-PORTREVISION=	1
+PORTVERSION=	0.6.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -16,8 +15,8 @@ DISTNAME=	archive-${PORTVERSION}
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	mail archiver plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
diff --git a/mail/claws-mail-archiver/distinfo b/mail/claws-mail-archiver/distinfo
index 40c517c90ead..3e474d54d841 100644
--- a/mail/claws-mail-archiver/distinfo
+++ b/mail/claws-mail-archiver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (archive-0.6.8.tar.gz) = d1ff32ea165bf25102233ff93d91d23fd51d8d259e5b1b5ab3d20db07cff0778
-SIZE (archive-0.6.8.tar.gz) = 437726
+SHA256 (archive-0.6.9.tar.gz) = b8d336b9e5d4c7b72ef57ecd3f5b7055cd70fef883b868050e27bce7c408e509
+SIZE (archive-0.6.9.tar.gz) = 437775
diff --git a/mail/claws-mail-att_remover/Makefile b/mail/claws-mail-att_remover/Makefile
index 5e2af8cc3b23..a42539f56527 100644
--- a/mail/claws-mail-att_remover/Makefile
+++ b/mail/claws-mail-att_remover/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	att_remover
 PORTVERSION=	1.0.12
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	claws-mail-
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Attachments removing plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index f2037359a828..fe3895b696a3 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	attach_warner
-PORTVERSION=	0.2.20
-PORTREVISION=	1
+PORTVERSION=	0.2.21
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -16,8 +15,8 @@ DISTNAME=	attachwarner-${PORTVERSION}
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Not attached file warning plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
@@ -25,8 +24,9 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	--with-iconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-attach_warner/distinfo b/mail/claws-mail-attach_warner/distinfo
index f82afe374473..8b646b28b247 100644
--- a/mail/claws-mail-attach_warner/distinfo
+++ b/mail/claws-mail-attach_warner/distinfo
@@ -1,2 +1,2 @@
-SHA256 (attachwarner-0.2.20.tar.gz) = 57133081fcf7c6ab24c90c6fa6e74a8bbe49983f935e651430862ceb73d86696
-SIZE (attachwarner-0.2.20.tar.gz) = 372535
+SHA256 (attachwarner-0.2.21.tar.gz) = e594438d92d85a1b11257f190dadf639f0159c8a7eae926c8363e46f1691b1f7
+SIZE (attachwarner-0.2.21.tar.gz) = 374350
diff --git a/mail/claws-mail-attach_warner/pkg-plist b/mail/claws-mail-attach_warner/pkg-plist
index 17acdb064a93..fe1dc1918f5e 100644
--- a/mail/claws-mail-attach_warner/pkg-plist
+++ b/mail/claws-mail-attach_warner/pkg-plist
@@ -11,8 +11,10 @@ lib/claws-mail/plugins/attachwarner.so
 %%NLS%%share/locale/id/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/it/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/uk/LC_MESSAGES/attachwarner.mo
diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile
index d486432ea65c..e8b132fd29b1 100644
--- a/mail/claws-mail-bsfilter/Makefile
+++ b/mail/claws-mail-bsfilter/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	bsfilter
 PORTVERSION=	1.0.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -16,8 +16,8 @@ DISTNAME=	bsfilter_plugin-${PORTVERSION}
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	bsfilter plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
@@ -25,8 +25,9 @@ USE_GMAKE=	yes
 USE_XORG=	x11
 USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index 8e9efdb6afff..3341eb8876d2 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cachesaver
 PORTVERSION=	0.10.9
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	claws-mail-
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Cache saving plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index f3cb49e3162e..e64aa9436805 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamd
-PORTVERSION=	3.5
+PORTVERSION=	3.5.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -14,8 +14,8 @@ PKGNAMEPREFIX=	claws-mail-
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	This plugin scans messages using clamd (Clam AV)
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail \
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail \
 		clamd:${PORTSDIR}/security/clamav
 
 LICENSE=	GPLv3
@@ -25,6 +25,9 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
 
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
+
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
 PLIST_SUB+=	NLS="@comment "
@@ -33,9 +36,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
 
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-
 post-install:
 	@${ECHO}
 	@${ECHO_CMD} "********************************************************************************"
diff --git a/mail/claws-mail-clamd/distinfo b/mail/claws-mail-clamd/distinfo
index c4b87350cc6c..81bc0f9f5a58 100644
--- a/mail/claws-mail-clamd/distinfo
+++ b/mail/claws-mail-clamd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clamd-3.5.tar.gz) = 5c15ab75d6decd3cb6428c31d76479238a90df1e6b31be259b6f761420e017db
-SIZE (clamd-3.5.tar.gz) = 376200
+SHA256 (clamd-3.5.1.tar.gz) = ff9fe70467d89792719771c0cdd27fa57a71152a410ded2fbb1c2a9950fd402d
+SIZE (clamd-3.5.1.tar.gz) = 376361
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index 62446ea9c789..c6c77b479405 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fancy
-PORTVERSION=	0.9.12
+PORTVERSION=	0.9.13
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -16,8 +16,8 @@ COMMENT=	Webkit based HTML renderer plugin for claws-mail
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		webkit:${PORTSDIR}/www/webkit-gtk2
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
@@ -26,8 +26,9 @@ USE_AUTOTOOLS=	autoconf
 USE_ICONV=	yes
 USE_GNOME=	gtk20
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-fancy/distinfo b/mail/claws-mail-fancy/distinfo
index 063586a36558..ae145346d052 100644
--- a/mail/claws-mail-fancy/distinfo
+++ b/mail/claws-mail-fancy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fancy-0.9.12.tar.gz) = 390088fff016440ba984b71496f700e9f14f30f535a869d4a41544b33c7277d0
-SIZE (fancy-0.9.12.tar.gz) = 369284
+SHA256 (fancy-0.9.13.tar.gz) = 9404628b375fd0b90e388d2fba3835853ac6fb4e70229ccd43d4cabc34f8fb40
+SIZE (fancy-0.9.13.tar.gz) = 369308
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 5969717bee78..3152848b13f3 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fetchinfo
 PORTVERSION=	0.4.24
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -16,8 +16,8 @@ DISTNAME=	${PORTNAME}-plugin-${PORTVERSION}
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Header insertation plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index 1e62a6081694..0d6e62e50d94 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml2_viewer
-PORTVERSION=	0.29
+PORTVERSION=	0.30
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -15,8 +15,8 @@ MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	HTML renderer plugin for claws-mail
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
@@ -25,8 +25,9 @@ USE_AUTOTOOLS=	autoconf
 USE_GNOME=	gtk20
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-gtkhtml2_viewer/distinfo b/mail/claws-mail-gtkhtml2_viewer/distinfo
index 3cf9d4c3839f..139d84fa7312 100644
--- a/mail/claws-mail-gtkhtml2_viewer/distinfo
+++ b/mail/claws-mail-gtkhtml2_viewer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtkhtml2_viewer-0.29.tar.gz) = 013aa09554bc02a02132a8c862761ce55a36f3951c768709713712125716a80d
-SIZE (gtkhtml2_viewer-0.29.tar.gz) = 684361
+SHA256 (gtkhtml2_viewer-0.30.tar.gz) = 89189b09c44a7e9194a188132f7a7c43d087d02814939c4d35bbdfa6a787a350
+SIZE (gtkhtml2_viewer-0.30.tar.gz) = 684440
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 8843e51da031..1eafb5972310 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	mailmbox
 PORTVERSION=	1.14.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	claws-mail-
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Mbox maildir plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index 055f9e8287dd..72e771ee7612 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	newmail
 PORTVERSION=	0.0.15
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -15,8 +15,8 @@ PKGNAMEPREFIX=	claws-mail-
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Message header summary logging plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index b6db23785076..b57aad680db2 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	notification
-PORTVERSION=	0.26
-PORTREVISION=	1
+PORTVERSION=	0.27
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -17,16 +16,17 @@ MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	New/unread mail notification plugin for claws-mail
 
 LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-notification/distinfo b/mail/claws-mail-notification/distinfo
index 6a35e526eb93..bea1f07aff79 100644
--- a/mail/claws-mail-notification/distinfo
+++ b/mail/claws-mail-notification/distinfo
@@ -1,2 +1,2 @@
-SHA256 (notification_plugin-0.26.tar.gz) = 869f5ffd1f75d1d0ab862526580fd881598499a447ef099239c86bd465b94ce1
-SIZE (notification_plugin-0.26.tar.gz) = 532171
+SHA256 (notification_plugin-0.27.tar.gz) = 9aae2683be9324f1fec7610af121e073c947d5552784cc1714416b8f46f5e55d
+SIZE (notification_plugin-0.27.tar.gz) = 532402
diff --git a/mail/claws-mail-perl/Makefile b/mail/claws-mail-perl/Makefile
index d4ce5d493198..e7320ecfddaa 100644
--- a/mail/claws-mail-perl/Makefile
+++ b/mail/claws-mail-perl/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	perl
 PORTVERSION=	0.9.18
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -16,8 +16,8 @@ DISTNAME=	perl_plugin-${PORTVERSION}
 MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Perl filtering plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
diff --git a/mail/claws-mail-python/Makefile b/mail/claws-mail-python/Makefile
index 933f818c8936..b8651648f185 100644
--- a/mail/claws-mail-python/Makefile
+++ b/mail/claws-mail-python/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	python
-PORTVERSION=	0.6
+PORTVERSION=	0.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -15,8 +15,8 @@ DISTNAME=	python_plugin-${PORTVERSION}
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	Python plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
@@ -25,8 +25,9 @@ USE_GMAKE=	yes
 USE_XORG=	x11
 USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-python/distinfo b/mail/claws-mail-python/distinfo
index 77c95473fc42..34ea3e88232b 100644
--- a/mail/claws-mail-python/distinfo
+++ b/mail/claws-mail-python/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python_plugin-0.6.tar.gz) = 1416f34085a3e9cd4e656630427d256d6fdfef1726c39437579ea242bfdaca12
-SIZE (python_plugin-0.6.tar.gz) = 381574
+SHA256 (python_plugin-0.7.tar.gz) = 089621c55220f9cfb8859e35738d4138fac763b29754ba0dc124f676c3466e2c
+SIZE (python_plugin-0.7.tar.gz) = 381597
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 056825bb371d..d5fc0fb5162a 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rssyl
-PORTVERSION=	0.29
+PORTVERSION=	0.30
 PORTEPOCH=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
@@ -16,19 +16,20 @@ MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	A RSS/Atom plugin for claws-mail
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
 USE_AUTOTOOLS=	autoconf
 USE_ICONV=	yes
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
-	--with-libintl-prefix=${LOCALBASE}
+		--with-libintl-prefix=${LOCALBASE}
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-rssyl/distinfo b/mail/claws-mail-rssyl/distinfo
index 8e5a32aa6de4..845c6c12567f 100644
--- a/mail/claws-mail-rssyl/distinfo
+++ b/mail/claws-mail-rssyl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rssyl-0.29.tar.gz) = dbecd7b5e498bc1c9b5bb594e43b60318f133a0294cbf361bc2d34cc75fea802
-SIZE (rssyl-0.29.tar.gz) = 478325
+SHA256 (rssyl-0.30.tar.gz) = de04ce30734105f3b9d2d407c8f44f83ff845628d5dca39d8198774074d6c700
+SIZE (rssyl-0.30.tar.gz) = 478581
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index 1f5187ec37a3..3e98c9a6aecd 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	spamreport
-PORTVERSION=	0.3.12
-PORTREVISION=	1
+PORTVERSION=	0.3.13
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -17,8 +16,8 @@ MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	SpamReport plugin for claws-mail
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
@@ -26,8 +25,9 @@ USE_GMAKE=	yes
 USE_XORG=	x11
 USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-spamreport/distinfo b/mail/claws-mail-spamreport/distinfo
index f302200e6a27..b5ceacbf775f 100644
--- a/mail/claws-mail-spamreport/distinfo
+++ b/mail/claws-mail-spamreport/distinfo
@@ -1,2 +1,2 @@
-SHA256 (spam_report-0.3.12.tar.gz) = 82269ed64317e8f36a6ee7da30cc5d4e17771849807d5035af7069aefa8722ae
-SIZE (spam_report-0.3.12.tar.gz) = 360618
+SHA256 (spam_report-0.3.13.tar.gz) = 9430f66c710ce5fbb5116024e47c5bcc75db2af06adf614e871e25af0a3f7dcd
+SIZE (spam_report-0.3.13.tar.gz) = 360767
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index 579430b9805e..2fca84822b4f 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	synce
 PORTVERSION=	0.7.5
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -17,8 +17,8 @@ MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Windows CE addressbook plugin for claws-mail
 
 LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
@@ -27,11 +27,11 @@ USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
 
 CONFIGURE_ARGS=	--with-libsynce=${LOCALBASE} \
-	--with-librapi2=${LOCALBASE}
+		--with-librapi2=${LOCALBASE}
 
 PLIST_FILES=	lib/claws-mail/plugins/synce_plugin.a \
-	lib/claws-mail/plugins/synce_plugin.la \
-	lib/claws-mail/plugins/synce_plugin.so
+		lib/claws-mail/plugins/synce_plugin.la \
+		lib/claws-mail/plugins/synce_plugin.so
 
 AUTOTOOLSFILES=	aclocal.m4
 
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index cac35e9aa9b4..7f97fddbf445 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tnef
-PORTVERSION=	0.3.9
-PORTREVISION=	1
+PORTVERSION=	0.3.10
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -16,8 +15,8 @@ DISTNAME=	tnef_parse-${PORTVERSION}
 MAINTAINER=	miwi@FreeBSD.org
 COMMENT=	TNEF parser plugin for claws-mail
 
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
@@ -25,8 +24,9 @@ USE_GMAKE=	yes
 USE_XORG=	x11
 USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+CPPFLAGS=	"-I${LOCALBASE}/include"
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
 		--with-libintl-prefix=${LOCALBASE}
diff --git a/mail/claws-mail-tnef/distinfo b/mail/claws-mail-tnef/distinfo
index ab756314e2f2..2dd75756e5db 100644
--- a/mail/claws-mail-tnef/distinfo
+++ b/mail/claws-mail-tnef/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tnef_parse-0.3.9.tar.gz) = 6448cf7fcbcc964777908852b4bcef72b510be2f1dae766739c987f6c04ba9de
-SIZE (tnef_parse-0.3.9.tar.gz) = 387010
+SHA256 (tnef_parse-0.3.10.tar.gz) = 5fc2cff10519c5b2427e246f339abbb9b5be7a5f43f9dc1a0dba47871aa626e2
+SIZE (tnef_parse-0.3.10.tar.gz) = 387053
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index 261be5ead81f..374d1663557e 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	vcalendar
-PORTVERSION=	2.0.9
-PORTREVISION=	1
+PORTVERSION=	2.0.10
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/ \
 		${MASTER_SITE_LOCAL}
@@ -18,8 +17,8 @@ MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	vCalendar plugin for claws-mail
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.8:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.7.9:${PORTSDIR}/mail/claws-mail
 
 LICENSE=	GPLv3
 
@@ -27,11 +26,12 @@ USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_AUTOTOOLS=	autoconf
 MAKE_JOBS_SAFE=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+CONFIGURE_ENV+=	LDFLAGS="-L${LOCALBASE}/lib"
 
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE} \
-	--with-libintl-prefix=${LOCALBASE}
+		--with-libintl-prefix=${LOCALBASE}
 
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=--disable-nls
diff --git a/mail/claws-mail-vcalendar/distinfo b/mail/claws-mail-vcalendar/distinfo
index 9721b2a31a2e..83fcb0355126 100644
--- a/mail/claws-mail-vcalendar/distinfo
+++ b/mail/claws-mail-vcalendar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vcalendar-2.0.9.tar.gz) = 472a29b0eeabfc8e1d3436d7c1f319b34c84ace273ba6cbba442ad22f92dc0d0
-SIZE (vcalendar-2.0.9.tar.gz) = 833858
+SHA256 (vcalendar-2.0.10.tar.gz) = 7ad186e0f008344e1e06fc1cd68a12e26df7f9a83370b921442054fe8d244e3a
+SIZE (vcalendar-2.0.10.tar.gz) = 833896
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 2e5b3caa42b9..4c07b0d90919 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	claws-mail
-PORTVERSION=	3.7.8
-PORTREVISION=	1
+PORTVERSION=	3.7.9
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	SF/sylpheed-claws/Claws%20Mail/${PORTVERSION}
 
@@ -42,11 +41,12 @@ MAKE_JOBS_SAFE=	yes
 
 MAN1=		claws-mail.1
 
+CFLAGS+=	${PTHREAD_CFLAGS}
+CPPFLAGS+=	-I${LOCALBASE}/include
+
 CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
 
-CONFIGURE_ENV=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
-		CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib" \
+CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 OPTIONS=	ALL		"Enable all options."			off \
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index 2b0e439e67d7..5cb3b4c0e180 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (claws-mail-3.7.8.tar.bz2) = 657742b3c18d138450e0c5932b5a9fb7c1c00e8c794a758ec4829da785885e89
-SIZE (claws-mail-3.7.8.tar.bz2) = 6947244
+SHA256 (claws-mail-3.7.9.tar.bz2) = b3a5d91e25dd0230c21be4163c275869377d220843b57137f97e0ecb4ef776c3
+SIZE (claws-mail-3.7.9.tar.bz2) = 7086757
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index b0cc887fc040..7c305b334a57 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -48,7 +48,6 @@ include/claws-mail/common/template.h
 include/claws-mail/common/timing.h
 include/claws-mail/common/utils.h
 include/claws-mail/common/uuencode.h
-include/claws-mail/common/valgrind.h
 include/claws-mail/common/version.h
 include/claws-mail/common/xml.h
 include/claws-mail/common/xmlprops.h
@@ -312,6 +311,7 @@ share/locale/hu/LC_MESSAGES/claws-mail.mo
 share/locale/id/LC_MESSAGES/claws-mail.mo
 share/locale/it/LC_MESSAGES/claws-mail.mo
 share/locale/ja/LC_MESSAGES/claws-mail.mo
+share/locale/lt/LC_MESSAGES/claws-mail.mo
 share/locale/nl/LC_MESSAGES/claws-mail.mo
 share/locale/pl/LC_MESSAGES/claws-mail.mo
 share/locale/pt_BR/LC_MESSAGES/claws-mail.mo