diff --git a/lib/textile/lexer.ex b/lib/textile/lexer.ex
index 5dfc61dd..1de3c2ad 100644
--- a/lib/textile/lexer.ex
+++ b/lib/textile/lexer.ex
@@ -141,12 +141,22 @@ defmodule Textile.Lexer do
   link_contents_start =
     choice([
       image,
+      spoiler_open,
+      spoiler_close,
+      blockquote_open,
+      blockquote_open_cite,
+      blockquote_close,
       link_markup_start,
     ])
 
   link_contents_element =
     choice([
       image,
+      spoiler_open,
+      spoiler_close,
+      blockquote_open,
+      blockquote_open_cite,
+      blockquote_close,
       link_markup_element
     ])
 
diff --git a/lib/textile/parser.ex b/lib/textile/parser.ex
index 2c890d6f..82316d48 100644
--- a/lib/textile/parser.ex
+++ b/lib/textile/parser.ex
@@ -199,25 +199,25 @@ defmodule Textile.Parser do
   defp image(parser, [{:image_url, image_url}, {:image_title, title}, {:image_link_url, link_url} | r_tokens]) do
     image_url = parser.image_transform.(image_url)
 
-    {:ok, [markup: ~s|<a href="#{escape_html(link_url)}"><img src="#{escape_html(image_url)}" title="#{escape_html(title)}"/></a>|], r_tokens}
+    {:ok, [markup: ~s|<a href="#{escape_html(link_url)}"><span class="imgspoiler"><img src="#{escape_html(image_url)}" title="#{escape_html(title)}"/></span></a>|], r_tokens}
   end
 
   defp image(parser, [{:image_url, image_url}, {:image_title, title} | r_tokens]) do
     image_url = parser.image_transform.(image_url)
 
-    {:ok, [markup: ~s|<img src="#{escape_html(image_url)}" title="#{escape_html(title)}"/>|], r_tokens}
+    {:ok, [markup: ~s|<span class="imgspoiler"><img src="#{escape_html(image_url)}" title="#{escape_html(title)}"/></span>|], r_tokens}
   end
 
   defp image(parser, [{:image_url, image_url}, {:image_link_url, link_url} | r_tokens]) do
     image_url = parser.image_transform.(image_url)
 
-    {:ok, [markup: ~s|<a href="#{escape_html(link_url)}"><img src="#{escape_html(image_url)}"/></a>|], r_tokens}
+    {:ok, [markup: ~s|<a href="#{escape_html(link_url)}"><span class="imgspoiler"><img src="#{escape_html(image_url)}"/></span></a>|], r_tokens}
   end
 
   defp image(parser, [{:image_url, image_url} | r_tokens]) do
     image_url = parser.image_transform.(image_url)
 
-    {:ok, [markup: ~s|<img src="#{escape_html(image_url)}"/>|], r_tokens}
+    {:ok, [markup: ~s|<span class="imgspoiler"><img src="#{escape_html(image_url)}"/></span>|], r_tokens}
   end
 
   defp image(_parser, _tokens),