diff --git a/mail/geary/Makefile b/mail/geary/Makefile
index c2cc4f231ec7..6a3dda24c8f0 100644
--- a/mail/geary/Makefile
+++ b/mail/geary/Makefile
@@ -1,57 +1,56 @@
 PORTNAME=	geary
 PORTVERSION=	40.0
 PORTREVISION=	7
 CATEGORIES=	mail gnome
 MASTER_SITES=	GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/}
 DIST_SUBDIR=	gnome
 
 PATCH_SITES=	https://gitlab.gnome.org/GNOME/geary/-/commit/
 PATCHFILES=	0f75e7a84a39492d0748cec2ba6028e08cae3644.diff:-p1 \
+		4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.diff:-p1 \
 		9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.diff:-p1
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Mail client for GNOME
 WWW=		https://wiki.gnome.org/Apps/Geary
 
 LICENSE=	BSD2CLAUSE CC-BY-3.0 LGPL21+
 LICENSE_COMB=	multi
 
-BROKEN_FreeBSD_14=	Fails to compile with multiple errors related to Vala
-
 BUILD_DEPENDS=	itstool:textproc/itstool
 LIB_DEPENDS=	libappstream-glib.so:devel/appstream-glib \
 		libcanberra.so:audio/libcanberra \
 		libenchant-2.so:textproc/enchant2 \
 		libfolks.so:net-im/folks \
 		libgcr-base-3.so:security/gcr \
 		libgee-0.8.so:devel/libgee \
 		libgmime-3.0.so:mail/gmime30 \
 		libgoa-1.0.so:net/gnome-online-accounts \
 		libgspell-1.so:textproc/gspell \
 		libhandy-1.so:x11-toolkits/libhandy \
 		libicuuc.so:devel/icu \
 		libjson-glib-1.0.so:devel/json-glib \
 		libnotify.so:devel/libnotify \
 		libpeas-gtk-1.0.so:devel/libpeas \
 		libsecret-1.so:security/libsecret \
 		libsoup-2.4.so:devel/libsoup \
 		libstemmer.so:textproc/snowballstemmer \
 		libunwind.so:devel/libunwind \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3 \
 		libytnef.so:converters/ytnef
 
 USES=		compiler:c11 cpe desktop-file-utils gettext gnome meson pkgconfig \
 		python:build shebangfix sqlite tar:xz vala:build
 CPE_VENDOR=	gnome
 USE_GNOME=	cairo gsound gtk30 libxml2
 GLIB_SCHEMAS=	org.gnome.Geary.gschema.xml
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	desktop/geary-attach
 
 MESON_ARGS=	-Dprofile=release -Dvaladoc=disabled
 BINARY_ALIAS=	python3=${PYTHON_VERSION}
 
 CFLAGS+=	-Wno-error=int-conversion
 
 .include <bsd.port.mk>
diff --git a/mail/geary/distinfo b/mail/geary/distinfo
index 8fc265af2fc4..b1b9798dcf37 100644
--- a/mail/geary/distinfo
+++ b/mail/geary/distinfo
@@ -1,7 +1,9 @@
-TIMESTAMP = 1661532131
+TIMESTAMP = 1619150359
 SHA256 (gnome/geary-40.0.tar.xz) = 3356203725a924d6cb358e0c29ad090f4177d8d7b7f8210412cf0250ca6856b0
 SIZE (gnome/geary-40.0.tar.xz) = 2490940
 SHA256 (gnome/0f75e7a84a39492d0748cec2ba6028e08cae3644.diff) = b25728b284b8268de4f52d6064dacd70f4c65cc53bb10fba7e280218383f697a
 SIZE (gnome/0f75e7a84a39492d0748cec2ba6028e08cae3644.diff) = 581
+SHA256 (gnome/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.diff) = 5f1edaf6f755a4ca01d806b70a36fde7ba9a881d4e48de4a2e6027f4458b9e84
+SIZE (gnome/4a7ca820b1d3d6130fedf254dc5b4cd7efb58f2c.diff) = 1883
 SHA256 (gnome/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.diff) = 99a1dd00319fa1061c620f6e3b764fc70402695c06618dc0c530bc6875bb64dd
 SIZE (gnome/9bd4c82952a0a2c3308c5cc86c0b85650c1fb484.diff) = 1090