Index: mail/em-composer-prefs.c
===================================================================
--- mail/em-composer-prefs.c	(revision 35170)
+++ mail/em-composer-prefs.c	(working copy)
@@ -720,6 +720,19 @@ spell_setup_check_options (EMComposerPre
  * End of Spell checking
  */
 
+static int
+attach_style_reply_new_order (int style_id, gboolean from_enum_to_option_id)
+{
+	int values[] = {MAIL_CONFIG_REPLY_ATTACH, 0, MAIL_CONFIG_REPLY_OUTLOOK, 1, MAIL_CONFIG_REPLY_QUOTED, 2, MAIL_CONFIG_REPLY_DO_NOT_QUOTE, 3, -1, -1};
+	int i;
+
+	for (i = from_enum_to_option_id ? 0 : 1; values[i] != -1; i += 2) {
+		if (values[i] == style_id)
+			return values [from_enum_to_option_id ? i + 1 : i - 1];
+	}
+
+	return style_id;
+}
 
 static void
 attach_style_info (GtkWidget *item, gpointer user_data)
@@ -732,6 +745,16 @@ attach_style_info (GtkWidget *item, gpoi
 }
 
 static void
+attach_style_info_reply (GtkWidget *item, gpointer user_data)
+{
+	int *style = user_data;
+
+	g_object_set_data ((GObject *) item, "style", GINT_TO_POINTER (attach_style_reply_new_order (*style, FALSE)));
+
+	(*style)++;
+}
+
+static void
 toggle_button_toggled (GtkToggleButton *toggle, EMComposerPrefs *prefs)
 {
 	const char *key;
@@ -975,10 +998,10 @@ em_composer_prefs_construct (EMComposerP
 
 	prefs->reply_style = GTK_OPTION_MENU (glade_xml_get_widget (gui, "omenuReplyStyle"));
 	style = gconf_client_get_int (prefs->gconf, "/apps/evolution/mail/format/reply_style", NULL);
-	gtk_option_menu_set_history (prefs->reply_style, style);
+	gtk_option_menu_set_history (prefs->reply_style, attach_style_reply_new_order (style, TRUE));
 	style = 0;
 	gtk_container_foreach (GTK_CONTAINER (gtk_option_menu_get_menu (prefs->reply_style)),
-			       attach_style_info, &style);
+			       attach_style_info_reply, &style);
 	option_menu_connect (prefs, prefs->reply_style, G_CALLBACK (style_activate),
 			     "/apps/evolution/mail/format/reply_style");
 
Index: mail/ChangeLog
===================================================================
--- mail/ChangeLog	(revision 35170)
+++ mail/ChangeLog	(working copy)
@@ -1,3 +1,12 @@
+2008-03-11  Milan Crha  <mcrha@redhat.com>
+
+	** Fix for bug #502826 (original patch by nickspoon0)
+
+	* mail-config.glade:
+	* em-composer-prefs.c: (attach_style_reply_new_order),
+	(attach_style_info_reply), (em_composer_prefs_construct):
+	Reword and reorder Reply Style items in the Preferences.
+
 2008-03-06  Tobias Mueller  <muelli@auftrags-killer.org>
 
 	** Fix for bug #520745
Index: mail/mail-config.glade
===================================================================
--- mail/mail-config.glade	(revision 35170)
+++ mail/mail-config.glade	(working copy)
@@ -7146,38 +7146,38 @@ For example: &quot;Work&quot; or &quot;P
 					  <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 (Outlook style)</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</property>
 						  <property name="use_underline">True</property>
 						</widget>
 					      </child>
+					      
 					    </widget>
 					  </child>
 					</widget>
