diff --git a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
index 2479af4058377e08584fce054850a1b7dc5d02d9..b44c7539a760ed3c5bf574ce03a63cda2af9bab4 100644
--- a/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
+++ b/datastore_server/source/java/ch/systemsx/cisd/openbis/dss/generic/server/AbstractDatasetDownloadServlet.java
@@ -200,9 +200,13 @@ abstract public class AbstractDatasetDownloadServlet extends HttpServlet
             return BINARY_CONTENT_TYPE;
         } else
         {
-            if (FilenameUtils.getExtension(f.getName()).length() == 0)
+            String extension = FilenameUtils.getExtension(f.getName());
+            if (extension.length() == 0)
             {
                 return PLAIN_TEXT_CONTENT_TYPE;
+            } else if (extension.equalsIgnoreCase("png"))
+            {
+                return CONTENT_TYPE_PNG;
             } else
             {
                 return MIMETYPES.getContentType(f.getName().toLowerCase());