From 475ff04dbab54c83328ecea0080a5cebc53f12d3 Mon Sep 17 00:00:00 2001
From: Christoph Hohmann <reboot@gmx.ch>
Date: Sun, 29 Dec 2002 02:01:57 +0000
Subject: [PATCH] 0.8.8claws21

* src/folder.c
        only check for IGNORED parent message when message is
        not IGNORED itself
---
 ChangeLog.claws | 6 ++++++
 configure.in    | 2 +-
 src/folder.c    | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 7b26174f4..1976b01d4 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,9 @@
+2002-12-29 [christoph]	0.8.8claws21
+
+	* src/folder.c
+		only check for IGNORED parent message when message is
+		not IGNORED itself
+
 2002-12-29 [alfons]	0.8.8claws20
 
 	* src/summaryview.c
diff --git a/configure.in b/configure.in
index 9867c254a..46bc11fd4 100644
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=8
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws20
+EXTRA_VERSION=claws21
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/folder.c b/src/folder.c
index 8a18558ee..f00236445 100644
--- a/src/folder.c
+++ b/src/folder.c
@@ -1159,7 +1159,7 @@ gint folder_item_scan(FolderItem *item)
 					unreadcnt++;
 				if (MSG_IS_UNREAD(msginfo->flags) && procmsg_msg_has_marked_parent(msginfo))
 					unreadmarkedcnt++;
-				if (procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
+				if (!MSG_IS_IGNORE_THREAD(msginfo->flags) && procmsg_msg_has_flagged_parent(msginfo, MSG_IGNORE_THREAD))
 					procmsg_msginfo_set_flags(msginfo, MSG_IGNORE_THREAD, 0);
 			}
 			totalcnt++;
-- 
2.25.1