githubFork/roundcubemail.git

			@@ -61,7 +61,7 @@
			$OUTPUT->set_env('mailbox', $mbox_name);

			// mimetypes supported by the browser (default settings)
			$mimetypes = $RCMAIL->config->get('client_mimetypes', 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,image/tiff,application/x-javascript,application/pdf,application/x-shockwave-flash');
			$mimetypes = $RCMAIL->config->get('client_mimetypes', 'text/plain,text/html,text/xml,image/jpeg,image/gif,image/png,image/bmp,image/tiff,application/x-javascript,application/pdf,application/x-shockwave-flash');
			$mimetypes = is_string($mimetypes) ? explode(',', $mimetypes) : (array)$mimetypes;

			// Remove unsupported types, which makes that attachment which cannot be
			@@ -69,9 +69,14 @@
			if (empty($_SESSION['browser_caps']['pdf']) && ($key = array_search('application/pdf', $mimetypes)) !== false) {
			unset($mimetypes[$key]);
			}
			// @TODO: we could convert TIFF to JPEG and display it
			if (empty($_SESSION['browser_caps']['tif']) && ($key = array_search('image/tiff', $mimetypes)) !== false) {
			if (empty($_SESSION['browser_caps']['flash']) && ($key = array_search('application/x-shockwave-flash', $mimetypes)) !== false) {
			unset($mimetypes[$key]);
			}
			if (empty($_SESSION['browser_caps']['tif']) && ($key = array_search('image/tiff', $mimetypes)) !== false) {
			// we can convert tiff to jpeg
			if (!$RCMAIL->config->get('im_convert_path')) {
			unset($mimetypes[$key]);
			}
			}

			$OUTPUT->set_env('mimetypes', $mimetypes);
			@@ -139,7 +144,7 @@

			function rcmail_message_attachments($attrib)
			{
			global $PRINT_MODE, $MESSAGE;
			global $PRINT_MODE, $MESSAGE, $RCMAIL;

			$out = $ol = '';

			@@ -151,7 +156,8 @@
			}

			if ($PRINT_MODE) {
			$ol .= html::tag('li', null, sprintf("%s (%s)", Q($filename), Q(show_bytes($attach_prop->size))));
			$size = $RCMAIL->message_part_size($attach_prop);
			$ol .= html::tag('li', null, Q(sprintf("%s (%s)", $filename, $size)));
			}
			else {
			if (mb_strlen($filename) > 50) {