diff --git a/templates/index.html b/templates/index.html
index 3ee2f420..46a1ff99 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -32,108 +32,7 @@
{{ board.url }} - {{ board.name }}
-
-
-
+ {% include 'post_form.html' %}
{% if config.blotter %}
{{ config.blotter }}
{% endif %}
diff --git a/templates/post_form.html b/templates/post_form.html
new file mode 100644
index 00000000..7ef133ed
--- /dev/null
+++ b/templates/post_form.html
@@ -0,0 +1,103 @@
+
+
+
diff --git a/templates/thread.html b/templates/thread.html
index aa97a785..6850130c 100644
--- a/templates/thread.html
+++ b/templates/thread.html
@@ -33,100 +33,8 @@
-
-
+
+ {% include 'post_form.html' %}
{% if config.blotter %}
{{ config.blotter }}
{% endif %}