Index: mail/ChangeLog
===================================================================
--- mail/ChangeLog	(revision 34619)
+++ mail/ChangeLog	(working copy)
@@ -1,3 +1,13 @@
+2007-12-03  Alex Kloss  <alexkloss@att.net>
+
+	** Fix for bug #329706
+
+	* em-utils.c (em_utils_prompt_user):
+	Add mnemonic 'd' to 'Do not show...' checkbox
+	* mail.error.xml:
+	Remove redundant 'Send anyway' label
+	Reorder buttons to 'Send','Cancel' as per HIG
+
 2007-11-29  Milan Crha  <mcrha@redhat.com>
 
 	** Part of fix for bug #271551
Index: mail/em-utils.c
===================================================================
--- mail/em-utils.c	(revision 34619)
+++ mail/em-utils.c	(working copy)
@@ -117,7 +117,7 @@
 	va_end(ap);
 
 	if (promptkey) {
-		check = gtk_check_button_new_with_label (_("Do not show this message again."));
+		check = gtk_check_button_new_with_mnemonic (_("_Do not show this message again."));
 		gtk_container_set_border_width((GtkContainer *)check, 12);
 		gtk_box_pack_start ((GtkBox *)((GtkDialog *) mbox)->vbox, check, TRUE, TRUE, 0);
 		gtk_widget_show (check);
Index: mail/mail.error.xml
===================================================================
--- mail/mail.error.xml	(revision 34619)
+++ mail/mail.error.xml	(working copy)
@@ -14,10 +14,9 @@
   <error id="ask-send-html" type="question" default="GTK_RESPONSE_YES">
     <_primary>Are you sure you want to send a message in HTML format?</_primary>
     <_secondary xml:space="preserve">Please make sure the following recipients are willing and able to receive HTML email:
-{0}
-Send anyway?</_secondary>
-    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
+{0}</_secondary>
     <button _label="_Send" response="GTK_RESPONSE_YES"/>
+    <button stock="gtk-cancel" response="GTK_RESPONSE_CANCEL"/>
   </error>
 
   <error id="ask-send-no-subject" type="question" default="GTK_RESPONSE_YES">
