diff --git a/include/class_Language.inc b/include/class_Language.inc
index 987ca0d9535f856c1e0055de8bec652b75f1c7c7..22f4cb04b83b382b414f67d10ae9fbba813ea0c3 100644
--- a/include/class_Language.inc
+++ b/include/class_Language.inc
@@ -230,8 +230,10 @@ class Language
 
     if (!headers_sent()) {
       header("Content-Language: $lang".(empty($country) ? '' : "-$country"));
-      if (!empty($char)) {
+      if (!empty($char) && preg_match('|^text/|', $mime)) {
         header("Content-Type: $mime; charset=$char");
+      } else {
+        header("Content-Type: $mime");
       }
     } else {
       trigger_error('Could not set language '.$lang.' header, headers already sent');