diff --git a/config/alfresco/thumbnail-service-context.xml b/config/alfresco/thumbnail-service-context.xml
index fe3c2044de..6531b08cab 100644
--- a/config/alfresco/thumbnail-service-context.xml
+++ b/config/alfresco/thumbnail-service-context.xml
@@ -242,8 +242,8 @@
     </bean> 
     
     <!-- Size limits (KBytes) by mimetype of original source content after which thumbnails
-         are not created. If the mimetype is not specified or the value is less than or
-         equal to zero, a thumbnail will be generated regardless of size. -->
+         are not created. If the mimetype is not specified or the value is less than zero,
+         a thumbnail will be generated regardless of size. -->
     <util:map id="mimetypeMaxSourceSizeKBytes" 
         map-class="java.util.HashMap" 
         key-type="java.lang.String" 
diff --git a/source/java/org/alfresco/repo/thumbnail/CreateThumbnailActionExecuter.java b/source/java/org/alfresco/repo/thumbnail/CreateThumbnailActionExecuter.java
index 0260ddda97..f0c7496f89 100644
--- a/source/java/org/alfresco/repo/thumbnail/CreateThumbnailActionExecuter.java
+++ b/source/java/org/alfresco/repo/thumbnail/CreateThumbnailActionExecuter.java
@@ -157,16 +157,17 @@ public class CreateThumbnailActionExecuter extends ActionExecuterAbstractBase
                 String mimetype = content.getMimetype();
                 if (!registry.isThumbnailDefinitionAvailable(content.getContentUrl(), mimetype, content.getSize(), details))
                 {
-                    logger.info("Unable to create thumbnail '" + details.getName() + "' for " +
+                    logger.debug("Unable to create thumbnail '" + details.getName() + "' for " +
                             mimetype + " as no transformer is currently available");
                     return;
                 }
                 if (mimetypeMaxSourceSizeKBytes != null)
                 {
                     Long maxSourceSizeKBytes = mimetypeMaxSourceSizeKBytes.get(mimetype);
-                    if (maxSourceSizeKBytes != null && maxSourceSizeKBytes > 0 && maxSourceSizeKBytes <= (content.getSize()/1024L))
+                    if (maxSourceSizeKBytes != null && maxSourceSizeKBytes >= 0 && maxSourceSizeKBytes < (content.getSize()/1024L))
                     {
-                        logger.info("Creation of " + details.getName()+ " thumbnail from '" + mimetype + "' , content is too big ("+(content.getSize()/1024L)+"K >= "+maxSourceSizeKBytes+"K)");
+                        logger.debug("Unable to create thumbnail '" + details.getName() + "' for " +
+                                mimetype + " as content is too large ("+(content.getSize()/1024L)+"K > "+maxSourceSizeKBytes+"K)");
                         return; //avoid transform
                     }
                 }
diff --git a/source/java/org/alfresco/repo/thumbnail/UpdateThumbnailActionExecuter.java b/source/java/org/alfresco/repo/thumbnail/UpdateThumbnailActionExecuter.java
index 23d57bb828..0cf6af5b86 100644
--- a/source/java/org/alfresco/repo/thumbnail/UpdateThumbnailActionExecuter.java
+++ b/source/java/org/alfresco/repo/thumbnail/UpdateThumbnailActionExecuter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2011 Alfresco Software Limited.
+ * Copyright (C) 2005-2012 Alfresco Software Limited.
  *
  * This file is part of Alfresco
  *
@@ -176,12 +176,14 @@ public class UpdateThumbnailActionExecuter extends ActionExecuterAbstractBase
             if(contentProp instanceof ContentData)
             {
                 ContentData content = (ContentData)contentProp;
+                String mimetype = content.getMimetype();
                 if (mimetypeMaxSourceSizeKBytes != null)
                 {
-                    Long maxSourceSizeKBytes = mimetypeMaxSourceSizeKBytes.get(content.getMimetype());
-                    if (maxSourceSizeKBytes != null && maxSourceSizeKBytes < (content.getSize()/1024L))
+                    Long maxSourceSizeKBytes = mimetypeMaxSourceSizeKBytes.get(mimetype);
+                    if (maxSourceSizeKBytes != null && maxSourceSizeKBytes >= 0 && maxSourceSizeKBytes < (content.getSize()/1024L))
                     {
-                        logger.info("Creation of thumbnail,  '" + details.getName() + " , content too big ("+maxSourceSizeKBytes+"K)");
+                        logger.debug("Unable to create thumbnail '" + details.getName() + "' for " +
+                                mimetype + " as content is too large ("+(content.getSize()/1024L)+"K > "+maxSourceSizeKBytes+"K)");
                         return; //avoid transform
                     }
                 }