diff --git a/evolution-2.9.4-view-message-source.patch b/evolution-2.9.4-view-message-source.patch
new file mode 100644
index 0000000..bd0ed6d
--- /dev/null
+++ b/evolution-2.9.4-view-message-source.patch
@@ -0,0 +1,11 @@
+--- evolution-2.9.4/mail/em-format-html.c.view-message-source	2006-12-20 10:51:00.000000000 -0500
++++ evolution-2.9.4/mail/em-format-html.c	2006-12-21 10:08:02.000000000 -0500
+@@ -1872,7 +1872,7 @@
+ 	filtered_stream = camel_stream_filter_new_with_stream ((CamelStream *) stream);
+ 	html_filter = camel_mime_filter_tohtml_new (CAMEL_MIME_FILTER_TOHTML_CONVERT_NL
+ 						    | CAMEL_MIME_FILTER_TOHTML_CONVERT_SPACES
+-						    | CAMEL_MIME_FILTER_TOHTML_ESCAPE_8BIT, 0);
++						    | CAMEL_MIME_FILTER_TOHTML_PRESERVE_8BIT, 0);
+ 	camel_stream_filter_add(filtered_stream, html_filter);
+ 	camel_object_unref(html_filter);
+ 	
diff --git a/evolution.spec b/evolution.spec
index 07de53a..4f164f0 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -44,7 +44,7 @@
 
 Name: evolution
 Version: 2.9.4
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPL
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -167,6 +167,9 @@ Patch44: evolution-2.9.3-meeting-list-view.patch
 # GNOME bug #373116
 Patch45: evolution-2.9.3-gtk-color-button.patch
 
+# GNOME bug #218898
+Patch46: evolution-2.9.4-view-message-source.patch
+
 ## Dependencies ###
 
 Requires: ORBit2 >= %{orbit2_version}
@@ -314,6 +317,7 @@ Development files needed for building things which link against evolution.
 %patch43 -p1 -b .unread-messages
 %patch44 -p1 -b .meeting-list-view
 %patch45 -p1 -b .gtk-color-button
+%patch46 -p1 -b .view-message-source
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -729,6 +733,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/evolution/%{evo_major}/libmenus.so
 
 %changelog
+* Thu Dec 21 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.4-3.fc7
+- Add patch for RH bug #218898 (viewing message source).
+
 * Wed Dec 20 2006 Matthew Barnes <mbarnes@redhat.com> - 2.9.4-2.fc7
 - Revise patch for RH bug #202751 (printing of indic languages).