diff --git a/src/Content/Text/BBCode.php b/src/Content/Text/BBCode.php
index 65d037b83..02c955102 100644
--- a/src/Content/Text/BBCode.php
+++ b/src/Content/Text/BBCode.php
@@ -1475,24 +1475,22 @@ class BBCode extends BaseObject
 		$text = preg_replace("/\[font=(.*?)\](.*?)\[\/font\]/sm", "<span style=\"font-family: $1;\">$2</span>", $text);
 
 		// Declare the format for [spoiler] layout
-		$SpoilerLayout = '<blockquote class="spoiler">$1</blockquote>';
+		$SpoilerLayout = '<details class="spoiler"><summary>' . L10n::t('Click to open/close') . '</summary>$1</details>';
 
 		// Check for [spoiler] text
 		// handle nested quotes
 		$endlessloop = 0;
 		while ((strpos($text, "[/spoiler]") !== false) && (strpos($text, "[spoiler]") !== false) && (++$endlessloop < 20)) {
-			$text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism", "$SpoilerLayout", $text);
+			$text = preg_replace("/\[spoiler\](.*?)\[\/spoiler\]/ism", $SpoilerLayout, $text);
 		}
 
-		// Check for [spoiler=Author] text
-
-		$t_wrote = L10n::t('$1 wrote:');
+		// Check for [spoiler=Title] text
 
 		// handle nested quotes
 		$endlessloop = 0;
 		while ((strpos($text, "[/spoiler]")!== false)  && (strpos($text, "[spoiler=") !== false) && (++$endlessloop < 20)) {
 			$text = preg_replace("/\[spoiler=[\"\']*(.*?)[\"\']*\](.*?)\[\/spoiler\]/ism",
-				"<br /><strong class=".'"spoiler"'.">" . $t_wrote . "</strong><blockquote class=".'"spoiler"'.">$2</blockquote>",
+				'<details class="spoiler"><summary>$1</summary>$2</details>',
 				$text);
 		}
 
diff --git a/src/Model/Item.php b/src/Model/Item.php
index 22859f76b..b5c68d9ab 100644
--- a/src/Model/Item.php
+++ b/src/Model/Item.php
@@ -3509,37 +3509,6 @@ class Item extends BaseObject
 			}
 		}
 
-
-		// Look for spoiler.
-		$spoilersearch = '<blockquote class="spoiler">';
-
-		// Remove line breaks before the spoiler.
-		while ((strpos($s, "\n" . $spoilersearch) !== false)) {
-			$s = str_replace("\n" . $spoilersearch, $spoilersearch, $s);
-		}
-		while ((strpos($s, "<br />" . $spoilersearch) !== false)) {
-			$s = str_replace("<br />" . $spoilersearch, $spoilersearch, $s);
-		}
-
-		while ((strpos($s, $spoilersearch) !== false)) {
-			$pos = strpos($s, $spoilersearch);
-			$rnd = Strings::getRandomHex(8);
-			$spoilerreplace = '<br /> <span id="spoiler-wrap-' . $rnd . '" class="spoiler-wrap fakelink" onclick="openClose(\'spoiler-' . $rnd . '\');">' . L10n::t('Click to open/close') . '</span>'.
-						'<blockquote class="spoiler" id="spoiler-' . $rnd . '" style="display: none;">';
-			$s = substr($s, 0, $pos) . $spoilerreplace . substr($s, $pos + strlen($spoilersearch));
-		}
-
-		// Look for quote with author.
-		$authorsearch = '<blockquote class="author">';
-
-		while ((strpos($s, $authorsearch) !== false)) {
-			$pos = strpos($s, $authorsearch);
-			$rnd = Strings::getRandomHex(8);
-			$authorreplace = '<br /> <span id="author-wrap-' . $rnd . '" class="author-wrap fakelink" onclick="openClose(\'author-' . $rnd . '\');">' . L10n::t('Click to open/close') . '</span>'.
-						'<blockquote class="author" id="author-' . $rnd . '" style="display: block;">';
-			$s = substr($s, 0, $pos) . $authorreplace . substr($s, $pos + strlen($authorsearch));
-		}
-
 		// Replace friendica image url size with theme preference.
 		if (!empty($a->theme_info['item_image_size'])) {
 			$ps = $a->theme_info['item_image_size'];