Index: mail-callbacks.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-callbacks.c,v
retrieving revision 1.282.4.7
diff -U4 -r1.282.4.7 mail-callbacks.c
--- mail-callbacks.c	18 Apr 2002 20:45:18 -0000	1.282.4.7
+++ mail-callbacks.c	25 May 2002 03:53:43 -0000
@@ -830,28 +830,8 @@
 	
 	if (!composer)
 		return NULL;
 	
-	sender = camel_mime_message_get_from (message);
-	if (sender != NULL && camel_address_length (CAMEL_ADDRESS (sender)) > 0) {
-		camel_internet_address_get (sender, 0, &name, &address);
-	} else {
-		name = _("an unknown sender");
-	}
-	
-	date = camel_mime_message_get_date (message, NULL);
-	
-	strftime (date_str, sizeof (date_str), _("On %a, %Y-%m-%d at %H:%M, %%s wrote:"),
-		  localtime (&date));
-	format = e_utf8_from_locale_string (date_str);
-	text = mail_tool_quote_message (message, format, name && *name ? name : address);
-	g_free (format);
-	
-	if (text) {
-		e_msg_composer_set_body_text (composer, text);
-		g_free (text);
-	}
-	
 	/* Set the recipients */
 	accounts = mail_config_get_accounts ();
 	
 	to_addrs = camel_mime_message_get_recipients (message, CAMEL_RECIPIENT_TYPE_TO);
@@ -991,8 +971,29 @@
 		e_msg_composer_add_header (composer, "References", reply_refs);
 		g_free (reply_refs);
 	} else if (references) {
 		e_msg_composer_add_header (composer, "References", references);
+	}
+	
+	/* Finally, add reply attribution and quoted reply */
+	sender = camel_mime_message_get_from (message);
+	if (sender != NULL && camel_address_length (CAMEL_ADDRESS (sender)) > 0) {
+		camel_internet_address_get (sender, 0, &name, &address);
+	} else {
+		name = _("an unknown sender");
+	}
+	
+	date = camel_mime_message_get_date (message, NULL);
+	
+	strftime (date_str, sizeof (date_str), _(me->id->reply_attribution),
+		  localtime (&date));
+	format = e_utf8_from_locale_string (date_str);
+	text = mail_tool_quote_message (message, format, name && *name ? name : address);
+	g_free (format);
+	
+	if (text) {
+		e_msg_composer_set_body_text (composer, text);
+		g_free (text);
 	}
 	
 	return composer;
 }
Index: mail-config.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-config.c,v
retrieving revision 1.187.4.3
diff -U4 -r1.187.4.3 mail-config.c
--- mail-config.c	2001/12/14 20:01:30	1.187.4.3
+++ mail-config.c	2002/05/25 03:53:49
@@ -420,8 +420,12 @@
 		path = g_strdup_printf ("/Mail/Accounts/identity_has_html_signature_%d", i);
 		id->has_html_signature = bonobo_config_get_boolean_with_default (
 			config->db, path, FALSE, NULL);
 		g_free (path);
+		path = g_strdup_printf ("/Mail/Accounts/identity_reply_attribution_%d", i);
+		id->reply_attribution = bonobo_config_get_string_with_default (config->db, path, "On %a, %Y-%m-%d at %H:%M, %%s wrote:", NULL);
+		g_warning ("ID %d reply_attribution == %s", i, id->reply_attribution);
+		g_free (path);
 		
 		/* get the source */
 		source = g_new0 (MailConfigService, 1);
 		
@@ -716,8 +720,12 @@
 		g_free (path);
 		
 		path = g_strdup_printf ("/Mail/Accounts/identity_has_html_signature_%d", i);
 		bonobo_config_set_boolean (config->db, path, account->id->has_html_signature, NULL);
+		g_free (path);
+		
+		path = g_strdup_printf ("/Mail/Accounts/identity_reply_attribution_%d", i);
+		bonobo_config_set_string (config->db, path, account->id->reply_attribution, NULL);
 		g_free (path);
 		
 		/* source info */
 		path = g_strdup_printf ("/Mail/Accounts/source_url_%d", i);
Index: mail-config.h
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-config.h,v
retrieving revision 1.69
diff -U4 -r1.69 mail-config.h
--- mail-config.h	8 Nov 2001 22:31:53 -0000	1.69
+++ mail-config.h	25 May 2002 03:53:52 -0000
@@ -36,8 +36,9 @@
 	gchar *address;
 	gchar *organization;
 	gchar *signature;
 	gchar *html_signature;
+	gchar *reply_attribution;
 	gboolean has_html_signature;
 } MailConfigIdentity;
 
 typedef struct {
