diff --git a/src/org/forkalsrud/album/web/AlbumServlet.java b/src/org/forkalsrud/album/web/AlbumServlet.java
index 0d9893e..aa3bcf8 100644
--- a/src/org/forkalsrud/album/web/AlbumServlet.java
+++ b/src/org/forkalsrud/album/web/AlbumServlet.java
@@ -92,10 +92,8 @@ public class AlbumServlet
         if (size != null) {
 
             try {
-                res.setContentType("image/jpeg");
                 FileEntry e = (FileEntry)DirectoryEntry.getEntry(file);
                 scaleImage(req, res, file, e.getThumbnail(), size);
-                res.setStatus(HttpServletResponse.SC_OK);
                 return;
             } catch (Exception e) {
                 throw new RuntimeException("sadness", e);
@@ -267,7 +265,8 @@ public class AlbumServlet
 
         System.out.println("             " + key + " added to the cache with size " + cimg.bits.length + " -- now " + imageCache.getSize() + " entries");
 
-        //res.setContentType(cimg.mimeType);
+        res.setStatus(HttpServletResponse.SC_OK);
+        res.setContentType(cimg.mimeType);
         res.setContentLength(cimg.bits.length);
         res.getOutputStream().write(cimg.bits);
       }