diff --git a/config/alfresco/web-scripts-application-context.xml b/config/alfresco/web-scripts-application-context.xml
index 7571b3c6bd..82f13cc350 100644
--- a/config/alfresco/web-scripts-application-context.xml
+++ b/config/alfresco/web-scripts-application-context.xml
@@ -1757,6 +1757,7 @@
         <property name="quickShareService" ref="QuickShareService"/>
         <property name="enabled" value="${system.quickshare.enabled}" />
         <property name="delegate" ref="webscript.content.streamer" />
+        <property name="contentService" ref="ContentService" />
     </bean>
     
     <!-- unauthenticated (note: equivalent to authenticated "thumbnail.get") -->
diff --git a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
index dccc065acd..2b84ce61ea 100644
--- a/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
+++ b/source/java/org/alfresco/repo/web/scripts/content/ContentGet.java
@@ -143,7 +143,11 @@ public class ContentGet extends StreamContent implements ServletContextAware
     {
         String userAgent = req.getHeader("User-Agent");
         userAgent = userAgent != null ? userAgent.toLowerCase() : "";
-        boolean rfc5987Supported = (userAgent.contains("msie") || userAgent.contains(" trident/") || userAgent.contains(" chrome/") || userAgent.contains(" firefox/"));
+        boolean rfc5987Supported = (userAgent.contains("msie") ||
+                userAgent.contains(" trident/") ||
+                userAgent.contains(" chrome/") ||
+                userAgent.contains(" firefox/") ||
+                userAgent.contains(" safari/"));
 
         if (attach && rfc5987Supported)
         {