diff --git a/app/views/forum_posts/_forum_post.html.erb b/app/views/forum_posts/_forum_post.html.erb
index 0de5b16c0..d7d7cbbc0 100644
--- a/app/views/forum_posts/_forum_post.html.erb
+++ b/app/views/forum_posts/_forum_post.html.erb
@@ -15,8 +15,10 @@
       <div class="prose">
         <%= format_text(forum_post.body) %>
       </div>
-      <menu> 
-        <li><%= link_to "Quote", new_forum_post_path(:post_id => forum_post.id), :method => :get, :remote => true %></li>
+      <menu>
+        <% if @forum_topic %>
+          <li><%= link_to "Quote", new_forum_post_path(:post_id => forum_post.id), :method => :get, :remote => true %></li>
+        <% end %>
         <% if CurrentUser.user.is_janitor? %>
           <% if forum_post.is_deleted %>
             <li><%= link_to "Undelete", undelete_forum_post_path(forum_post.id), :method => :post, :remote => true %></li>
diff --git a/app/views/forum_posts/new.js.erb b/app/views/forum_posts/new.js.erb
index 389c17dd5..65b6bd21b 100644
--- a/app/views/forum_posts/new.js.erb
+++ b/app/views/forum_posts/new.js.erb
@@ -1,4 +1,4 @@
-$("#forum_post_body").val($("#forum_post_body").val() + <%= raw @forum_post.body.to_json %>);
+$("#forum_post_body").val($("#forum_post_body").val() + "\n\n" + <%= raw @forum_post.body.to_json %>);
 $("#topic-response").show();
 
 $('html, body').animate({