diff --git a/mail-client/mailspring-bin/Manifest b/mail-client/mailspring-bin/Manifest
index 1ef9da8f2c..e55736064b 100644
--- a/mail-client/mailspring-bin/Manifest
+++ b/mail-client/mailspring-bin/Manifest
@@ -1 +1,2 @@
 DIST mailspring-1.13.3-amd64.deb 107230544 BLAKE2B 665a948b160bc68eaba7e56d0bb3d1cc0eb4901ac42384416121ce22df5f4cae0bc26220cca9fcb2184c20cb039ac69aec86368aebb29941e67454d053ff4d35 SHA512 cd057d8a214b9021d49df6d74f5b9cd677506f25c6e867d82647c2a465461b156a8f3405c0614362110bedbb212149fb31156a2e0750dacc3fa4d91458036ead
+DIST mailspring-1.15.1-amd64.deb 113188308 BLAKE2B 1fe0198d33291e4f780b93d8b4afa682a506baa2626bb55bcf1cfef1f8c74492e6abb7f2f00a2f468b1f3688d65373315293732f1ade7cc63f4d74440e695bce SHA512 6817d5ee50e20faf1f7932ed1054b6998e64047fe10bdbc001dd6ec139802fd890aaff35f31520a0b2f30230ca76dc677d1747f2351dad4caffffe340b0053d5
diff --git a/mail-client/mailspring-bin/mailspring-bin-1.15.1.ebuild b/mail-client/mailspring-bin/mailspring-bin-1.15.1.ebuild
new file mode 100644
index 0000000000..41219725ac
--- /dev/null
+++ b/mail-client/mailspring-bin/mailspring-bin-1.15.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit unpacker xdg
+
+DESCRIPTION="A beautiful, fast and fully open source mail client for Mac, Windows and Linux"
+HOMEPAGE="https://getmailspring.com/"
+SRC_URI="https://github.com/Foundry376/Mailspring/releases/download/${PV}/mailspring-${PV}-amd64.deb"
+S="${WORKDIR}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+wayland"
+
+RDEPEND="
+	app-accessibility/at-spi2-core:2
+	app-crypt/mit-krb5
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/nspr
+	dev-libs/nss
+	gnome-base/gvfs
+	media-libs/alsa-lib
+	media-libs/mesa
+	net-print/cups
+	sys-apps/dbus
+	dev-build/libtool
+	sys-libs/db:5.3
+	x11-libs/cairo
+	x11-libs/gtk+:3
+	x11-libs/libdrm
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libxkbcommon
+	x11-libs/libXrandr
+	x11-libs/pango
+	x11-misc/xdg-utils
+"
+
+QA_PREBUILT="*"
+
+src_unpack(){
+	unpack_deb ${A}
+}
+
+src_install(){
+	if use wayland; then
+		sed -i "s|Exec=mailspring %U|Exec=mailspring --ozone-platform-hint=auto --enable-wayland-ime %U|g" \
+			"${S}/usr/share/applications/Mailspring.desktop" || die
+	fi
+
+	cp -R "${S}"/* "${D}" || die "Installing binary files failed"
+	mv "${D}/usr/share/doc/mailspring" "${D}/usr/share/doc/${PF}" || die
+	mv "${D}/usr/share/appdata" "${D}/usr/share/metainfo" || die
+}
diff --git a/mail-client/mailspring-bin/metadata.xml b/mail-client/mailspring-bin/metadata.xml
index ba4b410293..50aca68b94 100644
--- a/mail-client/mailspring-bin/metadata.xml
+++ b/mail-client/mailspring-bin/metadata.xml
@@ -5,6 +5,9 @@
 		<name>Adel Kara Slimane</name>
 		<email>adel.ks@zegrapher.com</email>
 	</maintainer>
+	<use>
+		<flag name="wayland">Run in wayland mode under wayland sessions, x11/xwayland otherwise (x11 sessions are unaffected).</flag>
+	</use>
 	<upstream>
 		<maintainer>
 			<name>Ben Gotow</name>