diff --git a/resources/language/English/strings.xml b/resources/language/English/strings.xml
index 8713312d..03acc478 100644
--- a/resources/language/English/strings.xml
+++ b/resources/language/English/strings.xml
@@ -305,6 +305,7 @@
     <string id="30539">Download additional art from FanArtTV (slower!)</string>
     <string id="30540">Download movie set/collection art from FanArtTV</string>
     <string id="30541">Don't ask to pick a certain stream/quality</string>
+    <string id="30542">Always pick best quality for trailers</string>
 
 
     <!-- service add-on -->
diff --git a/resources/language/German/strings.xml b/resources/language/German/strings.xml
index 9dee7c20..cf8ecadd 100644
--- a/resources/language/German/strings.xml
+++ b/resources/language/German/strings.xml
@@ -31,6 +31,7 @@
     <string id="30539">Zusätzliche Bilder von FanArtTV herunterladen (langsamer!)</string>
     <string id="30540">FanArtTV Film-Sets/Collections Bilder herunterladen</string>
     <string id="30541">Nicht fragen, welcher Stream/Qualität gespielt wird</string>
+    <string id="30542">Trailer immer in der besten Qualität abspielen</string>
 
     <string id="30014">Verbindung</string>
     <string id="30015">Netzwerk</string>
diff --git a/resources/lib/PlexAPI.py b/resources/lib/PlexAPI.py
index 590b9ba5..8c2942f4 100644
--- a/resources/lib/PlexAPI.py
+++ b/resources/lib/PlexAPI.py
@@ -2213,11 +2213,21 @@ class API():
         """
         xargs = clientinfo.ClientInfo().getXArgsDeviceInfo()
         # For DirectPlay, path/key of PART is needed
+        # trailers are 'clip' with PMS xmls
         if action == "DirectStream":
-            if len(self.item) > 1 and utils.settings('bestQuality') == 'false':
+            # How many streams do we have?
+            count = 0
+            for entry in self.item.findall('./Media'):
+                count += 1
+            if (count > 1 and (
+                    (self.getType() != 'clip' and
+                     utils.settings('bestQuality') == 'false')
+                    or
+                    (self.getType() == 'clip' and
+                     utils.settings('bestTrailer') == 'false'))):
                 # Several streams/files available.
                 dialoglist = []
-                for entry in self.item:
+                for entry in self.item.findall('./Media'):
                     dialoglist.append(
                         "%sp %s - %s (%s)"
                         % (entry.attrib.get('videoResolution', 'unknown'),
diff --git a/resources/settings.xml b/resources/settings.xml
index c68b881b..f11066af 100644
--- a/resources/settings.xml
+++ b/resources/settings.xml
@@ -83,6 +83,7 @@
 	<category label="30516"><!-- Playback -->
 		<setting type="sep" />
 		<setting id="bestQuality" type="bool" label="30541" default="false" />
+		<setting id="bestTrailer" type="bool" label="30542" default="true" />
 		<setting id="enableCinema" type="bool" label="30518" default="true" />
 		<setting id="askCinema" type="bool" label="30519" default="false" visible="eq(-1,true)" subsetting="true" />
         <setting id="trailerNumber" type="slider" label="39000" default="3" visible="eq(-2,true)" range="1,1,15" option="int" />