diff --git a/boards/config/default_settings.ini b/boards/config/default_settings.ini
--- a/boards/config/default_settings.ini
+++ b/boards/config/default_settings.ini
@@ -18,6 +18,7 @@ PostingDelay = 30
 Autoban = false
 DefaultTag = test
 MaxFileCount = 1
+AdditionalSpoilerSpaces = false
 
 [Messages]
 # Thread bumplimit
diff --git a/boards/mdx_neboard.py b/boards/mdx_neboard.py
--- a/boards/mdx_neboard.py
+++ b/boards/mdx_neboard.py
@@ -10,6 +10,7 @@ from django.core.exceptions import Objec
 from django.core.urlresolvers import reverse
 
 import boards
+from boards import settings
 
 
 __author__ = 'neko259'
@@ -24,6 +25,7 @@ LINE_BREAK_HTML = '<div class="br"></div
 SPOILER_SPACE = '&nbsp;'
 
 MAX_SPOILER_MULTIPLIER = 2
+MAX_SPOILER_SPACE_COUNT = 20
 
 
 class TextFormatter():
@@ -202,11 +204,15 @@ def render_tag(tag_name, value, options,
 
 
 def render_spoiler(tag_name, value, options, parent, context):
-    text_len = len(value)
-    space_count = random.randint(0, text_len * MAX_SPOILER_MULTIPLIER)
-    side_spaces = SPOILER_SPACE * (space_count // 2)
-    return '<span class="spoiler">{}{}{}</span>'.format(side_spaces, value,
-            side_spaces)
+    if settings.get_bool('Forms', 'AdditionalSpoilerSpaces'):
+        text_len = len(value)
+        space_count = min(random.randint(0, text_len * MAX_SPOILER_MULTIPLIER),
+                MAX_SPOILER_SPACE_COUNT)
+        side_spaces = SPOILER_SPACE * (space_count // 2)
+    else:
+        side_spaces = ''
+    return '<span class="spoiler">{}{}{}</span>'.format(side_spaces,
+            value, side_spaces)
 
 
 formatters = [