diff --git a/evolution.spec b/evolution.spec
index b552639..fb9b90d 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -42,15 +42,17 @@
 ### Abstract ###
 
 Name: evolution
-Version: 3.41.1
+Version: 3.42.4
 Release: 2%{?dist}
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
 URL: https://wiki.gnome.org/Apps/Evolution
-Source: http://download.gnome.org/sources/%{name}/3.41/%{name}-%{version}.tar.xz
+Source: http://download.gnome.org/sources/%{name}/3.42/%{name}-%{version}.tar.xz
 Source1: flatpak-evolution-fix-service-names.sh
 Source2: flatpak-evolution-wrapper.sh.in
 
+Patch01: webkitgtk-2.36.0-dark-theme.patch
+
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
 
@@ -292,6 +294,9 @@ CFLAGS="$RPM_OPT_FLAGS -fPIC -DLDAP_DEPRECATED -Wno-sign-compare -Wno-deprecated
 	-DVERSION_SUBSTRING=" (%{version}-%{release})" \
 	%ldap_flags %ssl_flags %gtkdoc_flags %tests_flags %tnef_flags \
 	-DENABLE_PLUGINS=all \
+	%if 0%{?flatpak}
+	"-DWITH_WMCLASS_OVERRIDE=evolution.bin" \
+	%endif
 	%{nil}
 
 %cmake_build
@@ -563,6 +568,30 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %endif
 
 %changelog
+* Tue Mar 29 2022 Milan Crha <mcrha@redhat.com> - 3.42.4-2
+- Add patch to use correct colors in mail preview with webkit2gtk3 2.36.x
+
+* Fri Feb 11 2022 Milan Crha <mcrha@redhat.com> - 3.42.4-1
+- Update to 3.42.4
+
+* Fri Jan 07 2022 Milan Crha <mcrha@redhat.com> - 3.42.3-1
+- Update to 3.42.3
+
+* Fri Dec 03 2021 Milan Crha <mcrha@redhat.com> - 3.42.2-1
+- Update to 3.42.2
+
+* Fri Oct 29 2021 Milan Crha <mcrha@redhat.com> - 3.42.1-1
+- Update to 3.42.1
+
+* Fri Sep 17 2021 Milan Crha <mcrha@redhat.com> - 3.42.0-1
+- Update to 3.42.0
+
+* Fri Sep 03 2021 Milan Crha <mcrha@redhat.com> - 3.41.3-1
+- Update to 3.41.3
+
+* Fri Aug 13 2021 Milan Crha <mcrha@redhat.com> - 3.41.2-1
+- Update to 3.41.2
+
 * Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 3.41.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
 
diff --git a/sources b/sources
index b540905..3e5c432 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (evolution-3.41.1.tar.xz) = e19d64c616b8e4604b9e7bd35b74158750c60260807e93fddddbe08ac9a01944454c865f20f16545ffc95af00136dedd4ed446335df5e9cd9edbd2a6e7fccb23
+SHA512 (evolution-3.42.4.tar.xz) = 4319d19089269e53bb751408d5cec1609a245dd366a30ad6e2e117f074ff0b2f55228a5dbcc9af661846a253c0860a61a8648bd582b395851e21e152ffe0b1aa
diff --git a/webkitgtk-2.36.0-dark-theme.patch b/webkitgtk-2.36.0-dark-theme.patch
new file mode 100644
index 0000000..025ea9e
--- /dev/null
+++ b/webkitgtk-2.36.0-dark-theme.patch
@@ -0,0 +1,51 @@
+From ac15857f14eecd83a3a1950588a2f1edb9cb70de Mon Sep 17 00:00:00 2001
+From: Milan Crha <mcrha@redhat.com>
+Date: Fri, 18 Mar 2022 09:45:20 +0100
+Subject: [PATCH] I#1835 - Mail: Preview uses wrong colors for HTML mail with
+ dark theme
+
+Closes https://gitlab.gnome.org/GNOME/evolution/-/issues/1835
+---
+ data/webkit/e-web-view.js                  | 12 ++++++++++--
+ src/em-format/e-mail-formatter-text-html.c |  2 +-
+ 2 files changed, 11 insertions(+), 3 deletions(-)
+
+diff --git a/data/webkit/e-web-view.js b/data/webkit/e-web-view.js
+index 7f47fe4b26..a8f99c4668 100644
+--- a/data/webkit/e-web-view.js
++++ b/data/webkit/e-web-view.js
+@@ -695,8 +695,16 @@ Evo.initialize = function(elem)
+ 
+ 	if (doc.documentElement.style.getPropertyValue("color") == "" ||
+ 	    doc.documentElement.style.getPropertyValue("color") == "text") {
+-		doc.documentElement.style.setProperty("color", "inherit");
+-		doc.documentElement.style.setProperty("background-color", "inherit");
++		if (doc.defaultView && doc.defaultView.frameElement && !doc.defaultView.frameElement.hasAttribute("x-e-unset-colors") &&
++		    doc.defaultView.frameElement.ownerDocument &&
++		    doc.defaultView.frameElement.ownerDocument.defaultView &&
++		    doc.defaultView.frameElement.ownerDocument.defaultView.window) {
++			var style = doc.defaultView.frameElement.ownerDocument.defaultView.window.getComputedStyle(doc.defaultView.frameElement);
++			if (style) {
++				doc.documentElement.style.setProperty("color", style.color);
++				doc.documentElement.style.setProperty("background-color", style.backgroundColor);
++			}
++		}
+ 	}
+ 
+ 	elems = doc.querySelectorAll("input, textarea, select, button, label");
+diff --git a/src/em-format/e-mail-formatter-text-html.c b/src/em-format/e-mail-formatter-text-html.c
+index 708c29a5e4..8a938212ff 100644
+--- a/src/em-format/e-mail-formatter-text-html.c
++++ b/src/em-format/e-mail-formatter-text-html.c
+@@ -369,7 +369,7 @@ emfe_text_html_format (EMailFormatterExtension *extension,
+ 			e_mail_part_get_id (part),
+ 			e_mail_part_get_id (part),
+ 			e_mail_part_get_frame_security_style (part),
+-			g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color: #ffffff;\"");
++			g_settings_get_boolean (settings, "preview-unset-html-colors") ? "x-e-unset-colors=\"1\"" : "style=\"background-color:white; color:black;\"");
+ 
+ 		g_output_stream_write_all (
+ 			stream, str, strlen (str),
+-- 
+GitLab
+