diff --git a/evolution-2.10.3-server-message-double-free.patch b/evolution-2.10.3-server-message-double-free.patch
new file mode 100644
index 0000000..8c4316c
--- /dev/null
+++ b/evolution-2.10.3-server-message-double-free.patch
@@ -0,0 +1,15 @@
+diff -up evolution-2.10.3/mail/mail-session.c.server-message-double-free evolution-2.10.3/mail/mail-session.c
+--- evolution-2.10.3/mail/mail-session.c.server-message-double-free	2008-03-25 10:01:13.000000000 -0400
++++ evolution-2.10.3/mail/mail-session.c	2008-03-25 10:01:25.000000000 -0400
+@@ -389,10 +389,8 @@ alert_user(CamelSession *session, CamelS
+ 		mail_msg_unref (m);
+ 	}
+ 
+-	if (m->ismain) {
+-		user_message_free (m);
++	if (m->ismain)
+ 		mail_msg_unref (m);
+-	}
+ 
+ 	return result;
+ }
diff --git a/evolution.spec b/evolution.spec
index 4e89a89..211da4f 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -46,7 +46,7 @@
 
 Name: evolution
 Version: 2.12.3
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 Summary: GNOME's next-generation groupware suite
@@ -129,6 +129,9 @@ Patch38: evolution-2.12.3-no-drag-finish.patch
 # RH bug #436081 / CVE-2008-0072
 Patch39: evolution-2.12.3-CVE-2008-0072.patch
 
+# GNOME bug #524310
+Patch40: evolution-2.10.3-server-message-double-free.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -273,6 +276,7 @@ This package contains the help for Evolution.
 %patch37 -p1 -b .source-changed-event
 %patch38 -p1 -b .no-drag-finish
 %patch39 -p1 -b .CVE-2008-0027
+%patch40 -p1 -b .server-message-double-free
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -723,6 +727,9 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_datadir}/omf/evolution
 
 %changelog
+* Tue Mar 25 2008 Dan Williams <dcbw@redhat.com> - 2.12.3-4.fc8
+- Add patch for GNOME bug #524310
+
 * Tue Mar 04 2008 Matthew Barnes <mbarnes@redhat.com> - 2.12.3-3.fc8
 - Add patch for CVE-2008-0072 (format string vulnerability).