diff --git a/Source/GUI/Cocoa/English.lproj/Preferences.xib b/Source/GUI/Cocoa/English.lproj/Preferences.xib
index 6040ef73c..982bfc88b 100644
--- a/Source/GUI/Cocoa/English.lproj/Preferences.xib
+++ b/Source/GUI/Cocoa/English.lproj/Preferences.xib
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="18122" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="32700.99.1234" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="18122"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="22689"/>
         <capability name="System colors introduced in macOS 10.14" minToolsVersion="10.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <customObject id="-2" userLabel="File's Owner" customClass="PreferencesWindowController">
             <connections>
+                <outlet property="displayCaptionsCombo" destination="YiQ-ue-k2j" id="YY5-lp-ACy"/>
                 <outlet property="graphAdmShowChannelFormats" destination="SRz-4F-F2V" id="MST-K8-oSS"/>
                 <outlet property="graphAdmShowTrackUIDs" destination="UWP-Ms-fVg" id="8uz-It-VNh"/>
                 <outlet property="langsCombo" destination="26" id="47"/>
@@ -24,24 +25,24 @@
         <window title="Preferences" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" animationBehavior="documentWindow" frameAutosaveName="PreferencesWindow" id="1">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES"/>
             <windowPositionMask key="initialPositionMask" leftStrut="YES" rightStrut="YES" topStrut="YES" bottomStrut="YES"/>
-            <rect key="contentRect" x="276" y="391" width="450" height="220"/>
+            <rect key="contentRect" x="276" y="391" width="599" height="273"/>
             <rect key="screenRect" x="0.0" y="0.0" width="2560" height="1415"/>
             <view key="contentView" id="2">
-                <rect key="frame" x="0.0" y="0.0" width="450" height="220"/>
+                <rect key="frame" x="0.0" y="0.0" width="599" height="273"/>
                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                 <subviews>
                     <tabView fixedFrame="YES" drawsBackground="NO" translatesAutoresizingMaskIntoConstraints="NO" id="19">
-                        <rect key="frame" x="4" y="2" width="442" height="212"/>
+                        <rect key="frame" x="4" y="2" width="591" height="265"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <font key="font" metaFont="system"/>
                         <tabViewItems>
                             <tabViewItem label="General" identifier="General" id="20">
                                 <view key="view" id="23">
-                                    <rect key="frame" x="10" y="33" width="422" height="166"/>
+                                    <rect key="frame" x="10" y="33" width="571" height="219"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <textField verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="24">
-                                            <rect key="frame" x="6" y="146" width="119" height="17"/>
+                                            <rect key="frame" x="6" y="199" width="119" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" sendsActionOnEndEditing="YES" alignment="right" title="Language:" id="25">
                                                 <font key="font" metaFont="system"/>
@@ -49,9 +50,9 @@
                                                 <color key="backgroundColor" name="controlColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
-                                        <popUpButton verticalHuggingPriority="750" fixedFrame="YES" imageHugsTitle="YES" translatesAutoresizingMaskIntoConstraints="NO" id="26">
-                                            <rect key="frame" x="129" y="138" width="268" height="26"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                        <popUpButton imageHugsTitle="YES" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="26">
+                                            <rect key="frame" x="129" y="191" width="429" height="26"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="push" title="Default" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" state="on" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" selectedItem="48" id="27">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="menu"/>
@@ -69,7 +70,7 @@
                                             </connections>
                                         </popUpButton>
                                         <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="53">
-                                            <rect key="frame" x="130" y="104" width="268" height="30"/>
+                                            <rect key="frame" x="130" y="157" width="268" height="30"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" controlSize="small" sendsActionOnEndEditing="YES" alignment="left" title="Changes take effect after application restart" id="54">
                                                 <font key="font" metaFont="controlContent" size="11"/>
@@ -78,8 +79,8 @@
                                             </textFieldCell>
                                         </textField>
                                         <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="R7t-1b-La5">
-                                            <rect key="frame" x="129" y="80" width="268" height="25"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <rect key="frame" x="129" y="133" width="429" height="25"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                             <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" enabled="NO" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="11o-70-WWm">
                                                 <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
                                                 <font key="font" metaFont="menu"/>
@@ -89,20 +90,8 @@
                                                 <action selector="viewChanged:" target="-2" id="bQd-mk-Zb8"/>
                                             </connections>
                                         </popUpButton>
-                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TL9-gb-Tct">
-                                            <rect key="frame" x="303" y="59" width="90" height="17"/>
-                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                            <buttonCell key="cell" type="bevel" title="subscribe" bezelStyle="rounded" alignment="right" imageScaling="proportionallyDown" inset="2" id="qvF-It-rlQ">
-                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                <font key="font" metaFont="controlContent" size="11"/>
-                                            </buttonCell>
-                                            <color key="contentTintColor" name="controlAccentColor" catalog="System" colorSpace="catalog"/>
-                                            <connections>
-                                                <action selector="subscribeClicked:" target="-2" id="sie-Iw-KIs"/>
-                                            </connections>
-                                        </button>
                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="J5j-ea-kAp">
-                                            <rect key="frame" x="6" y="85" width="119" height="17"/>
+                                            <rect key="frame" x="6" y="138" width="119" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" lineBreakMode="truncatingTail" alignment="right" title="Default view:" id="mz3-nf-7kH">
                                                 <font key="font" metaFont="system"/>
@@ -114,7 +103,7 @@
                                             </connections>
                                         </textField>
                                         <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="rWx-fM-e08">
-                                            <rect key="frame" x="130" y="59" width="154" height="17"/>
+                                            <rect key="frame" x="130" y="112" width="154" height="17"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
                                             <textFieldCell key="cell" lineBreakMode="clipping" title="Premium MediaInfo feature" id="eaf-m0-xtv">
                                                 <font key="font" metaFont="controlContent" size="11"/>
@@ -122,16 +111,57 @@
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                             </textFieldCell>
                                         </textField>
+                                        <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="TL9-gb-Tct">
+                                            <rect key="frame" x="489" y="112" width="65" height="17"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMinY="YES"/>
+                                            <buttonCell key="cell" type="bevel" title="subscribe" bezelStyle="rounded" alignment="right" imageScaling="proportionallyDown" inset="2" id="qvF-It-rlQ">
+                                                <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                <font key="font" metaFont="controlContent" size="11"/>
+                                            </buttonCell>
+                                            <color key="contentTintColor" name="controlAccentColor" catalog="System" colorSpace="catalog"/>
+                                            <connections>
+                                                <action selector="subscribeClicked:" target="-2" id="sie-Iw-KIs"/>
+                                            </connections>
+                                        </button>
+                                    </subviews>
+                                </view>
+                            </tabViewItem>
+                            <tabViewItem label="Advanced" identifier="Advanced" id="Mtf-gr-SgJ">
+                                <view key="view" id="6tP-PZ-b2t">
+                                    <rect key="frame" x="10" y="33" width="571" height="219"/>
+                                    <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                                    <subviews>
+                                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="xDW-Vy-Za1">
+                                            <rect key="frame" x="9" y="192" width="189" height="16"/>
+                                            <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
+                                            <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="Handling of 608/708 streams:" id="FSN-9S-Ykj">
+                                                <font key="font" usesAppearanceFont="YES"/>
+                                                <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
+                                                <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
+                                            </textFieldCell>
+                                        </textField>
+                                        <popUpButton verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YiQ-ue-k2j">
+                                            <rect key="frame" x="203" y="184" width="355" height="25"/>
+                                            <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
+                                            <popUpButtonCell key="cell" type="push" bezelStyle="rounded" alignment="left" lineBreakMode="truncatingTail" borderStyle="borderAndBezel" imageScaling="proportionallyDown" inset="2" id="5vc-1A-EvW">
+                                                <behavior key="behavior" lightByBackground="YES" lightByGray="YES"/>
+                                                <font key="font" metaFont="menu"/>
+                                                <menu key="menu" id="8tg-vE-sZ0"/>
+                                            </popUpButtonCell>
+                                            <connections>
+                                                <action selector="captionsOptionChanged:" target="-2" id="8GD-WQ-DlJ"/>
+                                            </connections>
+                                        </popUpButton>
                                     </subviews>
                                 </view>
                             </tabViewItem>
                             <tabViewItem label="Graph" identifier="Graph" id="cbY-9w-AHy">
                                 <view key="view" id="4s0-dM-BRS">
-                                    <rect key="frame" x="10" y="33" width="422" height="166"/>
+                                    <rect key="frame" x="10" y="33" width="571" height="219"/>
                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                     <subviews>
                                         <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="UWP-Ms-fVg">
-                                            <rect key="frame" x="17" y="146" width="390" height="18"/>
+                                            <rect key="frame" x="17" y="199" width="539" height="18"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="ADM: Show TrackUIDs" bezelStyle="regularSquare" imagePosition="trailing" inset="2" id="aRP-Ce-Qp6">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -142,7 +172,7 @@
                                             </connections>
                                         </button>
                                         <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="SRz-4F-F2V">
-                                            <rect key="frame" x="17" y="124" width="390" height="18"/>
+                                            <rect key="frame" x="17" y="177" width="539" height="18"/>
                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" flexibleMinY="YES"/>
                                             <buttonCell key="cell" type="check" title="ADM: Show ChannelFormats" bezelStyle="regularSquare" imagePosition="trailing" inset="2" id="qkz-zN-E77">
                                                 <behavior key="behavior" changeContents="YES" doesNotDimImage="YES" lightByContents="YES"/>
@@ -162,7 +192,7 @@
             <connections>
                 <outlet property="delegate" destination="-2" id="3"/>
             </connections>
-            <point key="canvasLocation" x="116" y="125"/>
+            <point key="canvasLocation" x="164.5" y="151.5"/>
         </window>
     </objects>
-</document>
+</document>
\ No newline at end of file
diff --git a/Source/GUI/Cocoa/MyWindowController.m b/Source/GUI/Cocoa/MyWindowController.m
index 23b9e8ed3..23d0ff34d 100644
--- a/Source/GUI/Cocoa/MyWindowController.m
+++ b/Source/GUI/Cocoa/MyWindowController.m
@@ -675,6 +675,12 @@ -(void)processFiles:(NSArray *)URLs {
 	if(!mediaList)
 		mediaList = [[oMediaInfoList alloc] init]; //dont care about release
 
+	if ([[NSUserDefaults standardUserDefaults] stringForKey:@"displayCaptions"]!=nil)
+	{
+		NSString *value = [[NSUserDefaults standardUserDefaults] stringForKey:@"displayCaptions"];
+		[oMediaInfoList setOption:@"File_DisplayCaptions" withValue:value];
+	}
+
 	NSInteger oldCount = [mediaList count];
 
 	if([URLs count]==1 && [[NSFileManager defaultManager] fileExistsAtPath:[URLs[0] path]]) {
diff --git a/Source/GUI/Cocoa/PreferencesWindowController.h b/Source/GUI/Cocoa/PreferencesWindowController.h
index ede66cf37..17ed5ff0a 100644
--- a/Source/GUI/Cocoa/PreferencesWindowController.h
+++ b/Source/GUI/Cocoa/PreferencesWindowController.h
@@ -16,7 +16,7 @@
     IBOutlet NSButton *graphAdmShowTrackUIDs;
     IBOutlet NSButton *graphAdmShowChannelFormats;
     IBOutlet NSButton *subscribeButton;
-
+    IBOutlet NSPopUpButton *displayCaptionsCombo;
     NSMutableArray *observers;
 }
 
diff --git a/Source/GUI/Cocoa/PreferencesWindowController.m b/Source/GUI/Cocoa/PreferencesWindowController.m
index cc0946018..06b664246 100644
--- a/Source/GUI/Cocoa/PreferencesWindowController.m
+++ b/Source/GUI/Cocoa/PreferencesWindowController.m
@@ -141,6 +141,22 @@ - (void)windowDidLoad
 		}
 	}
 
+    //DisplayCaptions
+    [self addCaptionsOptionToComboWithTitle:@"When content is detected" andValue:@"Content"];
+    [self addCaptionsOptionToComboWithTitle:@"When content or a command is detected" andValue:@"Command"];
+    [self addCaptionsOptionToComboWithTitle:@"Even when no content or command is detected" andValue:@"Stream"];
+
+    NSString *savedCaptionsOption = [[NSUserDefaults standardUserDefaults] objectForKey:@"displayCaptions"];
+    if(savedCaptionsOption == nil)
+        savedCaptionsOption = @"Command";
+
+    for(NSMenuItem *i in [[displayCaptionsCombo menu] itemArray]) {
+        if([[i representedObject] isEqualToString:savedCaptionsOption]) {
+                [displayCaptionsCombo selectItem:i];
+                break;
+        }
+    }
+
     // Graph options
     BOOL savedGraphAdmShowTrackUIDs = [[NSUserDefaults standardUserDefaults] boolForKey:@"graphAdmShowTrackUIDs"];
     [graphAdmShowTrackUIDs setState:savedGraphAdmShowTrackUIDs?NSControlStateValueOn:NSControlStateValueOff];
@@ -175,6 +191,13 @@ - (void)addLanguageToComboWithTitle:(NSString*)title andValue:(NSString*)value {
 	[item release];
 }
 
+- (void)addCaptionsOptionToComboWithTitle:(NSString*)title andValue:(NSString*)value {
+    NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:title action:nil keyEquivalent:@""];
+    [item setRepresentedObject:value];
+    [[displayCaptionsCombo menu] addItem:item];
+    [item release];
+}
+
 - (IBAction)languageChanged:(id)sender {
 	
 	NSMenuItem *obj = [langsCombo selectedItem];
@@ -202,6 +225,17 @@ - (IBAction)viewChanged:(id)sender {
 
 	[[NSUserDefaults standardUserDefaults] setObject:value forKey:@"defaultView"];
 }
+
+- (IBAction)captionsOptionChanged:(id)sender {
+    NSMenuItem *obj = [displayCaptionsCombo selectedItem];
+    NSString *value = [obj representedObject];
+
+    if (!value)
+        value = @"Command";
+
+    [[NSUserDefaults standardUserDefaults] setObject:value forKey:@"displayCaptions"];
+}
+
 - (IBAction)subscribeClicked:(id)sender {
     if (@available(macOS 10.9, *)) {
         [[SubscribeWindowController controller] show];
diff --git a/Source/GUI/VCL/GUI_Main.cpp b/Source/GUI/VCL/GUI_Main.cpp
index f4e839b04..f10eceba4 100644
--- a/Source/GUI/VCL/GUI_Main.cpp
+++ b/Source/GUI/VCL/GUI_Main.cpp
@@ -799,6 +799,9 @@ void __fastcall TMainF::Refresh(TTabSheet *Page)
     if (!Prefs->Config(__T("EnableFfmpeg")).empty())
         I->Option_Static(__T("Enable_Ffmpeg"), Prefs->Config(__T("EnableFfmpeg")));
 
+    if (!Prefs->Config(__T("DisplayCaptions")).empty())
+        I->Option(__T("File_DisplayCaptions"), Prefs->Config(__T("DisplayCaptions")));
+
     //Easy
          if (Page==Page_Easy)
     {
diff --git a/Source/GUI/VCL/GUI_Preferences.cpp b/Source/GUI/VCL/GUI_Preferences.cpp
index a1f3acbd6..2534c741f 100644
--- a/Source/GUI/VCL/GUI_Preferences.cpp
+++ b/Source/GUI/VCL/GUI_Preferences.cpp
@@ -464,6 +464,17 @@ void __fastcall TPreferencesF::Advanced_EnableFfmpegClick(TObject *Sender)
     }
 }
 
+//---------------------------------------------------------------------------
+void __fastcall TPreferencesF::Advanced_DisplayCaptions_SelChange(TObject *Sender)
+{
+    if (Advanced_DisplayCaptions_Sel->ItemIndex==0)
+        Prefs->Config(__T("DisplayCaptions"))=__T("Content");
+    else if (Advanced_DisplayCaptions_Sel->ItemIndex==1)
+        Prefs->Config(__T("DisplayCaptions"))=__T("Command");
+    else if (Advanced_DisplayCaptions_Sel->ItemIndex==2)
+        Prefs->Config(__T("DisplayCaptions"))=__T("Stream");
+}
+
 //---------------------------------------------------------------------------
 void __fastcall TPreferencesF::Language_NewClick(TObject *Sender)
 {
@@ -621,6 +632,14 @@ void __fastcall TPreferencesF::Setup_AdvancedShow(TObject *Sender)
     Advanced_InformVersion->Checked=Prefs->Config(__T("InformVersion")).To_int32s();
     Advanced_InformTimestamp->Checked=Prefs->Config(__T("InformTimestamp")).To_int32s();
     Advanced_EnableFfmpeg->Checked=Prefs->Config(__T("EnableFfmpeg")).To_int32s();
+
+    //Display captions
+    if (Prefs->Config(__T("DisplayCaptions"))==__T("Content"))
+        Advanced_DisplayCaptions_Sel->ItemIndex=0;
+    else if (Prefs->Config(__T("DisplayCaptions"))==__T("Stream"))
+        Advanced_DisplayCaptions_Sel->ItemIndex=2;
+    else // Command (default)
+        Advanced_DisplayCaptions_Sel->ItemIndex=1;
 }
 
 //---------------------------------------------------------------------------
@@ -736,6 +755,11 @@ void __fastcall TPreferencesF::GUI_Configure()
     Advanced_InformVersion->Caption=Prefs->Translate(__T("Add version to text output")).c_str();
     Advanced_InformTimestamp->Caption=Prefs->Translate(__T("Add creation date to text output")).c_str();
     Advanced_EnableFfmpeg->Caption=Prefs->Translate(__T("Enable FFmpeg plugin")).c_str();
+    Advanced_DisplayCaptions_Caption->Caption=Prefs->Translate(__T("Handling of 608/708 streams:")).c_str();
+    Advanced_DisplayCaptions_Sel->Items->Clear();
+    Advanced_DisplayCaptions_Sel->Items->Add(Prefs->Translate(__T("When content is detected")).c_str());
+    Advanced_DisplayCaptions_Sel->Items->Add(Prefs->Translate(__T("When content or a command is detected")).c_str());
+    Advanced_DisplayCaptions_Sel->Items->Add(Prefs->Translate(__T("Even when no content or command is detected")).c_str());
     //-Language
     Language_Caption->Caption=Prefs->Translate(__T("Choose language")).c_str();
     Language_Edit->Caption=(Prefs->Translate(__T("Edit"))+__T("...")).c_str();
diff --git a/Source/GUI/VCL/GUI_Preferences.dfm b/Source/GUI/VCL/GUI_Preferences.dfm
index 15aac3fd7..1c5c5718c 100644
--- a/Source/GUI/VCL/GUI_Preferences.dfm
+++ b/Source/GUI/VCL/GUI_Preferences.dfm
@@ -238,6 +238,27 @@ object PreferencesF: TPreferencesF
         TabOrder = 4
         OnClick = Advanced_EnableFfmpegClick
       end
+      object LanguAdvanced_DisplayCaptions_Caption: TLabel
+        Left = 0
+        Top = 131
+        Width = 200
+        Height = 14
+        Caption = 'Handling of 608/708 streams:'
+      end
+      object Advanced_DisplayCaptions_Sel: TComboBox
+        Left = 200
+        Top = 127
+        Width = 290
+        Height = 22
+        Style = csDropDownList
+        DropDownCount = 10
+        TabOrder = 1
+        OnChange = Advanced_DisplayCaptions_SelChange
+        Items.Strings = (
+          'When content is detected'
+          'When content or a command is detected'
+          'Even when no content or command is detected')
+      end
     end
     object Customize_Language: TTabSheet
       Caption = 'Language'
diff --git a/Source/GUI/VCL/GUI_Preferences.h b/Source/GUI/VCL/GUI_Preferences.h
index 55ae065d8..64fd49dd2 100644
--- a/Source/GUI/VCL/GUI_Preferences.h
+++ b/Source/GUI/VCL/GUI_Preferences.h
@@ -44,6 +44,8 @@ class TPreferencesF : public TForm
     TCheckBox *Advanced_InformVersion;
     TCheckBox *Advanced_InformTimestamp;
     TCheckBox *Advanced_EnableFfmpeg;
+    TLabel *Advanced_DisplayCaptions_Caption;
+    TComboBox *Advanced_DisplayCaptions_Sel;
     TTabSheet *Customize_Language;
     TLabel *Language_Caption;
     TButton *Language_New;
@@ -93,6 +95,7 @@ class TPreferencesF : public TForm
     void __fastcall Advanced_InformVersionClick(TObject *Sender);
     void __fastcall Advanced_InformTimestampClick(TObject *Sender);
     void __fastcall Advanced_EnableFfmpegClick(TObject *Sender);
+    void __fastcall Advanced_DisplayCaptions_SelChange(TObject *Sender);
     void __fastcall Graph_Adm_ShowTrackUIDsClick(TObject *Sender);
     void __fastcall Graph_Adm_ShowChannelFormatsClick(TObject *Sender);
     void __fastcall Setup_GeneralShow(TObject *Sender);
diff --git a/Source/Resource/Plugin/Language/en.csv b/Source/Resource/Plugin/Language/en.csv
index 64206c481..00d4f13c0 100644
--- a/Source/Resource/Plugin/Language/en.csv
+++ b/Source/Resource/Plugin/Language/en.csv
@@ -399,6 +399,7 @@ EPG_Positions;EPG positions (internal)
 EpisodeTitleNumber;Episode Title Number
 Error_File;Error while reading file
 Error_File_Write;Error while writing file
+Even when no content or command is detected;Even when no content or command is detected
 Events_MinDuration;Minimum duration per event
 Events_PaintOn;Count of PaintOn events
 Events_PopOn;Count of PopOn events
@@ -695,6 +696,7 @@ Group;Group
 Grouping;Grouping
 GroupPreset;Group preset
 h; h
+Handling of 608/708 streams:;Handling of 608/708 streams:
 HDR_Format;HDR format
 Header file;Create a header file
 Height;Height
@@ -1352,6 +1354,8 @@ WebSite_Text_More;Go to the web site (%Url%) to find this text codec
 WebSite_Url;http://MediaArea.net/MediaInfo
 WebSite_Video;Go to the web site of this video codec
 WebSite_Video_More;Go to the web site (%Url%) to find this video codec
+When content is detected;When content is detected
+When content or a command is detected;When content or a command is detected
 Width;Width
 Width_CleanAperture;Clean aperture width
 Width_Original;Original width