X-Git-Url: http://git.claws-mail.org/?p=claws.git;a=blobdiff_plain;f=src%2Fcompose.c;h=674b2f239817181b0f90fdf33be4e556b63e62fa;hp=407e2caa6cda483fea5864eec8eac5b6514b24ff;hb=0740e58d5987378a9cc9d1c647694a827e45e5fe;hpb=928107e0fedd80ae98042d587341da4739ebba8f

diff --git a/src/compose.c b/src/compose.c
index 407e2caa6..674b2f239 100644
--- a/src/compose.c
+++ b/src/compose.c
@@ -2157,9 +2157,12 @@ static gchar *compose_get_signature_str(Compose *compose)
 		sig_str = g_strconcat("\n\n", sig_body, NULL);
 
 	if (sig_str) {
-		utf8_sig_str = conv_codeset_strdup
-			(sig_str, conv_get_locale_charset_str(), CS_INTERNAL);
-		g_free(sig_str);
+		if (!g_utf8_validate(sig_str,1, NULL)) {
+			utf8_sig_str = conv_codeset_strdup
+				(sig_str, conv_get_locale_charset_str(), CS_INTERNAL);
+			g_free(sig_str);
+		} else
+			utf8_sig_str = sig_str;
 	}
 
 	return utf8_sig_str;