diff --git a/evolution.spec b/evolution.spec
index 660e94e..e3b4057 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -55,6 +55,7 @@ Source3: emoji.data
 Patch01: evolution-3.40.4-empty-emoji-picker.patch
 Patch02: evolution-3.40.4-comp-editor-timezone-reset.patch
 Patch03: evolution-3.40.4-google-contacts-to-carddav.patch
+Patch04: webkitgtk-2.36.0-dark-theme.patch
 
 # Approximate version number
 Provides: bundled(libgnomecanvas) = 2.30.0
@@ -572,6 +573,7 @@ grep -v "%{_datadir}/locale" evolution.lang > help.lang
 %changelog
 * Tue Apr 05 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-4
 - Resolves: #2071056 (Addressbook: Switch from GData Contacts API to CardDAV API for Google books)
+- Resolves: #2071742 (Add patch to use correct colors in mail preview with webkit2gtk3 2.36.x)
 
 * Mon Feb 14 2022 Milan Crha <mcrha@redhat.com> - 3.40.4-3
 - Resolves: #2054084 (ECompEditor: Timezone can be reset on component save)
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
+