diff --git a/files/helpers/sanitize.py b/files/helpers/sanitize.py
index a18c0f455..7343ea367 100644
--- a/files/helpers/sanitize.py
+++ b/files/helpers/sanitize.py
@@ -161,10 +161,7 @@ def sanitize(sanitized, noimages=False):
 
 	sanitized = str(soup)
 	
-	start = '<s>'
-	end = '</s>' 
-
-	if start in sanitized and end in sanitized and start in sanitized.split(end)[0] and end in sanitized.split(start)[1]: sanitized = sanitized.replace(start, '<span class="spoiler">').replace(end, '</span>')
+	sanitized = re.sub('\|\|(.*?)\|\|', r'<span class="spoiler">\1</span>', sanitized)
 	
 	for i in re.finditer("[^a]>\s*(:[!#]{0,2}\w+:\s*)+<\/", sanitized):
 		old = i.group(0)
diff --git a/files/templates/formatting.html b/files/templates/formatting.html
index a0e48cf70..83b1a3295 100644
--- a/files/templates/formatting.html
+++ b/files/templates/formatting.html
@@ -133,7 +133,7 @@ You can use Markdown formatting:
 		</tr>
 		<tr>
 			<td>Spoilers</td>
-			<td>&lt;s&gt; bussy > gussy &lt;/s&gt;</td>
+			<td>||bussy > gussy||</td>
 			<td><p class="spoiler">bussy > gussy</p></td>
 		</tr>
 		<tr>