diff --git a/app/views/comments/edit.html.haml b/app/views/comments/edit.html.haml
index eb586af80..feded5cb2 100644
--- a/app/views/comments/edit.html.haml
+++ b/app/views/comments/edit.html.haml
@@ -1,10 +1,10 @@
 .block
   .secondary-navigation
     %ul.wat-cf
-      %li.first= link_to t(@comment.commentable_type == 'Grit::Commit' ? "layout.git.repositories.commits" : "layout.issues.list"), @commentable_path
+      %li.first= link_to t("layout.comments.back"), @commentable_path
   .content
     %h2.title
-      = t("layout.#{@comment.commentable_type == 'Grit::Commit' ? 'comments' : 'issues'}.edit_header")
+      = t("layout.comments.edit_header")
     .inner
       = form_for @comment, :url => @update_url, :html => { :class => :form } do |f|
         = render :partial => "form", :locals => {:f => f}
diff --git a/app/views/issues/show.html.haml b/app/views/issues/show.html.haml
index d50d14417..4904dc0eb 100644
--- a/app/views/issues/show.html.haml
+++ b/app/views/issues/show.html.haml
@@ -26,6 +26,9 @@
     .both
     =f.submit t('layout.update'), :id => 'update_issue_content'
     =link_to t('layout.issues.cancel_button'), '#', :id => 'cancel_edit_issue_content', :class => 'button'
-.hr
-
+  %br
+%br
 =render :partial => 'issues/status'
+
+= render :partial => "comments/list", :locals => {:list => @issue.comments, :project => @project, :commentable => @issue}
+= render :partial => "comments/add", :locals => {:project => @project, :commentable => @issue}
\ No newline at end of file
diff --git a/config/locales/layout/comments.en.yml b/config/locales/layout/comments.en.yml
index 19fd7c6ea..b309be256 100644
--- a/config/locales/layout/comments.en.yml
+++ b/config/locales/layout/comments.en.yml
@@ -4,3 +4,4 @@ en:
       has_commented:     "adds a note"
       notifications_are: "Notifications for new comments are"
       comments_header:   "Comments"
+      back: 'Back'
diff --git a/config/locales/layout/comments.ru.yml b/config/locales/layout/comments.ru.yml
index 0d680c2b2..4a8723d17 100644
--- a/config/locales/layout/comments.ru.yml
+++ b/config/locales/layout/comments.ru.yml
@@ -4,3 +4,4 @@ ru:
       has_commented: "оставил комментарий"
       notifications_are: "Уведомления о последующих комментариях"
       comments_header: "Комментарии"
+      back: 'Назад'