diff --git a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.js b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.js
index 759a0b943e..20a5df564f 100644
--- a/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.js
+++ b/config/alfresco/templates/webscripts/org/alfresco/repository/thumbnail/thumbnail.get.js
@@ -47,7 +47,7 @@ function main()
    
    // Get the thumbnail
    var thumbnail = node.getThumbnail(thumbnailName);
-   if (thumbnail == null)
+   if (thumbnail == null || thumbnail.size == 0)
    {
       // Queue the creation of the thumbnail if appropriate
       if (fc)
diff --git a/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java b/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
index cdfa87cd77..ef604c3c8a 100644
--- a/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
+++ b/source/java/org/alfresco/repo/web/scripts/content/StreamContent.java
@@ -30,6 +30,7 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.io.Writer;
 import java.net.SocketException;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.Map;
@@ -400,6 +401,11 @@ public class StreamContent extends AbstractWebScript
             }
         }
         
+        // Create a date in the past
+        Calendar calendar = Calendar.getInstance();
+        calendar.set(1975, 3, 26);
+        
+        
         File file = TempFileProvider.createTempFile("streamContent-", ext);        
         InputStream is = this.getClass().getClassLoader().getResourceAsStream(resourcePath);
         OutputStream os = new FileOutputStream(file);        
@@ -409,7 +415,7 @@ public class StreamContent extends AbstractWebScript
         reader.setMimetype(mimetype);
         reader.setEncoding("UTF-8");
         
-        streamContentImpl(req, res, reader, attach, new Date(file.lastModified()));
+        streamContentImpl(req, res, reader, attach, calendar.getTime());
         
     }