diff --git a/inc/config.php b/inc/config.php
index 4c37e969..8e733f2e 100644
--- a/inc/config.php
+++ b/inc/config.php
@@ -620,6 +620,10 @@
 	// REMEMBER TO CHMOD attentionbar.txt PROPERLY
 	// Oh, and add jQuery in additional_javascript.
 	$config['attention_bar'] = false;
+
+	// Allow html in board subtitle. This is useful for placing icons and links.
+	$config['allow_subtitle_html'] = false;
+
 /*
  * ====================
  *  Display settings
diff --git a/templates/index.html b/templates/index.html
index 12150d0b..f8c1c594 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -25,7 +25,11 @@
 		<h1>{{ board.url }} - {{ board.title|e }}</h1>
 		<div class="subtitle">
 			{% if board.subtitle %}
-				{{ board.subtitle|e }}
+				{% if config.allow_subtitle_html %}
+					{{ board.subtitle }}
+				{% else %}
+					{{ board.subtitle|e }}
+				{% endif %}
 			{% endif %}
 			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
 		</div>
diff --git a/templates/mod/dashboard.html b/templates/mod/dashboard.html
index e9fb7c9c..e2f7507d 100644
--- a/templates/mod/dashboard.html
+++ b/templates/mod/dashboard.html
@@ -8,7 +8,13 @@
 					 - 
 				{{ board.title|e }}
 				{% if board.subtitle %}
-					 <small>&mdash; {{ board.subtitle|e }}</small>
+					<small>&mdash; 
+						{% if config.allow_subtitle_html %}
+							{{ board.subtitle }}
+						{% else %}
+							{{ board.subtitle|e }}
+						{% endif %}
+					</small>
 				{% endif %}
 				{% if mod|hasPermission(config.mod.manageboards) %}
 					 <a href="?/edit/{{ board.uri }}"><small>[{% trans 'edit' %}]</small></a>
diff --git a/templates/thread.html b/templates/thread.html
index 7fe60a39..9882230f 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -18,7 +18,11 @@
 		<h1>{{ board.url }} - {{ board.title|e }}</h1>
 		<div class="subtitle">
 			{% if board.subtitle %}
-				{{ board.subtitle|e }}
+				{% if config.allow_subtitle_html %}
+					{{ board.subtitle }}
+				{% else %}
+					{{ board.subtitle|e }}
+				{% endif %}
 			{% endif %}
 			{% if mod %}<p><a href="?/">{% trans %}Return to dashboard{% endtrans %}</a></p>{% endif %}
 		</div>