diff --git a/mail-client/claws-mail/Manifest b/mail-client/claws-mail/Manifest
index 4c776b8..e1d61e7 100644
--- a/mail-client/claws-mail/Manifest
+++ b/mail-client/claws-mail/Manifest
@@ -3,9 +3,11 @@ DIST claws-mail-3.15.0.tar.xz 5665648 BLAKE2B f25356372b65f2df072eb2774fca87514c
DIST claws-mail-3.15.1.tar.xz 5665468 BLAKE2B c6d4c5875f82f836815193b330427bdd533be5445706fc437b1c30be8e52325a2b824e8a1d1332bb286ac9ea2bd4b872943709d9ff78b20a6a3ff5b781808d25 SHA512 11113ab2bc75571b9a71b11ee3f7fe4773ff7b17132f29e6637aa7b7b9a7f8ed125430ee7e5ab5c9842463d776a96be150d7c8e1e3d682b955dd582a6a6ce68c
DIST claws-mail-3.16.0.tar.xz 5913948 BLAKE2B 6744045de6bc3945221569a9ae1cdcd849ec11c4f5dbfe966ca70c7c2ab3f5d9ded1dbd5bcedffdc756809c1802d31d955b5c6c53f20a00be5abc861db340d0f SHA512 5c96e21b4c5117b67ccfe4178c68e2f1b1449f882d6ecf22041e41f08fd607c6ce7afe6c7fdbd039da7ffc5673d366551b15d3e4b7de8d758fc1554a8eadc55e
DIST claws-mail-3.17.1.tar.xz 4746940 BLAKE2B fdaa5ae36893a9089277f59a97d3026ab3331eea25944def7d9e26ae74d65798a8b8faa0e4ab8b9a7eb4f49aba5a6beb4a61dd26a3bdde9859b3518848ca869c SHA512 de20e6ffbeba771249a42b03fecdb3c29c4db3ae9a95cb504156431495550a7d61233e61d26239d8f71022bf789c0abba0c29255a9c954ae8eb8cdc4ebfef67b
+DIST claws-mail-3.17.3.tar.xz 6164392 BLAKE2B ac0781c4c7e4423f4a8b494a9bd007d62443e8c540feaeef089ca65f641da5ecabfa2c5c0662750d6f58c8913c1d95750a3dfb6b4628e573b0105f8f526bc066 SHA512 b562d785eaedbdec408c4a3db8f4d9326183266fe314509a189c9e1220f15b4f41ccd9d8c58c5194c0267842e8efe900e88eb17c0d17d6069e2543870efa5ef8
EBUILD claws-mail-3.15.0-r1.ebuild 5792 BLAKE2B 3223768beeeaa4c2799942d007a43dee42137ae3025f3093674969175e4630bcd10eb735be510a2a561b1a1c3543144493ec410378cbc4e5603ad01f295bc75f SHA512 87f97b2209b5addd9b0ef2f168dc2bdfa139d6fc9741aab37eca5d25b0ee38bf9564160e4e4a5fd986d8904c08e67684d61b9b1da0785c6f3b17595a522515e9
EBUILD claws-mail-3.15.0.ebuild 5660 BLAKE2B e2edb1f3e2bb6367ea8d49a07329ca5a67ca59913b3b397b02c93f6ffc8cac346eb2c0d9952128ad5225c5e42fe2e0950b44912d55ba873c3fd6c3f668465e88 SHA512 e67a28cdd5df9dc1578f90995ddc5a21db74aaab743d589fef6f2b19faff649afe2b271255d772aa4ca80d901fb5fa434d75c228e3e2e1851c676b37c6edf28b
EBUILD claws-mail-3.15.1.ebuild 5793 BLAKE2B 0c68b066725d265c045d637fd291a7b15cc4c9b1e7faabcc3dc738d48af4fd6af444b8e0b2cce505d7dae8e22c03b6ec6c5f799d66487059a4ba91def88c30f5 SHA512 56559d610f98d956b294456c1d174ab41ddb4445576a533d1578f5476a2c5ba217839a9dfb90dd4eaef81b83296aa494c049433a79fc9c9e5f4ff7a6143820bf
EBUILD claws-mail-3.16.0.ebuild 5793 BLAKE2B 0c68b066725d265c045d637fd291a7b15cc4c9b1e7faabcc3dc738d48af4fd6af444b8e0b2cce505d7dae8e22c03b6ec6c5f799d66487059a4ba91def88c30f5 SHA512 56559d610f98d956b294456c1d174ab41ddb4445576a533d1578f5476a2c5ba217839a9dfb90dd4eaef81b83296aa494c049433a79fc9c9e5f4ff7a6143820bf
EBUILD claws-mail-3.17.1.ebuild 6006 BLAKE2B c04db0772c72749ca305063517709c350baa59675d62f6f5db760a339e9b0bcc2d2141b8843365e2efa03397daffd4ddae287da519098b4b8791cfaf7eaed2b2 SHA512 28124f6fb48059b6c5ae326918718dfb28b50f0b796ae5a0fa2538b3fe055ce7bf19a11474df4a035803c7d4b91c6553052f0cc3f3ae8031970e26e2cea979ba
-MISC metadata.xml 1716 BLAKE2B 7822f11d535e99ac8ce2a918b5aef1f0979f045e1f4422d66d41e0af8a78d2e3b14791a172d8ccb6eaa7c1cd73a7596662114dbd16cea07b102b4d65d1e94739 SHA512 2246148a5fe3ecd1b097a1037ba08ef2c175b7d93ceaeb7e9b2a49b9397a47e9f98e4a510f3f2224e94a3aa7982af2b77df2c917496a01c44602e866924b3a5b
+EBUILD claws-mail-3.17.3-r1.ebuild 5966 BLAKE2B a384281495ac0b4e856748aa61a3e1c54fa50ad86083af05f8a10f53fd41f31855ddfd139f9db0b80b5ae81573901d9222b6df744700306d3ff2b087b1e50fc6 SHA512 d67ea2ce9cfb326e402cd257e2368c09311ac5fc9c62c0dfbdf9f38e6063c3481e0047d192f672e421d225ae75d3e8d97ae54d16b9d6e6264700307282e06671
+MISC metadata.xml 1661 BLAKE2B ce48032773773b29728b3a6a177c43572e4c6df0f50df4e17935df77a317f1107527a82fd576765fca018edd73bb31e165029258e49640ed84ff9061f6f1a53f SHA512 5e297601a56a53db9e2463da1e785b0d8e7a358b9df68689c1a3da4efc5d3ffccc92af7ee2202d67e4c6226b298bb562fa0f590fd36a425749e21b1c15516076
diff --git a/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
new file mode 100644
index 0000000..545f8a5
--- /dev/null
+++ b/mail-client/claws-mail/claws-mail-3.17.3-r1.ebuild
@@ -0,0 +1,219 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools desktop python-single-r1 xdg
+
+DESCRIPTION="An email client (and news reader) based on GTK+"
+HOMEPAGE="https://www.claws-mail.org/"
+
+if [[ "${PV}" == 9999 ]] ; then
+ inherit git-r3
+ EGIT_REPO_URI="git://git.claws-mail.org/claws.git"
+else
+ SRC_URI="https://www.claws-mail.org/download.php?file=releases/${P}.tar.xz"
+ KEYWORDS="alpha amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc x86"
+fi
+
+SLOT="0"
+LICENSE="GPL-3"
+
+IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind webkit xface"
+REQUIRED_USE="libcanberra? ( notification )
+ libindicate? ( notification )
+ libnotify? ( notification )
+ networkmanager? ( dbus )
+ python? ( ${PYTHON_REQUIRED_USE} )
+ smime? ( pgp )"
+
+COMMONDEPEND="
+ dev-libs/nettle
+ net-mail/ytnef
+ sys-libs/zlib:=
+ x11-libs/cairo
+ x11-libs/gdk-pixbuf:2[jpeg]
+ >=x11-libs/gtk+-2.24:2
+ x11-libs/libX11
+ x11-libs/pango
+ archive? (
+ app-arch/libarchive
+ >=net-misc/curl-7.9.7
+ )
+ bogofilter? ( mail-filter/bogofilter )
+ calendar? (
+ >=dev-libs/libical-2.0.0:=
+ >=net-misc/curl-7.9.7
+ )
+ dbus? (
+ >=dev-libs/dbus-glib-0.60
+ sys-apps/dbus
+ )
+ gdata? ( >=dev-libs/libgdata-0.17.2 )
+ dillo? ( www-client/dillo )
+ gnutls? ( >=net-libs/gnutls-3.0 )
+ imap? ( >=net-libs/libetpan-0.57 )
+ ldap? ( >=net-nds/openldap-2.0.7 )
+ nls? ( >=sys-devel/gettext-0.18 )
+ nntp? ( >=net-libs/libetpan-0.57 )
+ notification? (
+ dev-libs/glib:2
+ libcanberra? ( media-libs/libcanberra[gtk] )
+ libindicate? ( dev-libs/libindicate:3[gtk] )
+ libnotify? ( x11-libs/libnotify )
+ )
+ pda? ( >=app-pda/jpilot-0.99 )
+ pdf? ( app-text/poppler[cairo] )
+ pgp? ( >=app-crypt/gpgme-1.0.0 )
+ session? (
+ x11-libs/libICE
+ x11-libs/libSM
+ )
+ smime? ( >=app-crypt/gpgme-1.0.0 )
+ spam-report? ( >=net-misc/curl-7.9.7 )
+ spell? ( >=app-text/enchant-1.0.0 )
+ startup-notification? ( x11-libs/startup-notification )
+ svg? ( >=gnome-base/librsvg-2.40.5 )
+ valgrind? ( dev-util/valgrind )
+ webkit? ( net-libs/webkit-gtk:2 )
+"
+
+DEPEND="${COMMONDEPEND}
+ app-arch/xz-utils
+ virtual/pkgconfig
+ xface? ( >=media-libs/compface-1.4 )"
+
+RDEPEND="${COMMONDEPEND}
+ app-misc/mime-types
+ x11-misc/shared-mime-info
+ clamav? ( app-antivirus/clamav )
+ networkmanager? ( net-misc/networkmanager )
+ pdf? ( app-text/ghostscript-gpl )
+ perl? ( dev-lang/perl:= )
+ python? (
+ ${PYTHON_DEPS}
+ >=dev-python/pygtk-2.10.3
+ )
+ rss? (
+ dev-libs/libxml2
+ net-misc/curl
+ )"
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ xdg_src_prepare
+ eautoreconf
+}
+
+src_configure() {
+ # Don't use libsoup-gnome (bug #565924)
+ export HAVE_LIBSOUP_GNOME=no
+
+ local myeconfargs=(
+ --disable-bsfilter-plugin
+ --disable-fancy-plugin
+ --disable-generic-umpc
+ --enable-acpi_notifier-plugin
+ --enable-address_keeper-plugin
+ --enable-alternate-addressbook
+ --enable-att_remover-plugin
+ --enable-attachwarner-plugin
+ --enable-fetchinfo-plugin
+ --enable-mailmbox-plugin
+ --enable-newmail-plugin
+ --enable-tnef_parse-plugin
+ --with-password-encryption=$(usex gnutls gnutls old)
+ $(use_enable archive archive-plugin)
+ $(use_enable bogofilter bogofilter-plugin)
+ $(use_enable calendar vcalendar-plugin)
+ $(use_enable clamav clamd-plugin)
+ $(use_enable dbus)
+ $(use_enable debug crash-dialog)
+ $(use_enable dillo dillo-plugin)
+ $(use_enable doc manual)
+ $(use_enable gdata gdata-plugin)
+ $(use_enable gnutls)
+ $(use_enable ipv6)
+ $(use_enable ldap)
+ $(use_enable networkmanager)
+ $(use_enable nls)
+ $(use_enable notification notification-plugin)
+ $(use_enable pda jpilot)
+ $(use_enable pdf pdf_viewer-plugin)
+ $(use_enable perl perl-plugin)
+ $(use_enable pgp pgpcore-plugin)
+ $(use_enable pgp pgpinline-plugin)
+ $(use_enable pgp pgpmime-plugin)
+ $(use_enable python python-plugin)
+ $(use_enable rss rssyl-plugin)
+ $(use_enable session libsm)
+ $(use_enable sieve managesieve-plugin)
+ $(use_enable smime smime-plugin)
+ $(use_enable spam-report spam_report-plugin)
+ $(use_enable spamassassin spamassassin-plugin)
+ $(use_enable spell enchant)
+ $(use_enable startup-notification)
+ $(use_enable svg)
+ $(use_enable valgrind valgrind)
+ $(use_enable webkit fancy-plugin)
+ $(use_enable xface compface)
+ )
+
+ # libetpan is needed if user wants nntp or imap functionality
+ if use imap || use nntp ; then
+ myeconfargs+=( --enable-libetpan )
+ else
+ myeconfargs+=( --disable-libetpan )
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ local DOCS=( AUTHORS ChangeLog* INSTALL* NEWS README* TODO* )
+ default
+
+ # Makefile install claws-mail.png in /usr/share/icons/hicolor/48x48/apps
+ # => also install it in /usr/share/pixmaps for other desktop envs
+ # => also install higher resolution icons in /usr/share/icons/hicolor/...
+ insinto /usr/share/pixmaps
+ doins ${PN}.png
+ local size
+ for size in 64 128 ; do
+ newicon -s ${size} ${PN}-${size}x${size}.png ${PN}.png
+ done
+
+ docinto tools
+ dodoc tools/README*
+
+ domenu ${PN}.desktop
+
+ einfo "Installing extra tools"
+ cd "${S}"/tools || die
+ exeinto /usr/$(get_libdir)/${PN}/tools
+ doexe *.pl *.py *.conf *.sh
+ doexe tb2claws-mail update-po uudec uuooffice
+
+ # kill useless files
+ rm -f "${ED%/}"/usr/lib*/claws-mail/plugins/*.{a,la}
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ ewarn "When upgrading from version 3.9.0 or below some changes have happened:"
+ ewarn "- There are no individual plugins in mail-client/claws-mail-* anymore, but they are integrated mostly controlled through USE flags"
+ ewarn "- Plugins with no special dependencies are just built and can be loaded through the interface"
+ ewarn "- The gtkhtml2 and trayicon plugins have been dropped entirely"
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/mail-client/claws-mail/metadata.xml b/mail-client/claws-mail/metadata.xml
index dd8c646..9766136 100644
--- a/mail-client/claws-mail/metadata.xml
+++ b/mail-client/claws-mail/metadata.xml
@@ -11,6 +11,7 @@
sylpheed-claws