diff --git a/templates/post_reply.html b/templates/post_reply.html
index 14eb497b..9a71664f 100644
--- a/templates/post_reply.html
+++ b/templates/post_reply.html
@@ -2,22 +2,20 @@
 {# tabs and new lines will be ignored #}
 <div class="post reply" id="reply_{{ post.id }}">
 <p class="intro">
-	{% endapply %}
-	{% 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 }}">
+	{% 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 }}" />
 		{% include 'post/subject.html' %}
 		{% include 'post/name.html' %}
 		{% include 'post/ip.html' %}
 		{% include 'post/flag.html' %}
-		{% include 'post/time.html' %}
 	</label>
 	{% apply spaceless %}
 	{% include 'post/poster_id.html' %}&nbsp;
-	<a class="post_no" id="post_no_{{ post.id }}" title="Link to this post" onclick="highlightReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('', '50') }}{% else %}{{ post.link }}{% endif %}">No.</a>
-	<a class="post_no" title="Reply to this post" onclick="citeReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('q', '50') }}{% else %}{{ post.link('q') }}{% endif %}">{{ post.id }}</a>
+	{% include 'post/time.html' %}
+	<a class="post_no" id="post_no_{{ post.id }}" title="Link to this post"  onclick="highlightReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('', config.file_page50) }}{% else %}{{ post.link }}{% endif %}">No.</a>
+	<a class="post_no" title="Reply to this post" onclick="citeReply({{ post.id }})" href="{% if isnoko50 %}{{ post.link('q', config.file_page50) }}{% else %}{{ post.link('q') }}{% endif %}">{{ post.id }}</a>
 	</p>
-	{% endapply %}
 	{% include 'post/fileinfo.html' %}
 	{% include 'post/post_controls.html' %}
 	{% apply spaceless %}