[Minor] Look also for mime charset

diff --git a/src/libmime/mime_encoding.c b/src/libmime/mime_encoding.c
index c3f69edbddd6f3d0a23d90127087f5215d1b1283..f7a244d0cd69f99b65603ee75d53af2848102207 100644 (file)
--- a/src/libmime/mime_encoding.c
+++ b/src/libmime/mime_encoding.c
@@ -239,6 +239,7 @@ rspamd_mime_detect_charset (const rspamd_ftok_t *in, rspamd_mempool_t *pool)
 {
        gchar *ret = NULL, *h, *t;
        struct rspamd_charset_substitution *s;
+       const gchar *cset;
        UErrorCode uc_err = U_ZERO_ERROR;
 
        if (sub_hash == NULL) {
@@ -271,7 +272,13 @@ rspamd_mime_detect_charset (const rspamd_ftok_t *in, rspamd_mempool_t *pool)
                return ucnv_getStandardName (s->canon, "IANA", &uc_err);
        }
 
-       return ucnv_getStandardName (ret, "IANA", &uc_err);
+       cset = ucnv_getStandardName (ret, "IANA", &uc_err);
+
+       if (cset == NULL) {
+               cset = ucnv_getStandardName (ret, "MIME", &uc_err);
+       }
+
+       return cset;
 }
 
 gchar *