diff --git a/4chan_x.user.js b/4chan_x.user.js
index c018cbf31..709e4fa7d 100644
--- a/4chan_x.user.js
+++ b/4chan_x.user.js
@@ -100,7 +100,8 @@
         'Cooldown': [true, 'Prevent \'flood detected\' errors'],
         'Quick Reply': [true, 'Reply without leaving the page'],
         'Persistent QR': [false, 'Quick reply won\'t disappear after posting. Only in replies.'],
-        'Auto Hide QR': [true, 'Automatically auto-hide the quick reply when posting']
+        'Auto Hide QR': [true, 'Automatically auto-hide the quick reply when posting'],
+        'Remember Spoiler': [false, 'Remember the spoiler state, instead of resetting after posting']
       },
       Quoting: {
         'Quote Backlinks': [true, 'Add quote backlinks'],
@@ -1435,7 +1436,9 @@
       $('[name=sub]', qr.el).value = '';
       $('[name=com]', qr.el).value = '';
       $('[name=recaptcha_response_field]', qr.el).value = '';
-      $('[name=spoiler]', qr.el).checked = false;
+      if (!conf['Remember Spoiler']) {
+        $('[name=spoiler]', qr.el).checked = false;
+      }
       oldFile = $('[type=file]', qr.el);
       newFile = $.el('input', {
         type: 'file',
diff --git a/script.coffee b/script.coffee
index 53bb76b13..1f1d752ce 100644
--- a/script.coffee
+++ b/script.coffee
@@ -35,6 +35,7 @@ config =
       'Quick Reply':        [true,  'Reply without leaving the page']
       'Persistent QR':      [false, 'Quick reply won\'t disappear after posting. Only in replies.']
       'Auto Hide QR':       [true,  'Automatically auto-hide the quick reply when posting']
+      'Remember Spoiler':   [false, 'Remember the spoiler state, instead of resetting after posting']
     Quoting:
       'Quote Backlinks':    [true,  'Add quote backlinks']
       'OP Backlinks':       [false, 'Add backlinks to the OP']
@@ -1176,7 +1177,7 @@ qr =
     $('[name=sub]', qr.el).value = ''
     $('[name=com]', qr.el).value = ''
     $('[name=recaptcha_response_field]', qr.el).value = ''
-    $('[name=spoiler]', qr.el).checked = false
+    $('[name=spoiler]', qr.el).checked = false unless conf['Remember Spoiler']
     # XXX opera doesn't allow resetting file inputs w/ file.value = ''
     oldFile = $ '[type=file]', qr.el
     newFile = $.el 'input', type: 'file', name: 'upfile', accept: qr.acceptFiles