diff --git a/js/post-hover.js b/js/post-hover.js
index 4a86cba0..2808b8e7 100644
--- a/js/post-hover.js
+++ b/js/post-hover.js
@@ -66,6 +66,7 @@ onready(function(){
 					var $newPost = $post.clone();
 					$newPost.find('>.reply, >br').remove();
 					$newPost.find('span.mentioned').remove();
+					$newPost.find('a.post_anchor').remove();
 
 					$newPost
 						.attr('id', 'post-hover-' + id)
diff --git a/stylesheets/style.css b/stylesheets/style.css
index 15b21455..647ff9ac 100644
--- a/stylesheets/style.css
+++ b/stylesheets/style.css
@@ -25,7 +25,7 @@ a.post_no {
 p.intro a.post_no {
 	color: inherit;
 }
-p.intro a.post_no, p.intro a.email {
+p.intro a.post_no, p.intro a.email, p.intro a.post_anchor {
 	margin: 0;
 }
 p.intro a.email span.name {
diff --git a/templates/main.js b/templates/main.js
index 84603bba..2da347f0 100644
--- a/templates/main.js
+++ b/templates/main.js
@@ -157,7 +157,7 @@ function highlightReply(id) {
 			post.className += ' highlighted';
 			window.location.hash = id;
 	}
-	return false;
+	return true;
 }
 
 function generatePassword() {
@@ -189,6 +189,8 @@ function dopost(form) {
 
 function citeReply(id, with_link) {
 	var textarea = document.getElementById('body');
+
+	if (!textarea) return false;
 	
 	if (document.selection) {
 		// IE
diff --git a/templates/post_reply.html b/templates/post_reply.html
index 8ef3c1e8..8c182ad4 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -1,7 +1,8 @@
 {% filter remove_whitespace %}
 {# tabs and new lines will be ignored #}
 <div class="post reply" id="reply_{{ post.id }}">
-<p class="intro"{% if not index %} id="{{ post.id }}"{% endif %}>
+<p class="intro">
+	{% if not index %}<a id="{{ post.id }}" class="post_anchor"></a>{% endif %}
 	<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
 	<label for="delete_{{ post.id }}">
 		{% include 'post/subject.html' %}
@@ -10,12 +11,9 @@
 		{% include 'post/flag.html' %}
 		{% include 'post/time.html' %}
 	</label>
-	{% include 'post/poster_id.html' %}
-
-	 <a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? highlightReply({{ post.id }}) : true;" href="{{ post.link }}">No.</a>
-	<a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? citeReply({{ post.id }}) : true;" href="{{ post.link('q') }}">
-		{{ post.id }}
-	</a>
+	{% include 'post/poster_id.html' %}&nbsp;
+	<a class="post_no" id="post_no_{{ post.id }}" onclick="highlightReply({{ post.id }})" href="{{ post.link }}">No.</a>
+	<a class="post_no" onclick="citeReply({{ post.id }})" href="{{ post.link('q') }}">{{ post.id }}</a>
 	</p>
     {% include 'post/fileinfo.html' %} 
     {% include 'post/post_controls.html' %}
diff --git a/templates/post_thread.html b/templates/post_thread.html
index 335c1713..c246a16c 100644
--- a/templates/post_thread.html
+++ b/templates/post_thread.html
@@ -2,8 +2,9 @@
 {# tabs and new lines will be ignored #}
 
 <div id="thread_{{ post.id }}" data-board="{{ board.uri }}">
+{% if not index %}<a id="{{ post.id }}" class="post_anchor"></a>{% endif %}
 {% include 'post/fileinfo.html' %}
-<div class="post op" {%if post.num_files > 1%}style='clear:both'{%endif%}><p class="intro"{% if not index %} id="{{ post.id }}"{% endif %}>
+<div class="post op" {%if post.num_files > 1%}style='clear:both'{%endif%}><p class="intro">
 	<input type="checkbox" class="delete" name="delete_{{ post.id }}" id="delete_{{ post.id }}" />
 	<label for="delete_{{ post.id }}">
 		{% include 'post/subject.html' %}
@@ -12,11 +13,9 @@
 		{% include 'post/flag.html' %}
 		{% include 'post/time.html' %}
 	</label>
-	{% include 'post/poster_id.html' %}
-         <a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? highlightReply({{ post.id }}) : true;" href="{{ post.link }}">No.</a>
-        <a class="post_no" onclick="return document.querySelectorAll('div.banner').length ? citeReply({{ post.id }}) : true;" href="{{ post.link('q') }}">
-                {{ post.id }}
-        </a>
+	{% include 'post/poster_id.html' %}&nbsp;
+	<a class="post_no" id="post_no_{{ post.id }}" onclick="highlightReply({{ post.id }})" href="{{ post.link }}">No.</a>
+	<a class="post_no" onclick="citeReply({{ post.id }})" href="{{ post.link('q') }}">{{ post.id }}</a>
 	{% if post.sticky %}
 		{% if config.font_awesome %}
 			<i class="fa fa-thumb-tack"></i>