diff --git a/defaults.xml b/defaults.xml
index 1ad3c2129..9916cf96e 100644
--- a/defaults.xml
+++ b/defaults.xml
@@ -784,6 +784,16 @@ Started September 2000 by David Megginson, david@megginson.com
       </buffer>
       <tape-directory type="string" userarchive="y"/>
       <multiplayer type="bool" userarchive="y"/>
+      <record-properties type="bool" userarchive="y">true</record-properties>
+      <record-properties-paths>
+      </record-properties-paths>
+      <recovery-period type="int" userarchive="y">1</recovery-period>
+      
+      <record-main-window type="bool" userarchive="y">false</record-main-window>
+      <record-main-view type="bool" userarchive="y">false</record-main-view>
+      <replay-main-window-position type="bool" userarchive="y">false</replay-main-window-position>
+      <replay-main-window-size type="bool" userarchive="y">false</replay-main-window-size>
+      <replay-main-view type="bool" userarchive="y">false</replay-main-view>
     </replay>
     <airport>
       <runways>
diff --git a/gui/dialogs/flight-recorder.xml b/gui/dialogs/flight-recorder.xml
index 2affcbca9..019e397ec 100644
--- a/gui/dialogs/flight-recorder.xml
+++ b/gui/dialogs/flight-recorder.xml
@@ -79,9 +79,89 @@
             <halign>left</halign>
         </text>
         
-        <button>
+        <checkbox>
+            <row>3</row>
+            <col>0</col>
+            <property>sim/replay/record-main-window</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+        <text>
+            <row>3</row>
+            <col>1</col>
+            <label>Record main window position and size</label>
+            <halign>left</halign>
+        </text>
+    
+        <checkbox>
             <row>4</row>
             <col>0</col>
+            <property>sim/replay/record-main-view</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+        <text>
+            <row>4</row>
+            <col>1</col>
+            <label>Record main window view</label>
+            <halign>left</halign>
+        </text>
+    
+        <checkbox>
+            <row>5</row>
+            <col>0</col>
+            <property>sim/replay/replay-main-window-position</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+        <text>
+            <row>5</row>
+            <col>1</col>
+            <label>Replay main window position</label>
+            <halign>left</halign>
+        </text>
+    
+        <checkbox>
+            <row>6</row>
+            <col>0</col>
+            <property>sim/replay/replay-main-window-size</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+        <text>
+            <row>6</row>
+            <col>1</col>
+            <label>Replay main window size</label>
+            <halign>left</halign>
+        </text>
+    
+        <checkbox>
+            <row>7</row>
+            <col>0</col>
+            <property>sim/replay/replay-main-view</property>
+            <binding>
+                <command>dialog-apply</command>
+            </binding>
+        </checkbox>
+        <text>
+            <row>7</row>
+            <col>1</col>
+            <label>Replay main window view</label>
+            <halign>left</halign>
+        </text>
+    
+    </group>
+    
+    <group>
+        <layout>table</layout>
+        
+        <button>
+            <row>0</row>
+            <col>0</col>
             <legend>Load ...</legend>
             <binding>
                 <command>dialog-show</command>
@@ -89,14 +169,14 @@
             </binding>
         </button>
         <text>
-            <row>4</row>
+            <row>0</row>
             <col>1</col>
             <label>Load Flight Recorder Tape</label>
             <halign>left</halign>
         </text>
         
         <button>
-            <row>5</row>
+            <row>1</row>
             <col>0</col>
             <legend>Save ...</legend>
             <binding>
@@ -105,7 +185,7 @@
             </binding>
         </button>
         <text>
-            <row>5</row>
+            <row>1</row>
             <col>1</col>
             <label>Save Flight Recorder Tape</label>
             <halign>left</halign>