From a2fa696d02b8ff82eae201835ef4d395e81921f7 Mon Sep 17 00:00:00 2001
From: Alfons Hoogervorst <alfons@proteus.demon.nl>
Date: Fri, 18 Oct 2002 20:49:03 +0000
Subject: [PATCH] * src/compose.c 	make automagic reply work correctly
 for email accounts 	(whether it's viable to do a full sync with Hiro's 
 compose.c is still under discussion)

---
 ChangeLog.claws |  7 +++++++
 configure.in    |  2 +-
 src/compose.c   | 26 +++++++++++---------------
 3 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 1d4f86f7f..1f69f92cc 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,10 @@
+2002-10-18 [alfons]	0.8.5claws46
+
+	* src/compose.c
+		make automagic reply work correctly for email accounts 
+		(whether it's viable to do a full sync with Hiro's 
+		compose.c is still under discussion)
+
 2002-10-18 [melvin]	0.8.5claws45
 
 	* src/prefs_actions.c
diff --git a/configure.in b/configure.in
index 9e42fda56..e5a789b74 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=5
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws45
+EXTRA_VERSION=claws46
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/compose.c b/src/compose.c
index a81e1895c..29297654d 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -1470,6 +1470,7 @@ static gint compose_parse_header(Compose *compose, MsgInfo *msginfo)
 		hentry[H_LIST_POST].body = NULL;
 	}
 
+	/* CLAWS - X-Priority */
 	if (compose->mode == COMPOSE_REEDIT)
 		if (hentry[H_X_PRIORITY].body != NULL) {
 			gint priority;
@@ -1628,29 +1629,24 @@ static void compose_reply_set_entry(Compose *compose, MsgInfo *msginfo,
 	g_return_if_fail(compose->account != NULL);
 	g_return_if_fail(msginfo != NULL);
 
-	if (to_ml && compose->ml_post) {
-		compose_entry_append(compose, compose->ml_post,
-				     COMPOSE_TO);
-	} else if ((compose->account->protocol != A_NNTP) || followup_and_reply_to) {
-		if (!(to_all || ignore_replyto)
-		    && msginfo->folder
-		    && msginfo->folder->prefs->enable_default_reply_to) {
+	if (compose->account->protocol != A_NNTP || followup_and_reply_to) {
+		if (!compose->replyto && to_ml && compose->ml_post)
 			compose_entry_append(compose,
-			    msginfo->folder->prefs->default_reply_to,
-			    COMPOSE_TO);
-		} else
+					   compose->ml_post,
+					   COMPOSE_TO);
+		else
 			compose_entry_append(compose,
-				    ((compose->replyto && !ignore_replyto)
-				     ? compose->replyto
-				     : msginfo->from ? msginfo->from : ""),
-				     COMPOSE_TO);
+				 (compose->replyto && !ignore_replyto)
+				 ? compose->replyto
+				 : msginfo->from ? msginfo->from : "",
+				 COMPOSE_TO);
 	} else {
 		if (ignore_replyto)
 			compose_entry_append
 				(compose, msginfo->from ? msginfo->from : "",
 				 COMPOSE_TO);
 		else {
-			if (compose->followup_to && !strncmp(compose->followup_to,"poster",6)) {
+			if (compose->followup_to && !strncmp(compose->followup_to, "poster", 6)) {
 				compose_entry_append
 					(compose,
 					((compose->replyto && !ignore_replyto)
-- 
2.25.1