diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb
index 5f3319972..ea833f505 100644
--- a/app/views/forum_posts/_forum_post.html.erb
+++ b/app/views/forum_posts/_forum_post.html.erb
@@ -46,7 +46,7 @@
           <% if forum_post.is_original_post? %>
             <%= render "forum_topics/form", :forum_topic => forum_post.topic %>
           <% else %>
-            <%= render "forum_posts/form", :forum_post => forum_post %>
+            <%= render "forum_posts/partials/edit/form", :forum_post => forum_post %>
           <% end %>
         <% end %>
       </menu>
diff --git a/app/views/forum_posts/_form.html.erb b/app/views/forum_posts/partials/edit/_form.html.erb
similarity index 100%
rename from app/views/forum_posts/_form.html.erb
rename to app/views/forum_posts/partials/edit/_form.html.erb
diff --git a/app/views/forum_posts/partials/new/_form.html.erb b/app/views/forum_posts/partials/new/_form.html.erb
new file mode 100644
index 000000000..dcede6314
--- /dev/null
+++ b/app/views/forum_posts/partials/new/_form.html.erb
@@ -0,0 +1,9 @@
+<%= error_messages_for("forum_post") %>
+
+<%= simple_form_for(forum_post) do |f| %>
+  <%= f.input :topic_id, :as => :hidden %>
+  <%= dtext_field "forum_post", "body" %>
+
+  <%= f.button :submit, "Submit" %>
+  <%= dtext_preview_button "forum_post", "body" %>
+<% end %>
diff --git a/app/views/forum_topics/show.html.erb b/app/views/forum_topics/show.html.erb
index 2ac465a81..7c5e19031 100644
--- a/app/views/forum_topics/show.html.erb
+++ b/app/views/forum_topics/show.html.erb
@@ -21,7 +21,7 @@
       <p><%= link_to "Reply &raquo;".html_safe, new_forum_post_path(:topic_id => @forum_topic.id), :id => "new-response-link" %></p>
 
       <div style="display: none;" id="topic-response">
-        <%= render "forum_posts/form", :forum_post => ForumPost.new(:topic_id => @forum_topic.id) %>
+        <%= render "forum_posts/partials/new/form", :forum_post => ForumPost.new(:topic_id => @forum_topic.id) %>
       </div>
     <% end %>