diff --git a/app/logical/d_text.rb b/app/logical/d_text.rb
index 411ab6e62..e4aeefd22 100644
--- a/app/logical/d_text.rb
+++ b/app/logical/d_text.rb
@@ -19,6 +19,7 @@ class DText
     str.gsub!(/\[i\](.+?)\[\/i\]/i, '<em>\1</em>')
     str.gsub!(/\[s\](.+?)\[\/s\]/i, '<s>\1</s>')
     str.gsub!(/\[u\](.+?)\[\/u\]/i, '<u>\1</u>')
+    str.gsub!(/\[spoilers?\](.+?)\[\/spoilers?\]/i, '<span class="spoiler">\1</span>')
 
     str = parse_links(str)
     str = parse_aliased_wiki_links(str)
@@ -127,8 +128,6 @@ class DText
       str.gsub!(/\s*\[\/quote\]\s*/m, "\n\n[/quote]\n\n")
       str.gsub!(/\s*\[code\]\s*/m, "\n\n[code]\n\n")
       str.gsub!(/\s*\[\/code\]\s*/m, "\n\n[/code]\n\n")
-      str.gsub!(/\s*\[spoilers?\](?!\])\s*/m, "\n\n[spoiler]\n\n")
-      str.gsub!(/\s*\[\/spoilers?\]\s*/m, "\n\n[/spoiler]\n\n")
     end
 
     str.gsub!(/(?:\r?\n){3,}/, "\n\n")
@@ -178,16 +177,6 @@ class DText
         flags[:code] = false
         '</pre>'
 
-      when /\[spoilers?\](?!\])/
-        stack << "div"
-        '<div class="spoiler">'
-
-      when /\[\/spoilers?\]/
-        if stack.last == "div"
-          stack.pop
-          '</div>'
-        end
-
       else
         if flags[:code]
           block