51 files changed, 177 insertions, 156 deletions

diff --git a/mail/claws-mail-address_keeper/Makefile b/mail/claws-mail-address_keeper/Makefile
index 7e25c6dff14c..30f080817370 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.4
+PORTVERSION=	1.0.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -16,8 +16,8 @@ COMMENT=	Keeps all recipient addresses in an addressbook folder
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/mail/claws-mail-address_keeper/distinfo b/mail/claws-mail-address_keeper/distinfo
index b0249f040ba4..9efa97bebe8e 100644
--- a/mail/claws-mail-address_keeper/distinfo
+++ b/mail/claws-mail-address_keeper/distinfo
@@ -1,2 +1,2 @@
-SHA256 (address_keeper-1.0.4.tar.gz) = b37b194c69f46e76f1640bbd55da5fd92e519ee3d91181fb67d4599adefcf10e
-SIZE (address_keeper-1.0.4.tar.gz) = 357640
+SHA256 (address_keeper-1.0.5.tar.gz) = 6c4b45983f1a919087dc616a3aca7e88c41bcdcda198d6a5ae9429dfc41ed2be
+SIZE (address_keeper-1.0.5.tar.gz) = 378657
diff --git a/mail/claws-mail-address_keeper/pkg-plist b/mail/claws-mail-address_keeper/pkg-plist
index 0585a80cf3cd..f695331f2202 100644
--- a/mail/claws-mail-address_keeper/pkg-plist
+++ b/mail/claws-mail-address_keeper/pkg-plist
@@ -3,10 +3,14 @@ lib/claws-mail/plugins/address_keeper.la
 lib/claws-mail/plugins/address_keeper.a
 %%NLS%%share/locale/ca/LC_MESSAGES/address_keeper.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/address_keeper.mo
+%%NLS%%share/locale/de/LC_MESSAGES/address_keeper.mo
 %%NLS%%share/locale/es/LC_MESSAGES/address_keeper.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/address_keeper.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/address_keeper.mo
-%%NLS%%share/locale/id/LC_MESSAGES/address_keeper.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/address_keeper.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/address_keeper.mo
+%%NLS%%share/locale/ru/LC_MESSAGES/address_keeper.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/address_keeper.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/address_keeper.mo
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-archiver/Makefile b/mail/claws-mail-archiver/Makefile
index aedbd04914c7..7ee16a2a2088 100644
--- a/mail/claws-mail-archiver/Makefile
+++ b/mail/claws-mail-archiver/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	archiver
-PORTVERSION=	0.6.10
+PORTVERSION=	0.6.11
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
 DISTNAME=	archive-${PORTVERSION}
 
-MAINTAINER=	miwi@FreeBSD.org
+MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	mail archiver plugin for claws-mail
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/mail/claws-mail-archiver/distinfo b/mail/claws-mail-archiver/distinfo
index 45c9cb61f8a3..5837cc607c9d 100644
--- a/mail/claws-mail-archiver/distinfo
+++ b/mail/claws-mail-archiver/distinfo
@@ -1,2 +1,2 @@
-SHA256 (archive-0.6.10.tar.gz) = 93286131af02d34e52757e8a4fd0630876261ef98a0f7096e9a80235e0cad484
-SIZE (archive-0.6.10.tar.gz) = 440526
+SHA256 (archive-0.6.11.tar.gz) = 6db6514a44f03eb3e8325e68ddba67704dca533be9d6838b40ccd2085486ff71
+SIZE (archive-0.6.11.tar.gz) = 460931
diff --git a/mail/claws-mail-att_remover/Makefile b/mail/claws-mail-att_remover/Makefile
index a6b61252163d..81801d100d3d 100644
--- a/mail/claws-mail-att_remover/Makefile
+++ b/mail/claws-mail-att_remover/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	att_remover
-PORTVERSION=	1.0.12
-PORTREVISION=	5
+PORTVERSION=	1.0.13
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -17,8 +16,8 @@ COMMENT=	Attachments removing plugin for claws-mail
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/mail/claws-mail-att_remover/distinfo b/mail/claws-mail-att_remover/distinfo
index 362281831d8e..d04fed0c2b82 100644
--- a/mail/claws-mail-att_remover/distinfo
+++ b/mail/claws-mail-att_remover/distinfo
@@ -1,2 +1,2 @@
-SHA256 (att_remover-1.0.12.tar.gz) = 1071fe132493531798d4951c974c4245aabcdab4b47d8398870127db3ac04766
-SIZE (att_remover-1.0.12.tar.gz) = 292767
+SHA256 (att_remover-1.0.13.tar.gz) = 6bc6cf25819503637f21e746c4b4fe1bd6b1b6ab295b9d6934beaf4a5de67e58
+SIZE (att_remover-1.0.13.tar.gz) = 315845
diff --git a/mail/claws-mail-attach_warner/Makefile b/mail/claws-mail-attach_warner/Makefile
index 2bd1ff596d3c..3c37041a72bd 100644
--- a/mail/claws-mail-attach_warner/Makefile
+++ b/mail/claws-mail-attach_warner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	attach_warner
-PORTVERSION=	0.2.22
+PORTVERSION=	0.2.23
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -17,8 +17,8 @@ COMMENT=	Not attached file warning plugin for claws-mail
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_ICONV=	yes
diff --git a/mail/claws-mail-attach_warner/distinfo b/mail/claws-mail-attach_warner/distinfo
index b4ddc6b7fb32..2ac57264a40b 100644
--- a/mail/claws-mail-attach_warner/distinfo
+++ b/mail/claws-mail-attach_warner/distinfo
@@ -1,2 +1,2 @@
-SHA256 (attachwarner-0.2.22.tar.gz) = a3a02208aba597618fb67268bedf9c69a7893eeb63018b978634bf54307c1f9e
-SIZE (attachwarner-0.2.22.tar.gz) = 375401
+SHA256 (attachwarner-0.2.23.tar.gz) = e493110599071d4da60dde5d34fc7fcf1ae6f54090ad2fc5a020b9bcba968ce2
+SIZE (attachwarner-0.2.23.tar.gz) = 397145
diff --git a/mail/claws-mail-attach_warner/pkg-plist b/mail/claws-mail-attach_warner/pkg-plist
index ac4fb688bf56..8419bc03e066 100644
--- a/mail/claws-mail-attach_warner/pkg-plist
+++ b/mail/claws-mail-attach_warner/pkg-plist
@@ -8,7 +8,7 @@ lib/claws-mail/plugins/attachwarner.so
 %%NLS%%share/locale/fi/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/attachwarner.mo
-%%NLS%%share/locale/id/LC_MESSAGES/attachwarner.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/it/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/attachwarner.mo
@@ -19,3 +19,5 @@ lib/claws-mail/plugins/attachwarner.so
 %%NLS%%share/locale/sk/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/attachwarner.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/attachwarner.mo
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-bsfilter/Makefile b/mail/claws-mail-bsfilter/Makefile
index 0bbb7083e4ca..52bfd9822c0f 100644
--- a/mail/claws-mail-bsfilter/Makefile
+++ b/mail/claws-mail-bsfilter/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	bsfilter
-PORTVERSION=	1.0.6
+PORTVERSION=	1.0.7
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
 DISTNAME=	bsfilter_plugin-${PORTVERSION}
 
-MAINTAINER=	miwi@FreeBSD.org
+MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	bsfilter plugin for claws-mail
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XORG=	x11
diff --git a/mail/claws-mail-bsfilter/distinfo b/mail/claws-mail-bsfilter/distinfo
index 8e7e1c44331e..24d7ff21cb03 100644
--- a/mail/claws-mail-bsfilter/distinfo
+++ b/mail/claws-mail-bsfilter/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bsfilter_plugin-1.0.6.tar.gz) = 14c22b077fbf7acc79725583fafd52dc6c134647d1ba67da29873d7485fa3220
-SIZE (bsfilter_plugin-1.0.6.tar.gz) = 383934
+SHA256 (bsfilter_plugin-1.0.7.tar.gz) = 2e7d8d4c360f360b8f99fc72ee448b2e094db84da559781b4caaa24c7cd7be8e
+SIZE (bsfilter_plugin-1.0.7.tar.gz) = 404553
diff --git a/mail/claws-mail-bsfilter/pkg-plist b/mail/claws-mail-bsfilter/pkg-plist
index 5861c909254b..97a017044945 100644
--- a/mail/claws-mail-bsfilter/pkg-plist
+++ b/mail/claws-mail-bsfilter/pkg-plist
@@ -7,7 +7,7 @@ lib/claws-mail/plugins/bsfilter.so
 %%NLS%%share/locale/fi/LC_MESSAGES/bsfilter_plugin.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/bsfilter_plugin.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/bsfilter_plugin.mo
-%%NLS%%share/locale/id/LC_MESSAGES/bsfilter_plugin.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/bsfilter_plugin.mo
 %%NLS%%share/locale/it/LC_MESSAGES/bsfilter_plugin.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/bsfilter_plugin.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/bsfilter_plugin.mo
@@ -15,3 +15,5 @@ lib/claws-mail/plugins/bsfilter.so
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/bsfilter_plugin.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/bsfilter_plugin.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/bsfilter_plugin.mo
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-cachesaver/Makefile b/mail/claws-mail-cachesaver/Makefile
index ba12e39bd7dc..fbd36f43ff97 100644
--- a/mail/claws-mail-cachesaver/Makefile
+++ b/mail/claws-mail-cachesaver/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cachesaver
 PORTVERSION=	0.10.9
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -17,8 +17,8 @@ COMMENT=	Cache saving plugin for claws-mail
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/mail/claws-mail-clamd/Makefile b/mail/claws-mail-clamd/Makefile
index 093bc5fd2c1f..f4b8a073bacf 100644
--- a/mail/claws-mail-clamd/Makefile
+++ b/mail/claws-mail-clamd/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	clamd
-PORTVERSION=	3.5.2
+PORTVERSION=	3.5.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -16,8 +16,8 @@ COMMENT=	This plugin scans messages using clamd (Clam AV)
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail \
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail \
 		clamd:${PORTSDIR}/security/clamav
 
 GNU_CONFIGURE=	yes
diff --git a/mail/claws-mail-clamd/distinfo b/mail/claws-mail-clamd/distinfo
index 8d9ea066e942..2f3a8d65051f 100644
--- a/mail/claws-mail-clamd/distinfo
+++ b/mail/claws-mail-clamd/distinfo
@@ -1,2 +1,2 @@
-SHA256 (clamd-3.5.2.tar.gz) = 1779c82a56d600414a0f725deb13268bc971229d8d322d6c77cb938f114f7cc4
-SIZE (clamd-3.5.2.tar.gz) = 384591
+SHA256 (clamd-3.5.3.tar.gz) = 8d74d775d8374570092bb2998d4ab282fc84f9e6201260f6179753b0a91bf9c8
+SIZE (clamd-3.5.3.tar.gz) = 405453
diff --git a/mail/claws-mail-clamd/pkg-plist b/mail/claws-mail-clamd/pkg-plist
index 629dbada2e8a..4951eb17a0a6 100644
--- a/mail/claws-mail-clamd/pkg-plist
+++ b/mail/claws-mail-clamd/pkg-plist
@@ -7,8 +7,10 @@ lib/claws-mail/plugins/clamd.a
 %%NLS%%share/locale/fi/LC_MESSAGES/clamd.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/clamd.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/clamd.mo
-%%NLS%%share/locale/id/LC_MESSAGES/clamd.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/clamd.mo
 %%NLS%%share/locale/it/LC_MESSAGES/clamd.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/clamd.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/clamd.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/clamd.mo
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-fancy/Makefile b/mail/claws-mail-fancy/Makefile
index 684f602d9274..0433a40ddd46 100644
--- a/mail/claws-mail-fancy/Makefile
+++ b/mail/claws-mail-fancy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	fancy
-PORTVERSION=	0.9.14
+PORTVERSION=	0.9.15
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -17,9 +17,10 @@ COMMENT=	Webkit based HTML renderer plugin for claws-mail
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
+		soup-gnome:${PORTSDIR}/devel/libsoup-gnome \
 		webkitgtk-1.0:${PORTSDIR}/www/webkit-gtk2
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/mail/claws-mail-fancy/distinfo b/mail/claws-mail-fancy/distinfo
index 063ac600faff..1ac6de8aa518 100644
--- a/mail/claws-mail-fancy/distinfo
+++ b/mail/claws-mail-fancy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (fancy-0.9.14.tar.gz) = ac2e4c6be91c11ecb8f99924bf5e9505c487d237abbdd53492f21bacc96bc178
-SIZE (fancy-0.9.14.tar.gz) = 375191
+SHA256 (fancy-0.9.15.tar.gz) = 84694d1b00356430a208450dcd8b0853ae1734e97858c26514ca84e4edb8d617
+SIZE (fancy-0.9.15.tar.gz) = 396969
diff --git a/mail/claws-mail-fancy/pkg-plist b/mail/claws-mail-fancy/pkg-plist
index c9cc6a9f6dca..59c8c4eef130 100644
--- a/mail/claws-mail-fancy/pkg-plist
+++ b/mail/claws-mail-fancy/pkg-plist
@@ -8,7 +8,7 @@ lib/claws-mail/plugins/fancy.a
 %%NLS%%share/locale/fi/LC_MESSAGES/fancy.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/fancy.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/fancy.mo
-%%NLS%%share/locale/id/LC_MESSAGES/fancy.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/fancy.mo
 %%NLS%%share/locale/it/LC_MESSAGES/fancy.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/fancy.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/fancy.mo
@@ -16,3 +16,5 @@ lib/claws-mail/plugins/fancy.a
 %%NLS%%share/locale/ru/LC_MESSAGES/fancy.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/fancy.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/fancy.mo
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-fetchinfo/Makefile b/mail/claws-mail-fetchinfo/Makefile
index 0d3754634554..d7423b14e434 100644
--- a/mail/claws-mail-fetchinfo/Makefile
+++ b/mail/claws-mail-fetchinfo/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	fetchinfo
 PORTVERSION=	0.4.24
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -18,8 +18,8 @@ COMMENT=	Header insertation plugin for claws-mail
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/mail/claws-mail-gtkhtml2_viewer/Makefile b/mail/claws-mail-gtkhtml2_viewer/Makefile
index 0bf9f4dcd1c3..eaa494019dca 100644
--- a/mail/claws-mail-gtkhtml2_viewer/Makefile
+++ b/mail/claws-mail-gtkhtml2_viewer/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtkhtml2_viewer
-PORTVERSION=	0.31
+PORTVERSION=	0.32
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -17,8 +17,8 @@ COMMENT=	HTML renderer plugin for claws-mail
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/mail/claws-mail-gtkhtml2_viewer/distinfo b/mail/claws-mail-gtkhtml2_viewer/distinfo
index 0cda1f4d107a..31b53529caa5 100644
--- a/mail/claws-mail-gtkhtml2_viewer/distinfo
+++ b/mail/claws-mail-gtkhtml2_viewer/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gtkhtml2_viewer-0.31.tar.gz) = 4d41f6d961efaac0f51705e5052bac732bc0bdafee2ef2082a9cf9d89f183ae5
-SIZE (gtkhtml2_viewer-0.31.tar.gz) = 693080
+SHA256 (gtkhtml2_viewer-0.32.tar.gz) = 0f5c1918ba97b8db5df3552ea4ae3de689c36f400f6427217050f60b998e96a9
+SIZE (gtkhtml2_viewer-0.32.tar.gz) = 713715
diff --git a/mail/claws-mail-gtkhtml2_viewer/pkg-plist b/mail/claws-mail-gtkhtml2_viewer/pkg-plist
index 7cae561dccee..2ebc9057d6e1 100644
--- a/mail/claws-mail-gtkhtml2_viewer/pkg-plist
+++ b/mail/claws-mail-gtkhtml2_viewer/pkg-plist
@@ -8,7 +8,7 @@ lib/claws-mail/plugins/gtkhtml2_viewer.so
 %%NLS%%share/locale/fi/LC_MESSAGES/gtkhtml2_viewer.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/gtkhtml2_viewer.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/gtkhtml2_viewer.mo
-%%NLS%%share/locale/id/LC_MESSAGES/gtkhtml2_viewer.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/gtkhtml2_viewer.mo
 %%NLS%%share/locale/it/LC_MESSAGES/gtkhtml2_viewer.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/gtkhtml2_viewer.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/gtkhtml2_viewer.mo
@@ -19,3 +19,5 @@ lib/claws-mail/plugins/gtkhtml2_viewer.so
 %%NLS%%share/locale/sk/LC_MESSAGES/gtkhtml2_viewer.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/gtkhtml2_viewer.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/gtkhtml2_viewer.mo
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-mailmbox/Makefile b/mail/claws-mail-mailmbox/Makefile
index 84729804b53e..9d5a676cafac 100644
--- a/mail/claws-mail-mailmbox/Makefile
+++ b/mail/claws-mail-mailmbox/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	mailmbox
-PORTVERSION=	1.14.5
-PORTREVISION=	3
+PORTVERSION=	1.14.6
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -17,8 +16,8 @@ COMMENT=	Mbox maildir plugin for claws-mail
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/mail/claws-mail-mailmbox/distinfo b/mail/claws-mail-mailmbox/distinfo
index 309108113aff..cbed88be411e 100644
--- a/mail/claws-mail-mailmbox/distinfo
+++ b/mail/claws-mail-mailmbox/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mailmbox-1.14.5.tar.gz) = c8e572a1055d54affccbc70dab25beabefe88dbf3eb4de08400ff9746377db70
-SIZE (mailmbox-1.14.5.tar.gz) = 370793
+SHA256 (mailmbox-1.14.6.tar.gz) = 69832423fcf8a3e99e77ebbc95309cde840e75c16f30d5a81d291225b14e8b0c
+SIZE (mailmbox-1.14.6.tar.gz) = 391438
diff --git a/mail/claws-mail-newmail/Makefile b/mail/claws-mail-newmail/Makefile
index f0a9be84c4cc..022b1674cb06 100644
--- a/mail/claws-mail-newmail/Makefile
+++ b/mail/claws-mail-newmail/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	newmail
 PORTVERSION=	0.0.15
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -17,8 +17,8 @@ COMMENT=	Message header summary logging plugin for claws-mail
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/mail/claws-mail-notification/Makefile b/mail/claws-mail-notification/Makefile
index 62e9293e674a..01c485c35060 100644
--- a/mail/claws-mail-notification/Makefile
+++ b/mail/claws-mail-notification/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	notification
-PORTVERSION=	0.28
+PORTVERSION=	0.29
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -18,8 +18,8 @@ COMMENT=	New/unread mail notification plugin for claws-mail
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	notify:${PORTSDIR}/devel/libnotify
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/mail/claws-mail-notification/distinfo b/mail/claws-mail-notification/distinfo
index c42614badbfe..05b95117ac21 100644
--- a/mail/claws-mail-notification/distinfo
+++ b/mail/claws-mail-notification/distinfo
@@ -1,2 +1,2 @@
-SHA256 (notification_plugin-0.28.tar.gz) = 61923e412111bea5c79a1bcb3f676e4a8b681ce9704287ea2649bfc0014ff530
-SIZE (notification_plugin-0.28.tar.gz) = 538454
+SHA256 (notification_plugin-0.29.tar.gz) = 44adf98cb01a018bd78e637265acd7169ddc1aa7c7f549d9a6b99a9035fe174b
+SIZE (notification_plugin-0.29.tar.gz) = 558931
diff --git a/mail/claws-mail-notification/pkg-plist b/mail/claws-mail-notification/pkg-plist
index 094f2f120165..9a1b1e3aaf0d 100644
--- a/mail/claws-mail-notification/pkg-plist
+++ b/mail/claws-mail-notification/pkg-plist
@@ -1,14 +1,14 @@
-include/notification_plugin/gtkhotkey/eggaccelerators.h
-include/notification_plugin/gtkhotkey/gtk-hotkey-error.h
-include/notification_plugin/gtkhotkey/gtk-hotkey-info.h
-include/notification_plugin/gtkhotkey/gtk-hotkey-key-file-registry.h
-include/notification_plugin/gtkhotkey/gtk-hotkey-listener.h
-include/notification_plugin/gtkhotkey/gtk-hotkey-marshal.h
-include/notification_plugin/gtkhotkey/gtk-hotkey-registry.h
-include/notification_plugin/gtkhotkey/gtk-hotkey-utils.h
-include/notification_plugin/gtkhotkey/gtk-hotkey-x11-listener.h
-include/notification_plugin/gtkhotkey/gtkhotkey.h
-include/notification_plugin/gtkhotkey/tomboykeybinder.h
+include/claws-mail/plugins/notification_plugin/gtkhotkey/eggaccelerators.h
+include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-error.h
+include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-info.h
+include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-key-file-registry.h
+include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-listener.h
+include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-marshal.h
+include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-registry.h
+include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-utils.h
+include/claws-mail/plugins/notification_plugin/gtkhotkey/gtk-hotkey-x11-listener.h
+include/claws-mail/plugins/notification_plugin/gtkhotkey/gtkhotkey.h
+include/claws-mail/plugins/notification_plugin/gtkhotkey/tomboykeybinder.h
 lib/claws-mail/plugins/notification_plugin.a
 lib/claws-mail/plugins/notification_plugin.la
 lib/claws-mail/plugins/notification_plugin.so
@@ -18,7 +18,7 @@ lib/claws-mail/plugins/notification_plugin.so
 %%NLS%%share/locale/fi/LC_MESSAGES/notification_plugin.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/notification_plugin.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/notification_plugin.mo
-%%NLS%%share/locale/id/LC_MESSAGES/notification_plugin.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/notification_plugin.mo
 %%NLS%%share/locale/it/LC_MESSAGES/notification_plugin.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/notification_plugin.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/notification_plugin.mo
@@ -27,5 +27,9 @@ lib/claws-mail/plugins/notification_plugin.so
 %%NLS%%share/locale/ru/LC_MESSAGES/notification_plugin.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/notification_plugin.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/notification_plugin.mo
-@dirrm include/notification_plugin/gtkhotkey
-@dirrm include/notification_plugin
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
+@dirrm include/claws-mail/plugins/notification_plugin/gtkhotkey
+@dirrm include/claws-mail/plugins/notification_plugin
+@dirrmtry include/claws-mail/plugins
+@dirrmtry include/claws-mail
diff --git a/mail/claws-mail-perl/Makefile b/mail/claws-mail-perl/Makefile
index 5230b8233e78..8530856b3b33 100644
--- a/mail/claws-mail-perl/Makefile
+++ b/mail/claws-mail-perl/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	perl
-PORTVERSION=	0.9.18
-PORTREVISION=	5
+PORTVERSION=	0.9.19
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -18,8 +17,8 @@ COMMENT=	Perl filtering plugin for claws-mail
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/mail/claws-mail-perl/distinfo b/mail/claws-mail-perl/distinfo
index 67c558752bd1..13916ee778de 100644
--- a/mail/claws-mail-perl/distinfo
+++ b/mail/claws-mail-perl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (perl_plugin-0.9.18.tar.gz) = f0e2af42efffd0ceba5a5f77f76fbdb72f63e7b4f5a0b77a0689c6872257b3c8
-SIZE (perl_plugin-0.9.18.tar.gz) = 317763
+SHA256 (perl_plugin-0.9.19.tar.gz) = a1e8c9a9ff8087325b65af6e9077a4540b716efcf8a682a2b13276d0125fc7d0
+SIZE (perl_plugin-0.9.19.tar.gz) = 341226
diff --git a/mail/claws-mail-python/Makefile b/mail/claws-mail-python/Makefile
index 2f9bd6bd987c..49f6a35ba765 100644
--- a/mail/claws-mail-python/Makefile
+++ b/mail/claws-mail-python/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	python
-PORTVERSION=	0.8
+PORTVERSION=	0.9
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
 DISTNAME=	python_plugin-${PORTVERSION}
 
-MAINTAINER=	miwi@FreeBSD.org
+MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	Python plugin for claws-mail
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GNOME=	pygtk2
 USE_GMAKE=	yes
diff --git a/mail/claws-mail-python/distinfo b/mail/claws-mail-python/distinfo
index daa6e641a27e..29a76885aaaf 100644
--- a/mail/claws-mail-python/distinfo
+++ b/mail/claws-mail-python/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python_plugin-0.8.tar.gz) = dcca71dbcd67f4dda90b31fc363447f093ef1f7e1769ab6a218f440cfba67eb3
-SIZE (python_plugin-0.8.tar.gz) = 382129
+SHA256 (python_plugin-0.9.tar.gz) = 3a5ec710da975d2480efd2f1d90d65ba6a1d71844beb638890dd97dc380a2f03
+SIZE (python_plugin-0.9.tar.gz) = 402942
diff --git a/mail/claws-mail-python/pkg-plist b/mail/claws-mail-python/pkg-plist
index 77f85d963471..90739fe01840 100644
--- a/mail/claws-mail-python/pkg-plist
+++ b/mail/claws-mail-python/pkg-plist
@@ -7,10 +7,12 @@ lib/claws-mail/plugins/python_plugin.so
 %%NLS%%share/locale/fi/LC_MESSAGES/python_plugin.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/python_plugin.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/python_plugin.mo
-%%NLS%%share/locale/id/LC_MESSAGES/python_plugin.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/python_plugin.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/python_plugin.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/python_plugin.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/python_plugin.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/python_plugin.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/python_plugin.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/python_plugin.mo
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-rssyl/Makefile b/mail/claws-mail-rssyl/Makefile
index 47ac84d79ba9..a3670a5538ec 100644
--- a/mail/claws-mail-rssyl/Makefile
+++ b/mail/claws-mail-rssyl/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rssyl
-PORTVERSION=	0.31
+PORTVERSION=	0.32
 PORTEPOCH=	4
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
@@ -18,8 +18,8 @@ COMMENT=	A RSS/Atom plugin for claws-mail
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_AUTOTOOLS=	autoconf
 USE_ICONV=	yes
diff --git a/mail/claws-mail-rssyl/distinfo b/mail/claws-mail-rssyl/distinfo
index a344f0461210..46cd6a5cc891 100644
--- a/mail/claws-mail-rssyl/distinfo
+++ b/mail/claws-mail-rssyl/distinfo
@@ -1,2 +1,2 @@
-SHA256 (rssyl-0.31.tar.gz) = d093d4950b09444f83e59982c742d835f85e3cd635728f99566733d036f004ce
-SIZE (rssyl-0.31.tar.gz) = 482749
+SHA256 (rssyl-0.32.tar.gz) = 72ef4ba3b86c84505300f8b7d7905dde9b1677f6ab5d74e9e529e8569ab1db01
+SIZE (rssyl-0.32.tar.gz) = 502613
diff --git a/mail/claws-mail-rssyl/pkg-plist b/mail/claws-mail-rssyl/pkg-plist
index 012559d9171b..698d896366e9 100644
--- a/mail/claws-mail-rssyl/pkg-plist
+++ b/mail/claws-mail-rssyl/pkg-plist
@@ -8,7 +8,7 @@ lib/claws-mail/plugins/rssyl.so
 %%NLS%%share/locale/fi/LC_MESSAGES/rssyl.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/rssyl.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/rssyl.mo
-%%NLS%%share/locale/id/LC_MESSAGES/rssyl.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/rssyl.mo
 %%NLS%%share/locale/it/LC_MESSAGES/rssyl.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/rssyl.mo
 %%NLS%%share/locale/nl/LC_MESSAGES/rssyl.mo
@@ -19,3 +19,5 @@ lib/claws-mail/plugins/rssyl.so
 %%NLS%%share/locale/sr/LC_MESSAGES/rssyl.mo
 %%NLS%%share/locale/sv/LC_MESSAGES/rssyl.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/rssyl.mo
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-spamreport/Makefile b/mail/claws-mail-spamreport/Makefile
index a838eb888679..cb3c3ad2971c 100644
--- a/mail/claws-mail-spamreport/Makefile
+++ b/mail/claws-mail-spamreport/Makefile
@@ -6,20 +6,20 @@
 #
 
 PORTNAME=	spamreport
-PORTVERSION=	0.3.14
+PORTVERSION=	0.3.15
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
 DISTNAME=	spam_report-${PORTVERSION}
 
-MAINTAINER=	miwi@FreeBSD.org
+MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	SpamReport plugin for claws-mail
 
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	curl.6:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XORG=	x11
diff --git a/mail/claws-mail-spamreport/distinfo b/mail/claws-mail-spamreport/distinfo
index 6e88feb23743..275a1da29163 100644
--- a/mail/claws-mail-spamreport/distinfo
+++ b/mail/claws-mail-spamreport/distinfo
@@ -1,2 +1,2 @@
-SHA256 (spam_report-0.3.14.tar.gz) = 03a4775fdaf0ac6336b4be25200070dcb58bf7b00034b8c07c798cca13fd88ce
-SIZE (spam_report-0.3.14.tar.gz) = 359259
+SHA256 (spam_report-0.3.15.tar.gz) = 08cbcf22a199cc53cc5daf70e8edb9115fee3cdd92a79dc5c99623fb7948aae6
+SIZE (spam_report-0.3.15.tar.gz) = 378826
diff --git a/mail/claws-mail-spamreport/pkg-plist b/mail/claws-mail-spamreport/pkg-plist
index 8482cace65b5..441342ad773b 100644
--- a/mail/claws-mail-spamreport/pkg-plist
+++ b/mail/claws-mail-spamreport/pkg-plist
@@ -7,7 +7,7 @@ lib/claws-mail/plugins/spamreport.so
 %%NLS%%share/locale/fi/LC_MESSAGES/spam_report.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/spam_report.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/spam_report.mo
-%%NLS%%share/locale/id/LC_MESSAGES/spam_report.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/spam_report.mo
 %%NLS%%share/locale/it/LC_MESSAGES/spam_report.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/spam_report.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/spam_report.mo
@@ -16,3 +16,5 @@ lib/claws-mail/plugins/spamreport.so
 %%NLS%%share/locale/ru/LC_MESSAGES/spam_report.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/spam_report.mo
 %%NLS%%share/locale/uk/LC_MESSAGES/spam_report.mo
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-synce/Makefile b/mail/claws-mail-synce/Makefile
index 9f2e76002765..bfe208860fcd 100644
--- a/mail/claws-mail-synce/Makefile
+++ b/mail/claws-mail-synce/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	synce
 PORTVERSION=	0.7.5
-PORTREVISION=	14
+PORTREVISION=	15
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
@@ -19,8 +19,8 @@ COMMENT=	Windows CE addressbook plugin for claws-mail
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	rapi.2:${PORTSDIR}/palm/synce-librapi2
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	autoconf
diff --git a/mail/claws-mail-tnef/Makefile b/mail/claws-mail-tnef/Makefile
index d828a94359ca..cc31c9f9b2b9 100644
--- a/mail/claws-mail-tnef/Makefile
+++ b/mail/claws-mail-tnef/Makefile
@@ -6,19 +6,19 @@
 #
 
 PORTNAME=	tnef
-PORTVERSION=	0.3.11
+PORTVERSION=	0.3.12
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/
 PKGNAMEPREFIX=	claws-mail-
 DISTNAME=	tnef_parse-${PORTVERSION}
 
-MAINTAINER=	miwi@FreeBSD.org
+MAINTAINER=	pawel@FreeBSD.org
 COMMENT=	TNEF parser plugin for claws-mail
 
 LICENSE=	GPLv3
 
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_XORG=	x11
diff --git a/mail/claws-mail-tnef/distinfo b/mail/claws-mail-tnef/distinfo
index 5c92539e744a..5e08d075cc32 100644
--- a/mail/claws-mail-tnef/distinfo
+++ b/mail/claws-mail-tnef/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tnef_parse-0.3.11.tar.gz) = 56ad2e1f266593cc8da9ce038a08d83d946b2ff82bce9a6223f0f59f972818b0
-SIZE (tnef_parse-0.3.11.tar.gz) = 388704
+SHA256 (tnef_parse-0.3.12.tar.gz) = 728b62ed823eddb6392730a06b438b12c8e0d1b385117f35c7d1d59af6a346b3
+SIZE (tnef_parse-0.3.12.tar.gz) = 408944
diff --git a/mail/claws-mail-tnef/pkg-plist b/mail/claws-mail-tnef/pkg-plist
index c89c8fa84674..457f7fcdeed4 100644
--- a/mail/claws-mail-tnef/pkg-plist
+++ b/mail/claws-mail-tnef/pkg-plist
@@ -7,7 +7,7 @@ lib/claws-mail/plugins/tnef_parse.so
 %%NLS%%share/locale/fi/LC_MESSAGES/tnef_parse.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/tnef_parse.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/tnef_parse.mo
-%%NLS%%share/locale/id/LC_MESSAGES/tnef_parse.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/tnef_parse.mo
 %%NLS%%share/locale/it/LC_MESSAGES/tnef_parse.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/tnef_parse.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/tnef_parse.mo
@@ -15,3 +15,5 @@ lib/claws-mail/plugins/tnef_parse.so
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/tnef_parse.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/tnef_parse.mo
 %%NLS%%share/locale/sk/LC_MESSAGES/tnef_parse.mo
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
diff --git a/mail/claws-mail-vcalendar/Makefile b/mail/claws-mail-vcalendar/Makefile
index c7e2efdb6ca5..f2c2236a86a0 100644
--- a/mail/claws-mail-vcalendar/Makefile
+++ b/mail/claws-mail-vcalendar/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	vcalendar
-PORTVERSION=	2.0.11
+PORTVERSION=	2.0.12
 CATEGORIES=	mail
 MASTER_SITES=	http://www.claws-mail.org/downloads/plugins/ \
 		${MASTER_SITE_LOCAL}
@@ -19,8 +19,8 @@ COMMENT=	vCalendar plugin for claws-mail
 LICENSE=	GPLv3
 
 LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl
-BUILD_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
-RUN_DEPENDS=	claws-mail>=3.7.10:${PORTSDIR}/mail/claws-mail
+BUILD_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
+RUN_DEPENDS=	claws-mail>=3.8.0:${PORTSDIR}/mail/claws-mail
 
 USE_GMAKE=	yes
 USE_ICONV=	yes
diff --git a/mail/claws-mail-vcalendar/distinfo b/mail/claws-mail-vcalendar/distinfo
index 2bb8beeae875..77eebf7e87e3 100644
--- a/mail/claws-mail-vcalendar/distinfo
+++ b/mail/claws-mail-vcalendar/distinfo
@@ -1,2 +1,2 @@
-SHA256 (vcalendar-2.0.11.tar.gz) = e1ce9034ce127229c4533ce4e42956745bbb7aff05bd3356b1bae15c9306ba8b
-SIZE (vcalendar-2.0.11.tar.gz) = 837130
+SHA256 (vcalendar-2.0.12.tar.gz) = 0826a874252a9839f88681fb96fedbbfee06c1e843f4188a92f475d7a2615cf7
+SIZE (vcalendar-2.0.12.tar.gz) = 858245
diff --git a/mail/claws-mail-vcalendar/pkg-plist b/mail/claws-mail-vcalendar/pkg-plist
index 31e58d3aa4dc..7537a0934db5 100644
--- a/mail/claws-mail-vcalendar/pkg-plist
+++ b/mail/claws-mail-vcalendar/pkg-plist
@@ -10,7 +10,7 @@ lib/claws-mail/plugins/vcalendar.so
 %%NLS%%share/locale/fi/LC_MESSAGES/vcalendar.mo
 %%NLS%%share/locale/fr/LC_MESSAGES/vcalendar.mo
 %%NLS%%share/locale/hu/LC_MESSAGES/vcalendar.mo
-%%NLS%%share/locale/id/LC_MESSAGES/vcalendar.mo
+%%NLS%%share/locale/id_ID/LC_MESSAGES/vcalendar.mo
 %%NLS%%share/locale/it/LC_MESSAGES/vcalendar.mo
 %%NLS%%share/locale/ja/LC_MESSAGES/vcalendar.mo
 %%NLS%%share/locale/lt/LC_MESSAGES/vcalendar.mo
@@ -21,6 +21,8 @@ lib/claws-mail/plugins/vcalendar.so
 %%NLS%%share/locale/sk/LC_MESSAGES/vcalendar.mo
 %%NLS%%share/locale/sr/LC_MESSAGES/vcalendar.mo
 %%NLS%%share/locale/zh_CN/LC_MESSAGES/vcalendar.mo
+%%NLS%%@dirrmtry share/locale/id_ID/LC_MESSAGES
+%%NLS%%@dirrmtry share/locale/id_ID
 @dirrmtry lib/claws-mail/plugins
 @dirrmtry lib/claws-mail
 @dirrmtry include/claws-mail/plugins/vcalendar
diff --git a/mail/claws-mail/Makefile b/mail/claws-mail/Makefile
index 854016125462..ca03a4d27c50 100644
--- a/mail/claws-mail/Makefile
+++ b/mail/claws-mail/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	claws-mail
-PORTVERSION=	3.7.10
-PORTREVISION=	1
+PORTVERSION=	3.8.0
 CATEGORIES=	mail news ipv6
 MASTER_SITES=	SF/sylpheed-claws/Claws%20Mail/${PORTVERSION}
 
@@ -51,21 +50,21 @@ CONFIGURE_ARGS=	--with-libiconv-prefix=${LOCALBASE}
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS=	ENCHANT		"Enable spell checking support."	on \
-		BOGOFILTER	"Enable bogofilter support."		off \
-		COMPFACE	"Enable X-Face support."		on \
-		DEBUG		"Enable debug support."			off \
-		DILLO		"Enable Dillo HTML viewer."		off \
-		GPGME		"Enable PGP/GnuPG/SMIME support using GPGME."	off \
-		IPV6		"Enable ipv6 support."			on \
-		JPILOT		"Enable JPilot support."		off \
-		LDAP		"Enable LDAP support."			off \
-		MANUAL		"Build and install manual files"	on \
-		SA_PLUG		"Enable SpamAssassin support."		off \
-		STARTUP		"Enable startup notification support."	on \
-		THEMES		"Install additional themes."		on
-
-.include <bsd.port.pre.mk>
+OPTIONS=	BOGOFILTER	"Enable bogofilter plugin"		off \
+		COMPFACE	"Enable X-Face support"			on  \
+		DEBUG		"Enable debug support"			off \
+		DILLO		"Enable Dillo HTML viewer plugin"	off \
+		ENCHANT		"Enable spell checking support"		on  \
+		GPGME		"Enable PGP/GnuPG/SMIME plugins"	off \
+		IPV6		"Enable IPv6 support"			on  \
+		JPILOT		"Enable JPilot plugin"			off \
+		LDAP		"Enable LDAP support"			off \
+		MANUAL		"Build and install manual files"	on  \
+		SPAMASSASSIN	"Enable SpamAssassin plugin"		off \
+		STARTUP		"Enable startup notification support"	on  \
+		THEMES		"Install additional themes"		on
+
+.include <bsd.port.options.mk>
 
 .if defined(WITH_BOGOFILTER)
 RUN_DEPENDS+=		bogofilter:${PORTSDIR}/mail/bogofilter
@@ -114,7 +113,7 @@ CONFIGURE_ARGS+=	--disable-manual
 PLIST_SUB+=		MANUAL="@comment "
 .endif
 
-.if defined(WITH_SA_PLUG)
+.if defined(WITH_SPAMASSASSIN)
 RUN_DEPENDS+=		spamd:${PORTSDIR}/mail/p5-Mail-SpamAssassin
 CONFIGURE_ARGS+=	--enable-spamassassin-plugin
 PLIST_SUB+=		SA_PLUG=""
@@ -138,7 +137,6 @@ CONFIGURE_ARGS+=	--disable-pgpmime-plugin --disable-pgpcore-plugin \
 
 .if defined(WITH_DEBUG)
 CONFIGURE_ARGS+=	--enable-maintainer-mode --enable-crash-dialog
-STRIP=
 .endif
 
 .if defined(WITH_DILLO)
@@ -198,9 +196,5 @@ post-install:
 		tbird2claws.py textviewer.pl textviewer.sh \
 		thunderbird-filters-convertor.pl uudec uuooffice vcard2xml.py \
 		${DATADIR}
-	@${MKDIR} ${PREFIX}/share/applications
-	@${INSTALL_DATA} ${WRKSRC}/claws-mail.desktop ${PREFIX}/share/applications/
-	@${MKDIR} ${PREFIX}/share/pixmaps
-	@${INSTALL_DATA} ${WRKSRC}/claws-mail*.png ${PREFIX}/share/pixmaps/
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/claws-mail/distinfo b/mail/claws-mail/distinfo
index d9d6f79b4b83..2fcdd5eb10a9 100644
--- a/mail/claws-mail/distinfo
+++ b/mail/claws-mail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (claws-mail-3.7.10.tar.bz2) = 5c4119630e4b0b3d1486f3d96ef847a48c1389ef6426d6b5d6e6545413721638
-SIZE (claws-mail-3.7.10.tar.bz2) = 7165265
+SHA256 (claws-mail-3.8.0.tar.bz2) = ec945e3b0f3df6f1f13fcf149ad3ee5306c0e6575bb375cf558e9028a0eb6231
+SIZE (claws-mail-3.8.0.tar.bz2) = 7190415
diff --git a/mail/claws-mail/pkg-plist b/mail/claws-mail/pkg-plist
index 7c305b334a57..f5b86db9fd62 100644
--- a/mail/claws-mail/pkg-plist
+++ b/mail/claws-mail/pkg-plist
@@ -92,12 +92,14 @@ include/claws-mail/gtk/combobox.h
 include/claws-mail/gtk/description_window.h
 include/claws-mail/gtk/filesel.h
 include/claws-mail/gtk/foldersort.h
+include/claws-mail/gtk/gdkkeysyms-new.h
 include/claws-mail/gtk/gtkaspell.h
 include/claws-mail/gtk/gtkcmclist.h
 include/claws-mail/gtk/gtkcmctree.h
 include/claws-mail/gtk/gtkcmoptionmenu.h
 include/claws-mail/gtk/gtksctree.h
 include/claws-mail/gtk/gtkshruler.h
+include/claws-mail/gtk/gtkunit.h
 include/claws-mail/gtk/gtkutils.h
 include/claws-mail/gtk/gtkvscrollbutton.h
 include/claws-mail/gtk/headers.h
@@ -308,7 +310,7 @@ share/locale/es/LC_MESSAGES/claws-mail.mo
 share/locale/fi/LC_MESSAGES/claws-mail.mo
 share/locale/fr/LC_MESSAGES/claws-mail.mo
 share/locale/hu/LC_MESSAGES/claws-mail.mo
-share/locale/id/LC_MESSAGES/claws-mail.mo
+share/locale/id_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
@@ -321,10 +323,9 @@ share/locale/sk/LC_MESSAGES/claws-mail.mo
 share/locale/sv/LC_MESSAGES/claws-mail.mo
 share/locale/uk/LC_MESSAGES/claws-mail.mo
 share/locale/zh_CN/LC_MESSAGES/claws-mail.mo
-share/pixmaps/claws-mail-128x128.png
-share/pixmaps/claws-mail-64x64.png
-share/pixmaps/claws-mail.png
-@dirrm %%DATADIR%%
+@dirrmtry share/locale/id_ID/LC_MESSAGES
+@dirrmtry share/locale/id_ID
+@dirrmtry %%DATADIR%%
 %%MANUAL%%@dirrm %%DOCSDIR%%/manual/pl
 %%MANUAL%%@dirrm %%DOCSDIR%%/manual/fr
 %%MANUAL%%@dirrm %%DOCSDIR%%/manual/es