diff --git a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
index 46d843c6a7..d88736a472 100644
--- a/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/BaseDownloadContentServlet.java
@@ -48,11 +48,11 @@ import org.alfresco.service.cmr.repository.StoreRef;
 import org.alfresco.service.cmr.security.AccessStatus;
 import org.alfresco.service.cmr.security.PermissionService;
 import org.alfresco.service.namespace.QName;
-import org.springframework.extensions.surf.util.URLDecoder;
-import org.springframework.extensions.surf.util.URLEncoder;
 import org.alfresco.web.app.Application;
 import org.alfresco.web.bean.LoginBean;
 import org.apache.commons.logging.Log;
+import org.springframework.extensions.surf.util.URLDecoder;
+import org.springframework.extensions.surf.util.URLEncoder;
 
 /**
  * Base class for the download content servlets. Provides common
@@ -289,11 +289,7 @@ public abstract class BaseDownloadContentServlet extends BaseServlet
             if (extIndex != -1)
             {
                String ext = filename.substring(extIndex + 1);
-               String mt = mimetypeMap.getMimetypesByExtension().get(ext);
-               if (mt != null)
-               {
-                  mimetype = mt;
-               }
+               mimetype = mimetypeMap.getMimetype(ext);
             }
          }
 
diff --git a/source/java/org/alfresco/web/app/servlet/UploadContentServlet.java b/source/java/org/alfresco/web/app/servlet/UploadContentServlet.java
index c13e87e53c..996d327881 100644
--- a/source/java/org/alfresco/web/app/servlet/UploadContentServlet.java
+++ b/source/java/org/alfresco/web/app/servlet/UploadContentServlet.java
@@ -174,11 +174,7 @@ public class UploadContentServlet extends BaseServlet
                 if (extIndex != -1)
                 {
                     String ext = filename.substring(extIndex + 1);
-                    String mt = mimetypeMap.getMimetypesByExtension().get(ext);
-                    if (mt != null)
-                    {
-                        mimetype = mt;
-                    }
+                    mimetype = mimetypeService.getMimetype(ext);
                 }
             }
         }
diff --git a/source/java/org/alfresco/web/bean/repository/Repository.java b/source/java/org/alfresco/web/bean/repository/Repository.java
index 59bc896a68..7889987b96 100644
--- a/source/java/org/alfresco/web/bean/repository/Repository.java
+++ b/source/java/org/alfresco/web/bean/repository/Repository.java
@@ -522,12 +522,8 @@ public final class Repository
       int extIndex = filename.lastIndexOf('.');
       if (extIndex != -1)
       {
-         String ext = filename.substring(extIndex + 1).toLowerCase();
-         String mt = mimetypeService.getMimetypesByExtension().get(ext);
-         if (mt != null)
-         {
-            mimetype = mt;
-         }
+         String ext = filename.substring(extIndex + 1);
+         mimetype = mimetypeService.getMimetype(ext);
       }
       
       return mimetype;