diff --git a/composer/ChangeLog b/composer/ChangeLog
index 2a8167bb93..56e33a762b 100644
--- a/composer/ChangeLog
+++ b/composer/ChangeLog
@@ -1,3 +1,12 @@
+2008-08-01  Matthew Barnes  <mbarnes@redhat.com>
+
+	** Fixes bug #428384
+
+	* mail-composer.error.xml:
+	Improve buttons in the "exit-unsaved" dialog by replacing "Cancel"
+	with "Continue Editing" and "Save Message" with "Save Draft".
+	Suggested by bytesmythe.
+
 2008-07-20  Bharath Acharya  <abharath@novell.com>
 
 	** Fix for bug #200147
diff --git a/composer/mail-composer.error.xml b/composer/mail-composer.error.xml
index 210756bb52..6f76887bc8 100644
--- a/composer/mail-composer.error.xml
+++ b/composer/mail-composer.error.xml
@@ -46,8 +46,8 @@
   <_primary>Are you sure you want to discard the message, titled '{0}', you are composing?</_primary>
   <_secondary>Closing this composer window will discard the message permanently, unless you choose to save the message in your Drafts folder. This will allow you to continue the message at a later date.</_secondary>
   <button _label="_Discard Changes" response="GTK_RESPONSE_NO"/>
-  <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
-  <button _label="_Save Message" response="GTK_RESPONSE_YES"/>
+  <button _label="_Continue Editing" response="GTK_RESPONSE_CANCEL"/>
+  <button _label="_Save Draft" response="GTK_RESPONSE_YES"/>
  </error>
 
  <error id="no-build-message" type="error" modal="true">