diff --git a/evolution-2.30.1.2-quietly-close-drafts.patch b/evolution-2.30.1.2-quietly-close-drafts.patch
new file mode 100644
index 0000000..69408c0
--- /dev/null
+++ b/evolution-2.30.1.2-quietly-close-drafts.patch
@@ -0,0 +1,21 @@
+diff -up evolution-2.30.1.2/mail/em-composer-utils.c.quietly-close-drafts evolution-2.30.1.2/mail/em-composer-utils.c
+--- evolution-2.30.1.2/mail/em-composer-utils.c.quietly-close-drafts	2010-04-26 09:13:17.000000000 -0400
++++ evolution-2.30.1.2/mail/em-composer-utils.c	2010-05-28 17:03:41.058084199 -0400
+@@ -585,8 +585,6 @@ save_draft_done (CamelFolder *folder, Ca
+ 	if (!ok)
+ 		goto done;
+ 
+-	composer_set_no_change (sdi->composer, FALSE, FALSE);
+-
+ 	if ((emcs = sdi->emcs) == NULL)
+ 		emcs = emcs_new ();
+ 
+@@ -994,7 +992,7 @@ edit_message (CamelMimeMessage *message,
+ 		emcs_set_drafts_info (emcs, drafts, uid);
+ 	}
+ 
+-	composer_set_no_change (composer, TRUE, FALSE);
++	composer_set_no_change (composer, TRUE, TRUE);
+ 
+ 	if (!e_msg_composer_get_lite())
+ 		gtk_widget_show (GTK_WIDGET (composer));
diff --git a/evolution.spec b/evolution.spec
index 70ac00b..3a98d05 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -39,7 +39,7 @@
 
 Name: evolution
 Version: 2.30.1
-Release: 7%{?dist}
+Release: 8%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -77,6 +77,9 @@ Patch16: evolution-2.30.1.2-mail-browser-crash.patch
 # GNOME bug #618400
 Patch17: evolution-2.30.1.2-missing-shortcut.patch
 
+# RH bug #590373 / GNOME bug #599794
+Patch18: evolution-2.30.1.2-quietly-close-drafts.patch
+
 ## Dependencies ###
 
 Requires(pre): GConf2
@@ -247,6 +250,7 @@ This package contains the plugin to import Microsoft Personal Storage Table
 %patch15 -p1 -b .alarm-notify-icons
 %patch16 -p1 -b .mail-browser-crash
 %patch17 -p1 -b .missing-shortcut
+%patch18 -p1 -b .quietly-close-drafts
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -698,6 +702,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Fri May 28 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-8.fc13
+- Add patch for RH bug #590373 (quietly close unchanged drafts).
+
 * Thu May 27 2010 Matthew Barnes <mbarnes@redhat.com> - 2.30.1-7.fc13
 - Add patch for GNOME bug #618400 (missing keyboard shortcut).