diff --git a/app/models/forum_post.rb b/app/models/forum_post.rb
index 566d4fed7..2e7c98cf0 100644
--- a/app/models/forum_post.rb
+++ b/app/models/forum_post.rb
@@ -109,7 +109,8 @@ class ForumPost < ActiveRecord::Base
   end
   
   def quoted_response
-    "[quote]\n#{creator_name} said:\n#{body}\n[/quote]\n\n"
+    stripped_body = body.gsub(/\[quote\](?:.|\n|\r)+\[\/quote\][\n\r]*/m, "")
+    "[quote]\n#{creator_name} said:\n\n#{stripped_body}\n[/quote]\n\n"
   end
   
   def build_response