diff --git a/boards/templates/boards/post.html b/boards/templates/boards/post.html
--- a/boards/templates/boards/post.html
+++ b/boards/templates/boards/post.html
@@ -30,17 +30,23 @@
         <a class="post_id" href="{% post_url post.id %}">
             ({{ post.id }}) </a>
         [<span class="pub_time">{{ post.pub_time }}</span>]
-        [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
-            ; return false;">&gt;&gt;</a>]
+        {% if not truncated %}
+            [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
+                ; return false;">&gt;&gt;</a>]
+        {% endif %}
+        {% if need_open_link %}
+            [<a class="link" href="
+                    {% url 'thread' post.id %}#form">{% trans "Reply" %}</a>]
+        {% endif %}
 
         {% if moderator %}
             <span class="moderator_info">
-                            [<a href="{% url 'delete' post_id=post.id %}"
+                [<a href="{% url 'delete' post_id=post.id %}"
                     >{% trans 'Delete' %}</a>]
-                            ({{ post.poster_ip }})
-                            [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
+                ({{ post.poster_ip }})
+                [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
                     >{% trans 'Ban IP' %}</a>]
-                        </span>
+            </span>
         {% endif %}
     </div>
     {% autoescape off %}
@@ -52,11 +58,11 @@
     {% endautoescape %}
     {% if post.is_referenced %}
         <div class="refmap">
-        {% trans "Replies" %}:
-        {% for ref_post in post.get_sorted_referenced_posts %}
-        <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
-            >{% if not forloop.last %},{% endif %}
-        {% endfor %}
+            {% trans "Replies" %}:
+            {% for ref_post in post.get_sorted_referenced_posts %}
+                <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
+                        >{% if not forloop.last %},{% endif %}
+            {% endfor %}
         </div>
     {% endif %}
 </div>
diff --git a/boards/templates/boards/posting_general.html b/boards/templates/boards/posting_general.html
--- a/boards/templates/boards/posting_general.html
+++ b/boards/templates/boards/posting_general.html
@@ -68,73 +68,7 @@
         {% for thread in threads %}
             {% cache 600 thread_short thread.thread.id thread.thread.last_edit_time moderator LANGUAGE_CODE %}
             <div class="thread">
-            {% if thread.bumpable %}
-                <div class="post" id="{{ thread.op.id }}">
-            {% else %}
-                <div class="post dead_post" id="{{ thread.op.id }}">
-            {% endif %}
-            {% if thread.op.image %}
-                <div class="image">
-                    <a class="thumb"
-                       href="{{ thread.op.image.url }}"><img
-                            src="{{ thread.op.image.url_200x150 }}"
-                            alt="{{ thread.op.id }}"
-                            width="{{ thread.op.image_pre_width }}"
-                            height="{{ thread.op.image_pre_height }}"
-                            data-width="{{ thread.op.image_width }}"
-                            data-height="{{ thread.op.image_height }}"/>
-                    </a>
-                </div>
-            {% endif %}
-            <div class="message">
-                <div class="post-info">
-                    <span class="title">{{ thread.op.title }}</span>
-                    <a class="post_id" href="{% url 'thread' thread.op.id %}"
-                    > ({{ thread.op.id }})</a>
-                    [{{ thread.op.pub_time }}]
-                    [<a class="link" href="
-                    {% url 'thread' thread.op.id %}#form"
-                        >{% trans "Reply" %}</a>]
-
-                    {% if moderator %}
-                        <span class="moderator_info">
-                            [<a href="
-                            {% url 'delete' post_id=thread.op.id %}?next={{ request.path }}"
-                                >{% trans 'Delete' %}</a>]
-                            ({{ thread.op.poster_ip }})
-                            [<a href="
-                            {% url 'ban' post_id=thread.op.id %}?next={{ request.path }}"
-                                >{% trans 'Ban IP' %}</a>]
-                        </span>
-                    {% endif %}
-                </div>
-                {% autoescape off %}
-                    {{ thread.op.text.rendered|truncatewords_html:50 }}
-                {% endautoescape %}
-		{% if thread.op.is_referenced %}
-		    <div class="refmap">
-			{% trans "Replies" %}:
-			{% for ref_post in thread.op.get_sorted_referenced_posts %}
-			<a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
-                    >{% if not forloop.last %},{% endif %}
-			{% endfor %}
-		    </div>
-		{% endif %}
-            </div>
-            <div class="metadata">
-                {{ thread.thread.get_images_count }} {% trans 'images' %}.
-                {% if thread.thread.tags %}
-                    <span class="tags">
-                        {% for tag in thread.thread.get_tags %}
-                            <a class="tag" href="
-                                    {% url 'tag' tag_name=tag.name %}">
-                                #{{ tag.name }}</a
-                                    >{% if not forloop.last %},{% endif %}
-                        {% endfor %}
-                    </span>
-                {% endif %}
-            </div>
-            </div>
+                {% post_view_truncated thread.op True %}
             {% if thread.last_replies.exists %}
                 {% if thread.skipped_replies %}
                     <div class="skipped_replies">
@@ -145,46 +79,7 @@
                 {% endif %}
                 <div class="last-replies">
                     {% for post in thread.last_replies %}
-                        {% if thread.bumpable %}
-                            <div class="post" id="{{ post.id }}">
-                        {% else %}
-                            <div class="post dead_post" id="{{ post.id }}">
-                        {% endif %}
-                            {% if post.image %}
-                                <div class="image">
-                                    <a class="thumb"
-                                       href="{{ post.image.url }}"><img
-                                            src=" {{ post.image.url_200x150 }}"
-                                            alt="{{ post.id }}"
-                                            width="{{ post.image_pre_width }}"
-                                            height="{{ post.image_pre_height }}"
-                                            data-width="{{ post.image_width }}"
-                                            data-height="{{ post.image_height }}"/>
-                                    </a>
-                                </div>
-                            {% endif %}
-                            <div class="message">
-                                <div class="post-info">
-                                    <span class="title">{{ post.title }}</span>
-                                    <a class="post_id" href="
-                                {% url 'thread' thread.op.id %}#{{ post.id }}">
-                                        ({{ post.id }})</a>
-                                    [{{ post.pub_time }}]
-                                </div>
-                                {% autoescape off %}
-                                    {{ post.text.rendered|truncatewords_html:50 }}
-                                {% endautoescape %}
-                        </div>
-                    {% if post.is_referenced %}
-                        <div class="refmap">
-                            {% trans "Replies" %}:
-                            {% for ref_post in post.get_sorted_referenced_posts %}
-                                <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
-                                        >{% if not forloop.last %},{% endif %}
-                            {% endfor %}
-                        </div>
-                    {% endif %}
-                        </div>
+                        {% post_view_truncated post %}
                     {% endfor %}
                 </div>
             {% endif %}
diff --git a/boards/templates/boards/thread.html b/boards/templates/boards/thread.html
--- a/boards/templates/boards/thread.html
+++ b/boards/templates/boards/thread.html
@@ -31,73 +31,7 @@
         {% endif %}
     <div class="thread">
     {% for post in posts %}
-        {% if bumpable %}
-            <div class="post" id="{{ post.id }}">
-        {% elif thread.archived %}
-            <div class="post archive_post" id="{{ post.id }}">
-        {% else %}
-            <div class="post dead_post" id="{{ post.id }}">
-        {% endif %}
-        {% if post.image %}
-            <div class="image">
-                <a
-                        class="thumb"
-                        href="{{ post.image.url }}"><img
-                        src="{{ post.image.url_200x150 }}"
-                        alt="{{ post.id }}"
-                        width="{{ post.image_pre_width }}"
-                        height="{{ post.image_pre_height }}"
-                        data-width="{{ post.image_width }}"
-                        data-height="{{ post.image_height }}"/>
-                </a>
-            </div>
-        {% endif %}
-        <div class="message">
-            <div class="post-info">
-                <span class="title">{{ post.title }}</span>
-                <a class="post_id" href="#{{ post.id }}">
-                    ({{ post.id }}) </a>
-                [<span class="pub_time">{{ post.pub_time }}</span>]
-            {% if not thread.archived %}
-            [<a href="#" onclick="javascript:addQuickReply('{{ post.id }}')
-                ; return false;">&gt;&gt;</a>]
-            {% endif %}
-
-                {% if moderator %}
-                    <span class="moderator_info">
-                        [<a href="{% url 'delete' post_id=post.id %}"
-                            >{% trans 'Delete' %}</a>]
-                        ({{ post.poster_ip }})
-                        [<a href="{% url 'ban' post_id=post.id %}?next={{ request.path }}"
-                            >{% trans 'Ban IP' %}</a>]
-                    </span>
-                {% endif %}
-            </div>
-            {% autoescape off %}
-            {{ post.text.rendered }}
-            {% endautoescape %}
-    {% if post.is_referenced %}
-        <div class="refmap">
-        {% trans "Replies" %}:
-        {% for ref_post in post.get_sorted_referenced_posts %}
-        <a href="{% post_url ref_post.id %}">&gt;&gt;{{ ref_post.id }}</a
-                >{% if not forloop.last %},{% endif %}
-        {% endfor %}
-        </div>
-    {% endif %}
-        </div>
-        {% if forloop.first %}
-            <div class="metadata">
-                <span class="tags">
-                    {% for tag in thread.get_tags %}
-                        <a class="tag" href="{% url 'tag' tag.name %}">
-                            #{{ tag.name }}</a
-                                >{% if not forloop.last %},{% endif %}
-                    {% endfor %}
-                </span>
-            </div>
-        {% endif %}
-        </div>
+        {% post_view post %}
     {% endfor %}
     </div>
     {% endcache %}
diff --git a/boards/templatetags/board.py b/boards/templatetags/board.py
--- a/boards/templatetags/board.py
+++ b/boards/templatetags/board.py
@@ -1,7 +1,7 @@
 from django.core.urlresolvers import reverse
 from django.shortcuts import get_object_or_404
 from boards.models import Post
-from boards.views import thread
+from boards.views import thread, api
 from django import template
 
 register = template.Library()
@@ -47,3 +47,25 @@ def image_actions(*args, **kwargs):
                   action['name'] + '</a>]'
 
     return result
+
+
+@register.inclusion_tag('boards/post.html', name='post_view')
+def post_view(*args, **kwargs):
+    post = args[0]
+
+    return { 'post': post }
+
+
+@register.inclusion_tag('boards/post.html', name='post_view_truncated')
+def post_view_truncated(*args, **kwargs):
+    post = args[0]
+    if len(args) > 1:
+        need_open_link = args[1]
+    else:
+        need_open_link = False
+
+    return {
+        'post': post,
+        'truncated': True,
+        'need_open_link': need_open_link
+    }
\ No newline at end of file
diff --git a/boards/views/api.py b/boards/views/api.py
--- a/boards/views/api.py
+++ b/boards/views/api.py
@@ -98,7 +98,6 @@ def get_post(request, post_id):
     """
 
     post = get_object_or_404(Post, id=post_id)
-    thread = post.thread_new
 
     context = RequestContext(request)
     context['post'] = post