sync 098claws

[claws.git] / src / codeconv.c

diff --git a/src/codeconv.c b/src/codeconv.c
index 53e6e827631e4add5fb700c636b66dc7f02743a4..ecab8f5635f0f40a849e3efb6e2f120b986cd58c 100644 (file)
--- a/src/codeconv.c
+++ b/src/codeconv.c
@@ -803,7 +803,9 @@ CodeConvFunc conv_get_code_conv_func(const gchar *src_charset_str,
        case C_ISO_8859_13:
        case C_ISO_8859_14:
        case C_ISO_8859_15:
-               if (dest_charset == C_AUTO)
+               if (dest_charset == C_AUTO &&
+                   (conv_get_current_charset() == src_charset ||
+                    MB_CUR_MAX > 1))
                        code_conv = conv_latintodisp;
                break;
        case C_SHIFT_JIS: