Index: mail/mail-config.glade
===================================================================
--- mail/mail-config.glade	(revision 34702)
+++ mail/mail-config.glade	(working copy)
@@ -6984,38 +6984,38 @@
 					  <child internal-child="menu">
 					    <widget class="GtkMenu" id="convertwidget33">
 					      <property name="visible">True</property>
-
 					      <child>
-						<widget class="GtkMenuItem" id="convertwidget34">
+						<widget class="GtkMenuItem" id="convertwidget36">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Quote original message</property>
+						  <property name="label" translatable="yes">Attachment</property>
 						  <property name="use_underline">True</property>
 						</widget>
 					      </child>
 
 					      <child>
-						<widget class="GtkMenuItem" id="convertwidget35">
+						<widget class="GtkMenuItem" id="convertwidget50">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Do not quote original message</property>
+						  <property name="label" translatable="yes">Inline</property>
 						  <property name="use_underline">True</property>
 						</widget>
 					      </child>
 
 					      <child>
-						<widget class="GtkMenuItem" id="convertwidget36">
+						<widget class="GtkMenuItem" id="convertwidget34">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Attach original message</property>
+						  <property name="label" translatable="yes">Quoted</property>
 						  <property name="use_underline">True</property>
 						</widget>
 					      </child>
 
 					      <child>
-						<widget class="GtkMenuItem" id="convertwidget50">
+						<widget class="GtkMenuItem" id="convertwidget35">
 						  <property name="visible">True</property>
-						  <property name="label" translatable="yes">Inline original message (Outlook style)</property>
+						  <property name="label" translatable="yes">Do not quote original message</property>
 						  <property name="use_underline">True</property>
 						</widget>
 					      </child>
+					      
 					    </widget>
 					  </child>
 					</widget>
Index: mail/mail-config.h
===================================================================
--- mail/mail-config.h	(revision 34702)
+++ mail/mail-config.h	(working copy)
@@ -67,10 +67,10 @@
 } MailConfigForwardStyle;
 
 typedef enum {
+	MAIL_CONFIG_REPLY_ATTACH,
+	MAIL_CONFIG_REPLY_OUTLOOK,
 	MAIL_CONFIG_REPLY_QUOTED,
-	MAIL_CONFIG_REPLY_DO_NOT_QUOTE,
-	MAIL_CONFIG_REPLY_ATTACH,
-	MAIL_CONFIG_REPLY_OUTLOOK
+	MAIL_CONFIG_REPLY_DO_NOT_QUOTE
 } MailConfigReplyStyle;
 
 typedef enum {
