diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 10c8aebc..b97937a4 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -453,9 +453,17 @@ class IssuesController < ApplicationController
   
   def preview
     @issue = @project.issues.find_by_id(params[:id]) unless params[:id].blank?
-    @attachements = @issue.attachments if @issue
-    @text = params[:notes] || (params[:issue] ? params[:issue][:description] : nil)
-    render :partial => 'common/preview'
+    if @issue
+      @attachements = @issue.attachments
+      @description = params[:issue] && params[:issue][:description]
+      if @description && @description.gsub(/(\r?\n|\n\r?)/, "\n") == @issue.description.to_s.gsub(/(\r?\n|\n\r?)/, "\n")
+        @description = nil
+      end
+      @notes = params[:notes]
+    else
+      @description = (params[:issue] ? params[:issue][:description] : nil)
+    end
+    render :layout => false
   end
   
   def auto_complete
diff --git a/app/views/issues/preview.html.erb b/app/views/issues/preview.html.erb
new file mode 100644
index 00000000..23772859
--- /dev/null
+++ b/app/views/issues/preview.html.erb
@@ -0,0 +1,11 @@
+<% if @notes %>
+	<fieldset class="preview"><legend><%= l(:field_notes) %></legend>
+		<%= textilizable @notes, :attachments => @attachements, :object => @issue %>
+	</fieldset>
+<% end %>
+
+<% if @description %>
+	<fieldset class="preview"><legend><%= l(:field_description) %></legend>
+		<%= textilizable @description, :attachments => @attachements, :object => @issue %>
+	</fieldset>
+<% end %>
diff --git a/test/functional/issues_controller_test.rb b/test/functional/issues_controller_test.rb
index 23d09152..757f36c1 100644
--- a/test/functional/issues_controller_test.rb
+++ b/test/functional/issues_controller_test.rb
@@ -1271,6 +1271,22 @@ class IssuesControllerTest < ActionController::TestCase
                             :attributes => { :href => '#',
                                              :class => 'icon-del disabled' }
   end
+  
+  def test_preview_new_issue
+    @request.session[:user_id] = 2
+    post :preview, :project_id => '1', :issue => {:description => 'Foo'}
+    assert_response :success
+    assert_template 'preview'
+    assert_not_nil assigns(:description)
+  end
+                              
+  def test_preview_notes
+    @request.session[:user_id] = 2
+    post :preview, :project_id => '1', :id => 1, :issue => {:description => Issue.find(1).description}, :notes => 'Foo'
+    assert_response :success
+    assert_template 'preview'
+    assert_not_nil assigns(:notes)
+  end
 
   def test_auto_complete_routing
     assert_routing(