From 8c9063d42274ea959cc50b9cc1f04ba82e735d25 Mon Sep 17 00:00:00 2001
From: Paul Mangan <paul@claws-mail.org>
Date: Fri, 22 Nov 2002 10:18:00 +0000
Subject: [PATCH] fix for message display in UTF-8 locales

---
 ChangeLog.claws | 10 ++++++++++
 configure.in    |  2 +-
 src/textview.c  |  2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index a14d05948..bf1218c04 100644
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,13 @@
+2002-11-22 [paul]	0.8.5claws176
+
+	* src/textview.c
+		textview_set_font(): fix for message display in
+	  	UTF-8 locales (thanks to Sergey Vlasov).
+		
+	* AUTHORS
+		add new team members and contributors
+
+
 2002-11-21 [colin]	0.8.5claws175
 
 	* src/procmsg.[ch]
diff --git a/configure.in b/configure.in
index de2063dc4..b330e98ce 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=claws175
+EXTRA_VERSION=claws176
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
diff --git a/src/textview.c b/src/textview.c
index 1a16f09c9..41054fa2c 100644
--- a/src/textview.c
+++ b/src/textview.c
@@ -1192,7 +1192,7 @@ void textview_set_font(TextView *textview, const gchar *codeset)
 	/* In multi-byte mode, GtkSText can't display 8bit characters
 	   correctly, so it must be single-byte mode. */
 	if (MB_CUR_MAX > 1) {
-		if (codeset) {
+		if (codeset && conv_get_current_charset() != C_UTF_8) {
 			if (!g_strncasecmp(codeset, "ISO-8859-", 9) ||
 			    !g_strcasecmp(codeset, "BALTIC"))
 				use_fontset = FALSE;
-- 
2.25.1