diff --git a/SOURCES/evolution-data-server-3.28.5-nonstandard-uuencode-encoding.patch b/SOURCES/evolution-data-server-3.28.5-nonstandard-uuencode-encoding.patch
new file mode 100644
index 0000000..53420b6
--- /dev/null
+++ b/SOURCES/evolution-data-server-3.28.5-nonstandard-uuencode-encoding.patch
@@ -0,0 +1,26 @@
+diff -up evolution-data-server-3.28.5/src/camel/camel-folder-summary.c.nonstandard-uuencode-encoding evolution-data-server-3.28.5/src/camel/camel-folder-summary.c
+--- evolution-data-server-3.28.5/src/camel/camel-folder-summary.c.nonstandard-uuencode-encoding	2018-07-30 15:17:06.000000000 +0200
++++ evolution-data-server-3.28.5/src/camel/camel-folder-summary.c	2021-09-30 17:30:47.674951472 +0200
+@@ -3153,7 +3153,8 @@ summary_traverse_content_with_parser (Ca
+ 					else
+ 						camel_mime_filter_reset (summary->priv->filter_qp);
+ 					enc_id = camel_mime_parser_filter_add (mp, summary->priv->filter_qp);
+-				} else if (!g_ascii_strcasecmp (encoding, "x-uuencode")) {
++				} else if (!g_ascii_strcasecmp (encoding, "x-uuencode") ||
++					   !g_ascii_strcasecmp (encoding, "uuencode")) {
+ 					d (printf (" decoding x-uuencode\n"));
+ 					if (summary->priv->filter_uu == NULL)
+ 						summary->priv->filter_uu = camel_mime_filter_basic_new (CAMEL_MIME_FILTER_BASIC_UU_DEC);
+diff -up evolution-data-server-3.28.5/src/camel/camel-mime-utils.c.nonstandard-uuencode-encoding evolution-data-server-3.28.5/src/camel/camel-mime-utils.c
+--- evolution-data-server-3.28.5/src/camel/camel-mime-utils.c.nonstandard-uuencode-encoding	2018-07-30 15:17:06.000000000 +0200
++++ evolution-data-server-3.28.5/src/camel/camel-mime-utils.c	2021-09-30 17:30:47.674951472 +0200
+@@ -3268,6 +3268,9 @@ camel_transfer_encoding_from_string (con
+ 		for (i = 0; i < G_N_ELEMENTS (encodings); i++)
+ 			if (!g_ascii_strcasecmp (string, encodings[i]))
+ 				return i;
++
++		if (!g_ascii_strcasecmp (string, "uuencode"))
++			return CAMEL_TRANSFER_ENCODING_UUENCODE;
+ 	}
+ 
+ 	return CAMEL_TRANSFER_ENCODING_DEFAULT;
diff --git a/SPECS/evolution-data-server.spec b/SPECS/evolution-data-server.spec
index b6e1ad2..458116b 100644
--- a/SPECS/evolution-data-server.spec
+++ b/SPECS/evolution-data-server.spec
@@ -32,7 +32,7 @@
 
 Name: evolution-data-server
 Version: 3.28.5
-Release: 17%{?dist}
+Release: 18%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -97,6 +97,9 @@ Patch14: evolution-data-server-3.28.5-cmake-variable-name-comparison.patch
 # RH bug #1971676
 Patch15: evolution-data-server-3.28.5-calbackendfile-interval-tree-destroy.patch
 
+# RH bug #2008217
+Patch16: evolution-data-server-3.28.5-nonstandard-uuencode-encoding.patch
+
 ### Dependencies ###
 
 Requires: dconf
@@ -231,6 +234,7 @@ the functionality of the installed %{name} package.
 %patch13 -p1 -b .imapx-icloud-mail
 %patch14 -p1 -b .cmake-variable-name-comparison
 %patch15 -p1 -b .calbackendfile-interval-tree-destroy
+%patch16 -p1 -b .nonstandard-uuencode-encoding
 
 %build
 
@@ -492,6 +496,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %{_datadir}/installed-tests
 
 %changelog
+* Thu Sep 30 2021 Milan Crha <mcrha@redhat.com> - 3.28.5-18
+- Resolves: #2008217 (Camel: Understand non-standard "Content-Transfer-Encoding: uuencode")
+
 * Wed Jun 16 2021 Milan Crha <mcrha@redhat.com> - 3.28.5-17
 - Resolves: #1972749 (PrintableOptions.cmake: Correct variable name comparison)
 - Resolves: #1971676 (ECalBackendFile: Free interval tree only when being allocated)