diff --git a/include/class.http.php b/include/class.http.php
index daafa21e7da605129bdd9c3754eac40e69520b0a..632a80b03b230fe8a941be470406cd79e871c8b8 100644
--- a/include/class.http.php
+++ b/include/class.http.php
@@ -106,7 +106,7 @@ class Http {
     }
 
     function download($filename, $type, $data=null, $disposition='attachment') {
-        if (strpos($type, 'image/') !== 0)
+        if (strpos($type, 'image/') !== 0 || preg_match('/image\/.*\+.*/', $type))
           $disposition='attachment';
 
         header('Pragma: private');