diff --git a/app/controllers/issues_controller.rb b/app/controllers/issues_controller.rb
index 44f0d15f4..921d7d12b 100644
--- a/app/controllers/issues_controller.rb
+++ b/app/controllers/issues_controller.rb
@@ -473,7 +473,6 @@ class IssuesController < ApplicationController
   def reply
     @issue = Issue.find(params[:id])
     @jour = Journal.find(params[:journal_id])
-    @tempContent = "<blockquote>#{ll(Setting.default_language, :text_user_wrote, @jour.user.realname.blank? ?  @jour.user.login: @jour.user.realname)} <br/>#{@jour.notes.html_safe}</blockquote>".html_safe
     respond_to do |format|
       format.js
     end
@@ -482,17 +481,17 @@ class IssuesController < ApplicationController
   #给issue添加journ。回复内容包含 对某个被回复的journ的内容
   def add_reply
     if User.current.logged?
-      jour = Journal.new
-      jour.user_id = User.current.id
-      jour.notes = params[:quote]+params[:notes]
+      jour = Journal.find(params[:journal_id])
       @issue = Issue.find params[:id]
-      jour.journalized = @issue
-      jour.save
-      update_user_activity(@issue.class,@issue.id)
-      update_forge_activity(@issue.class,@issue.id)
+      new_jour = @issue.journals.build(:user_id => User.current.id, :reply_id => params[:journal_id], :notes => params[:content], :parent_id => jour.id)
+      @user_activity_id = params[:user_activity_id]
+      if new_jour.save
+        update_user_activity(@issue.class,@issue.id)
+        update_forge_activity(@issue.class,@issue.id)
 
-      respond_to do |format|
-        format.js
+        respond_to do |format|
+          format.js
+        end
       end
     end
   end
@@ -501,7 +500,8 @@ class IssuesController < ApplicationController
   def delete_journal
      @issue = Issue.find(params[:id])
      Journal.destroy(params[:journal_id])
-    respond_to do |format|
+     @user_activity_id = params[:user_activity_id]
+     respond_to do |format|
       format.js
     end
   end
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
index 6b9e8f4c9..2d16f1a2b 100644
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@@ -98,6 +98,8 @@ class UsersController < ApplicationController
         @comment = OrgDocumentComment.find params[:comment].to_i
       when 'Comment'
         @comment = Comment.find params[:comment].to_i
+      when 'Journal'
+        @comment = Journal.find params[:comment].to_i
     end
   end
 
@@ -142,6 +144,11 @@ class UsersController < ApplicationController
         @user_activity_id = params[:user_activity_id]
         @activity_id = params[:activity_id]
         @type = 'News'
+      when 'Issue'
+        @reply = Journal.find params[:reply_id]
+        @user_activity_id = params[:user_activity_id]
+        @activity_id = params[:activity_id]
+        @type = 'Issue'
     end
     respond_to do |format|
       format.js
@@ -3329,6 +3336,8 @@ class UsersController < ApplicationController
         when 'Issue'
           obj = Issue.where('id = ?', params[:id].to_i).first
           @journals = obj.journals.reorder("created_on desc")
+          @type = 'Issue'
+          @user_activity_id = params[:div_id].to_i if params[:div_id]
         when 'BlogComment'
           obj = BlogComment.where('id = ?', params[:id].to_i).first
           @user_activity_id = params[:div_id].to_i if params[:div_id]
diff --git a/app/models/journal.rb b/app/models/journal.rb
index 0f88fcb7f..d2cc9e539 100644
--- a/app/models/journal.rb
+++ b/app/models/journal.rb
@@ -37,6 +37,7 @@ class Journal < ActiveRecord::Base
   has_many :at_messages, as: :at_message, dependent: :destroy
   acts_as_attachable
   attr_accessor :indice
+  acts_as_tree :counter_cache => :comments_count, :order => "#{Journal.table_name}.created_on ASC"
 
   acts_as_event :title =>Proc.new {|o| status = ((s = o.new_status) ? " (#{s})" : nil); "#{o.issue.tracker} ##{o.issue.project_index}#{status}: #{o.issue.subject}" },
                 :description =>:notes,
diff --git a/app/views/blog_comments/show.html.erb b/app/views/blog_comments/show.html.erb
index bde98d456..f5c7c9094 100644
--- a/app/views/blog_comments/show.html.erb
+++ b/app/views/blog_comments/show.html.erb
@@ -135,13 +135,8 @@
                   <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
                 </div>
                 <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher">
-                    <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-                    <%= time_from_now(comment.created_on) %>
-                  </div>
-                  <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
-                      <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
-                  <% end %>
+                  <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
+
                   <% if !comment.content_detail.blank? %>
                       <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                         <%= comment.content_detail.html_safe %>
diff --git a/app/views/issues/_issue_replies.html.erb b/app/views/issues/_issue_replies.html.erb
index 7b5383c1e..344987913 100644
--- a/app/views/issues/_issue_replies.html.erb
+++ b/app/views/issues/_issue_replies.html.erb
@@ -1,55 +1,55 @@
 <ul>
-  <% issue.journals.reorder("created_on desc").each do |reply| %>
+  <% issue.journals.reorder("created_on desc").each do |comment| %>
       <script type="text/javascript">
           $(function(){
-              showNormalImage('reply_content_<%= reply.id %>');
-              autoUrl('reply_content_<%= reply.id %>');
+              showNormalImage('reply_content_<%= comment.id %>');
+              autoUrl('reply_content_<%= comment.id %>');
           });
       </script>
-      <% replies_all_i=replies_all_i + 1 %>
-      <li class="homepagePostReplyContainer" nhname="reply_rec" onmouseover="$('#reply_edit_menu_<%= reply.id%>').show();" onmouseout="$('#reply_edit_menu_<%= reply.id%>').hide();" >
+      <li class="homepagePostReplyContainer" nhname="reply_rec">
         <div class="homepagePostReplyPortrait" >
-          <%= link_to image_tag(url_to_avatar(reply.user), :width => "33", :height => "33"), user_path(reply.user_id), :alt => "用户头像" %>
+          <%= link_to image_tag(url_to_avatar(comment.user), :width => "33", :height => "33"), user_path(comment.user_id), :alt => "用户头像" %>
         </div>
         <div class="homepagePostReplyDes">
-          <div class="homepagePostReplyPublisher">
-            <% if reply.try(:user).try(:realname) == ' ' %>
-                <%= link_to reply.try(:user), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-            <% else %>
-                <%= link_to reply.try(:user).try(:realname), user_path(reply.user_id), :class => "newsBlue mr10 f14" %>
-            <% end %>
-            <%#= format_time(reply.created_on) %>
-          </div>
-          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= reply.id %>">
-            <% if reply.details.any? %>
-                <% details_to_strings(reply.details).each do |string| %>
+          <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%>
+
+          <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
+            <% if comment.details.any? %>
+                <% details_to_strings(comment.details).each do |string| %>
                     <p><%= string %></p>
                 <% end %>
             <% end %>
-            <P><%= reply.notes.html_safe %></P>
+            <P><%= comment.notes.html_safe %></P>
           </div>
-          <div style="margin-top: 7px">
-            <%= format_time(reply.created_on) %>
-            <div class="fr" id="reply_edit_menu_<%= reply.id%>" style="display: none">
-              <%= link_to(
-                          l(:button_reply),
-                          {:controller => 'issues', :action => 'reply', :user_id => reply.user_id, :id => issue.id, :journal_id => reply.id},
-                          :remote => true,
-                          :method => 'get',
-                          :class => 'fr newsBlue',
-                          :title => l(:button_reply)) if  User.current.logged?  %>
-              <%= link_to(
-                          l(:button_delete),
-                          {:controller => 'issues',:action => 'delete_journal', :id => issue.id,:journal_id=>reply.id},
-                          :method => :get,
-                          :remote=>true,
-                          :class => 'fr newsGrey mr10',
-                          :data => {:confirm => l(:text_are_you_sure)},
-                          :title => l(:button_delete)
-                  ) if reply.user_id == User.current.id %>
+          <div class="orig_reply mb10 mt-10">
+            <div class="reply">
+                <span class="reply-right">
+                    <span id="reply_praise_count_<%= comment.id %>">
+                      <%= render :partial => "praise_tread/praise", :locals => {:activity => comment, :user_activity_id => comment.id, :type => "reply"} %>
+                    </span>
+                    <span style="position: relative" class="fr mr20">
+                      <%= link_to(
+                                  l(:button_reply),
+                                  {:controller => 'issues', :action => 'reply', :user_id => comment.user_id, :id => issue.id, :journal_id => comment.id},
+                                  :remote => true,
+                                  :method => 'get',
+                                  :title => l(:button_reply)) %>
+                      <span id="reply_iconup_<%= comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                    </span>
+                  <%= link_to(
+                              l(:button_delete),
+                              {:controller => 'issues',:action => 'delete_journal', :id => issue.id,:journal_id=>comment.id},
+                              :method => :get,
+                              :remote=>true,
+                              :class => 'fr mr20',
+                              :data => {:confirm => l(:text_are_you_sure)},
+                              :title => l(:button_delete)
+                      ) if comment.user_id == User.current.id %>
+                </span>
+              <div class="cl"></div>
             </div>
           </div>
-          <p id="reply_message_<%= reply.id%>"></p>
+          <p id="reply_message_<%= comment.id%>"></p>
         </div>
         <div class="cl"></div>
       </li>
@@ -65,8 +65,6 @@
     <% if User.current.logged? %>
         <div nhname='new_message_<%= @issue.id %>' style="display:none;">
           <%= form_for('new_form',:url =>  add_journal_issue_path(@issue.id),:method => "post", :remote => true) do |f| %>
-              <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-              <!--<div class="cl"></div>-->
               <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
               <div nhname='toolbar_container_<%= @issue.id %>' ></div>
               <div class="cl"></div>
@@ -83,7 +81,6 @@
     <% else %>
         <%= render :partial => "users/show_unlogged" %>
     <% end %>
-    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
     <div class="cl"></div>
 
   </div>
diff --git a/app/views/issues/_issue_reply_ke_form.html.erb b/app/views/issues/_issue_reply_ke_form.html.erb
index 7fbb0d191..cf4c3e504 100644
--- a/app/views/issues/_issue_reply_ke_form.html.erb
+++ b/app/views/issues/_issue_reply_ke_form.html.erb
@@ -1,30 +1,26 @@
-<div class="ReplyToMessageContainer borderBottomNone " id="reply_to_message_<%= @issue.id%>">
+<div class="ReplyToMessageContainer borderBottomNone " id="reply_to_message_<%= @jour.id%>">
 
-  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @issue.id%>">
+  <div class="homepagePostReplyPortrait mr15 imageFuzzy" id="reply_image_<%= @jour.id%>">
     <%= link_to image_tag(url_to_avatar(User.current), :width => "33", :height => "33"), user_path(@issue.author_id), :alt => "用户头像" %>
   </div>
 
   <div class="ReplyToMessageInputContainer mb10">
     <% if User.current.logged? %>
-        <div nhname='new_message_<%= @issue.id%>' style="display:none;">
+        <div nhname='new_message_<%= @jour.id%>' style="display:none;">
           <%= form_for('new_form',:url =>  add_reply_issue_path(@issue.id),:method => "post", :remote => true) do |f|%>
-              <%#= kindeditor_tag :notes,"",:height=>"33",:minHeight=>"33",:editor_id=>"issues_reply_editor"%>
-              <!--<div class="cl"></div>-->
-              <input type="hidden" name="quote" value=""/>
-              <input type="hidden" name="issue_id" value="<%=@issue.id%>"/>
-              <div nhname='toolbar_container_<%= @issue.id%>' ></div>
+              <input type="hidden" name="journal_id" value="<%=@jour.id%>"/>
+              <div nhname='toolbar_container_<%= @jour.id%>' ></div>
               <div class="cl"></div>
-              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @issue.id%>' name="notes"></textarea>
+              <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= @jour.id%>' name="content"></textarea>
               <div class="cl"></div>
-              <span nhname='contentmsg_<%= @issue.id%>' class="fl"></span>
-              <a id="new_message_submit_btn_<%= @issue.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+              <span nhname='contentmsg_<%= @jour.id%>' class="fl"></span>
+              <a id="new_message_submit_btn_<%= @jour.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
               <div class="cl"></div>
           <% end %>
         </div>
     <% else %>
         <%= render :partial => "users/show_unlogged" %>
     <% end %>
-    <!--<a href="javascript:void(0);" onclick="issues_reply_editor.sync();$(this).parent().submit();" class="homepagePostReplySubmit postReplySubmit fl mt5">发送</a>-->
     <div class="cl"></div>
 
   </div>
diff --git a/app/views/issues/add_reply.js.erb b/app/views/issues/add_reply.js.erb
index 500451781..a818830cd 100644
--- a/app/views/issues/add_reply.js.erb
+++ b/app/views/issues/add_reply.js.erb
@@ -1,3 +1,8 @@
-$("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
-$(".homepagePostReplyBannerCount").html('回复(<%= Issue.find( @issue).journals.count %>)')
-sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
\ No newline at end of file
+<% if @user_activity_id %>
+    $("#div_user_issue_reply_<%=@user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
+    sd_create_editor_from_data(<%= @user_activity_id%>, null, "100%","<%=@issue.class.name%>");
+<% else %>
+    $("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue}) %>");
+    $(".homepagePostReplyBannerCount").html('回复（<%= @issue.journals.count %>）');
+    sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
+<% end %>
\ No newline at end of file
diff --git a/app/views/issues/delete_journal.js.erb b/app/views/issues/delete_journal.js.erb
index 7c7f25c1c..120c4bf7e 100644
--- a/app/views/issues/delete_journal.js.erb
+++ b/app/views/issues/delete_journal.js.erb
@@ -1,3 +1,8 @@
+<% if @user_activity_id %>
+$("#div_user_issue_reply_<%=@user_activity_id%>").html("<%= escape_javascript(render :partial => 'users/project_issue_reply', :locals => {:activity => @issue, :user_activity_id => @user_activity_id}) %>");
+sd_create_editor_from_data(<%= @user_activity_id%>, null, "100%","<%=@issue.class.name%>");
+<% else %>
 $("#reply_div_<%= @issue.id %>").html("<%=  escape_javascript(render :partial => 'issues/issue_replies', :locals => {:issue => @issue,:replies_all_i=>0}) %>");
 $(".homepagePostReplyBannerCount").html('回复(<%= @issue.journals.count %>)')
-sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
\ No newline at end of file
+sd_create_editor_from_data(<%= @issue.id%>, null, "100%","<%=@issue.class.name%>");
+<% end %>
\ No newline at end of file
diff --git a/app/views/issues/reply.js.erb b/app/views/issues/reply.js.erb
index 2d42475f6..11f067f77 100644
--- a/app/views/issues/reply.js.erb
+++ b/app/views/issues/reply.js.erb
@@ -1,9 +1,8 @@
 if($("#reply_message_<%= @jour.id%>").length > 0) {
     $("#reply_message_<%= @jour.id%>").replaceWith("<%= escape_javascript(render :partial => 'issues/issue_reply_ke_form') %>");
     $(function(){
-        $('input[name=quote]').val("<%= raw escape_javascript(@tempContent.html_safe) %>");
-        sd_create_editor_from_data(<%= @issue.id%>, null, "100%", "<%= @issue.class.name %>");
+        sd_create_editor_from_data(<%= @jour.id%>, null, "100%", "<%= @jour.class.name %>");
     });
-}else if($("#reply_to_message_<%= @issue.id%>").length >0) {
-    $("#reply_to_message_<%= @issue.id%>").replaceWith("<p id='reply_message_<%= @jour.id%>'></p>");
+}else if($("#reply_to_message_<%= @jour.id%>").length >0) {
+    $("#reply_to_message_<%= @jour.id%>").replaceWith("<p id='reply_message_<%= @jour.id%>'></p>");
 }
\ No newline at end of file
diff --git a/app/views/messages/_course_show.html.erb b/app/views/messages/_course_show.html.erb
index b37540810..06ece7eaa 100644
--- a/app/views/messages/_course_show.html.erb
+++ b/app/views/messages/_course_show.html.erb
@@ -110,13 +110,8 @@
               <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
             </div>
             <div class="homepagePostReplyDes">
-              <div class="homepagePostReplyPublisher">
-                <%= link_to reply.creator_user.show_name, user_url_in_org(reply.creator_user.id), :class => "newsBlue mr10 f14" %>
-                <%= time_from_now(reply.created_on) %>
-              </div>
-              <% if !reply.parent.nil? && !reply.parent.parent.nil? %>
-                  <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>
-              <% end %>
+              <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>
+
               <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                 <%= reply.content.html_safe%>
               </div>
diff --git a/app/views/messages/_org_subfield_show.html.erb b/app/views/messages/_org_subfield_show.html.erb
index 39fceb456..f2d21d9b3 100644
--- a/app/views/messages/_org_subfield_show.html.erb
+++ b/app/views/messages/_org_subfield_show.html.erb
@@ -142,13 +142,8 @@
                   <%= link_to image_tag(url_to_avatar(reply.author), :width => 33, :height => 33), user_path(reply.author) %>
                 </div>
                 <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher">
-                    <%= link_to reply.creator_user.show_name, user_url_in_org(reply.creator_user.id), :class => "newsBlue mr10 f14" %>
-                    <%= time_from_now(reply.created_on) %>
-                  </div>
-                  <% if !reply.parent.nil? && !reply.parent.parent.nil? %>
-                      <%= render :partial => 'users/message_contents', :locals => {:comment => reply} %>
-                  <% end %>
+                  <%= render :partial => 'users/message_contents', :locals => {:comment => reply} %>
+
                   <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                     <%= reply.content.html_safe %>
                   </div>
diff --git a/app/views/messages/_project_show.html.erb b/app/views/messages/_project_show.html.erb
index 164e4c326..363e00b65 100644
--- a/app/views/messages/_project_show.html.erb
+++ b/app/views/messages/_project_show.html.erb
@@ -171,13 +171,8 @@
                 <%= link_to image_tag(url_to_avatar(reply.author), :width => 33,:height => 33), user_path(reply.author) %>
               </div>
               <div class="homepagePostReplyDes">
-                <div class="homepagePostReplyPublisher">
-                  <%= link_to reply.creator_user.show_name, user_url_in_org(reply.creator_user.id), :class => "newsBlue mr10 f14" %>
-                  <%= time_from_now(reply.created_on) %>
-                </div>
-                <% if !reply.parent.nil? && !reply.parent.parent.nil? %>
-                    <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>
-                <% end %>
+                <%= render :partial => 'users/message_contents', :locals => {:comment => reply}%>
+
                 <div class="homepagePostReplyContent upload_img break_word table_maxWidth" id="reply_message_description_<%= reply.id %>">
                   <%= reply.content.html_safe%>
                 </div>
diff --git a/app/views/news/_news_all_replies.html.erb b/app/views/news/_news_all_replies.html.erb
index bd305cefe..c4140cd91 100644
--- a/app/views/news/_news_all_replies.html.erb
+++ b/app/views/news/_news_all_replies.html.erb
@@ -20,35 +20,8 @@
               <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
             </div>
             <div class="homepagePostReplyDes">
-              <div class="homepagePostReplyPublisher">
-                <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-                <%= time_from_now(comment.created_on) %>
-              </div>
-              <% if !comment.parent.nil? %>
-                  <% parents_rely = [] %>
-                  <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
-                  <% length = parents_rely.length %>
-                  <div id="comment_reply_<%=comment.id %>">
-                    <% if length <= 3 %>
-                        <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
-                    <% else %>
-                        <div class="orig_cont clearfix">
-                          <div class="orig_cont clearfix">
-                            <div>
-                              <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
-                            </div>
-                            <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
-                          </div>
-                          <div class="orig_cont_hide clearfix">
-                            <span class="orig_icon" >&darr; </span>
-                            <span class="orig_icon" style="display:none;" > &uarr;</span>
-                            <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
-                          </div>
-                          <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
-                        </div>
-                    <% end %>
-                  </div>
-              <% end %>
+              <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%>
+
               <% if !comment.content_detail.blank? %>
                   <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                     <%= comment.content_detail.html_safe %>
diff --git a/app/views/org_document_comments/show.html.erb b/app/views/org_document_comments/show.html.erb
index d1fe457a7..0b5f4e693 100644
--- a/app/views/org_document_comments/show.html.erb
+++ b/app/views/org_document_comments/show.html.erb
@@ -103,13 +103,8 @@
                   <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
                 </div>
                 <div class="homepagePostReplyDes">
-                  <div class="homepagePostReplyPublisher">
-                    <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-                    <%= time_from_now(comment.created_at) %>
-                  </div>
-                  <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
-                      <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
-                  <% end %>
+                  <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
+
                   <% if !comment.content_detail.blank? %>
                       <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                         <%= comment.content_detail.html_safe %>
diff --git a/app/views/organizations/_org_subfield_message.html.erb b/app/views/organizations/_org_subfield_message.html.erb
index cdaeed8f4..d12464b3c 100644
--- a/app/views/organizations/_org_subfield_message.html.erb
+++ b/app/views/organizations/_org_subfield_message.html.erb
@@ -87,7 +87,7 @@
       <div class="homepagePostReplyInputContainer mb10">
         <% if User.current.logged? %>
             <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+              <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id,:is_course => 0, :is_board => 0},:method => "post", :remote => true) do |f|%>
                   <input type="hidden" name="quote[quote]" value="">
                   <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
                   <div nhname='toolbar_container_<%= user_activity_id%>'></div>
diff --git a/app/views/users/_comment_reply_detail.html.erb b/app/views/users/_comment_reply_detail.html.erb
index b8ea13cf4..3c9f3d279 100644
--- a/app/views/users/_comment_reply_detail.html.erb
+++ b/app/views/users/_comment_reply_detail.html.erb
@@ -4,6 +4,17 @@
 <div class="orig_right fl">
   <%= link_to comment.creator_user.show_name, user_path(comment.creator_user.id), :class => "content-username" %>
   <span class="orig_area"><%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %></span>
-  <div class="orig_content "><%= comment.content_detail.html_safe %></div>
+  <div class="orig_content ">
+    <% if comment.class == Journal %>
+        <% if comment.details.any? %>
+            <% details_to_strings(comment.details).each do |string| %>
+                <p><%= string %></p>
+            <% end %>
+        <% end %>
+        <P><%= comment.content_detail.html_safe %></P>
+    <% else %>
+        <%= comment.content_detail.html_safe %>
+    <% end %>
+  </div>
 </div>
 <div class="cl"></div>
\ No newline at end of file
diff --git a/app/views/users/_course_message.html.erb b/app/views/users/_course_message.html.erb
index 0c16a4367..692ad4e59 100644
--- a/app/views/users/_course_message.html.erb
+++ b/app/views/users/_course_message.html.erb
@@ -97,7 +97,7 @@
           <div class="homepagePostReplyInputContainer  mb10">
             <% if User.current.logged? %>
                 <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => is_board,is_course=>is_course},:method => "post", :remote => true) do |f|%>
+                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => is_board,:is_course=>is_course},:method => "post", :remote => true) do |f|%>
                       <input type="hidden" name="quote[quote]" value="">
                       <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
                       <div nhname='toolbar_container_<%= user_activity_id%>'></div>
diff --git a/app/views/users/_message_contents.html.erb b/app/views/users/_message_contents.html.erb
index eab125006..365914908 100644
--- a/app/views/users/_message_contents.html.erb
+++ b/app/views/users/_message_contents.html.erb
@@ -1,23 +1,29 @@
-<% parents_rely = [] %>
-<% parents_rely = get_reply_parents_no_root parents_rely, comment %>
-<% length = parents_rely.length %>
-<div id="comment_reply_<%=comment.id %>">
-  <% if length <= 3 %>
-      <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
-  <% else %>
-      <div class="orig_cont clearfix">
-        <div class="orig_cont clearfix">
-          <div>
-            <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+<div class="homepagePostReplyPublisher">
+  <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
+  <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
+</div>
+<% if !comment.parent.nil? && !comment.parent.parent.nil? %>
+    <% parents_rely = [] %>
+    <% parents_rely = get_reply_parents_no_root parents_rely, comment %>
+    <% length = parents_rely.length %>
+    <div id="comment_reply_<%=comment.id %>">
+      <% if length <= 3 %>
+          <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => comment.parent} %>
+      <% else %>
+          <div class="orig_cont clearfix">
+            <div class="orig_cont clearfix">
+              <div>
+                <%=render :partial => 'users/journal_comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+              </div>
+              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+            </div>
+            <div class="orig_cont_hide clearfix">
+              <span class="orig_icon" >&darr; </span>
+              <span class="orig_icon" style="display:none;" > &uarr;</span>
+              <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
+            </div>
+            <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
           </div>
-          <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
-        </div>
-        <div class="orig_cont_hide clearfix">
-          <span class="orig_icon" >&darr; </span>
-          <span class="orig_icon" style="display:none;" > &uarr;</span>
-          <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
-        </div>
-        <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
-      </div>
-  <% end %>
-</div>
\ No newline at end of file
+      <% end %>
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_message_replies.html.erb b/app/views/users/_message_replies.html.erb
index 10a8e2b55..9ef2d146d 100644
--- a/app/views/users/_message_replies.html.erb
+++ b/app/views/users/_message_replies.html.erb
@@ -11,13 +11,8 @@
           <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
         </div>
         <div class="homepagePostReplyDes">
-          <div class="homepagePostReplyPublisher">
-            <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-            <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
-          </div>
-          <% if !comment.parent.nil? && !comment.parent.parent.nil? %>
-            <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
-          <% end %>
+          <%= render :partial => 'users/message_contents', :locals => {:comment => comment}%>
+
           <% if !comment.content_detail.blank? %>
               <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                 <%= comment.content_detail.html_safe %>
diff --git a/app/views/users/_news_contents.html.erb b/app/views/users/_news_contents.html.erb
new file mode 100644
index 000000000..2ff2c0746
--- /dev/null
+++ b/app/views/users/_news_contents.html.erb
@@ -0,0 +1,29 @@
+<div class="homepagePostReplyPublisher">
+  <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
+  <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
+</div>
+<% if !comment.parent.nil? %>
+    <% parents_rely = [] %>
+    <% parents_rely = get_reply_parents parents_rely, comment %>
+    <% length = parents_rely.length %>
+    <div id="comment_reply_<%=comment.id %>">
+      <% if length <= 3 %>
+          <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
+      <% else %>
+          <div class="orig_cont clearfix">
+            <div class="orig_cont clearfix">
+              <div>
+                <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
+              </div>
+              <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
+            </div>
+            <div class="orig_cont_hide clearfix">
+              <span class="orig_icon" >&darr; </span>
+              <span class="orig_icon" style="display:none;" > &uarr;</span>
+              <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
+            </div>
+            <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
+          </div>
+      <% end %>
+    </div>
+<% end %>
\ No newline at end of file
diff --git a/app/views/users/_news_replies.html.erb b/app/views/users/_news_replies.html.erb
index e6f28b653..a4732af8c 100644
--- a/app/views/users/_news_replies.html.erb
+++ b/app/views/users/_news_replies.html.erb
@@ -11,35 +11,8 @@
           <%= link_to image_tag(url_to_avatar(comment.creator_user), :width => 33, :height => 33, :alt => "用户头像"), user_url_in_org(comment.creator_user.id) %>
         </div>
         <div class="homepagePostReplyDes">
-          <div class="homepagePostReplyPublisher">
-            <%= link_to comment.creator_user.show_name, user_url_in_org(comment.creator_user.id), :class => "newsBlue mr10 f14" %>
-            <%= time_from_now(comment.respond_to?(:created_on) ? comment.created_on : comment.created_at) %>
-          </div>
-          <% if !comment.parent.nil? %>
-              <% parents_rely = [] %>
-              <% parents_rely = get_reply_parents parents_rely, comment %>
-              <% length = parents_rely.length %>
-              <div id="comment_reply_<%=comment.id %>">
-                <% if length <= 3 %>
-                    <%=render :partial => 'users/comment_reply', :locals => {:comment => comment.parent} %>
-                <% else %>
-                    <div class="orig_cont clearfix">
-                      <div class="orig_cont clearfix">
-                        <div>
-                          <%=render :partial => 'users/comment_reply', :locals => {:comment => parents_rely[length - 1]} %>
-                        </div>
-                        <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[length - 2]} %>
-                      </div>
-                      <div class="orig_cont_hide clearfix">
-                        <span class="orig_icon" >&darr; </span>
-                        <span class="orig_icon" style="display:none;" > &uarr;</span>
-                        <%= link_to '点击展开隐藏楼层', show_all_replies_users_path(:comment => comment, :type => comment.class),:remote=>true %>
-                      </div>
-                      <%=render :partial => 'users/comment_reply_detail', :locals => {:comment => parents_rely[0]} %>
-                    </div>
-                <% end %>
-              </div>
-          <% end %>
+          <%= render :partial => 'users/news_contents', :locals => {:comment => comment}%>
+
           <% if !comment.content_detail.blank? || comment.class == Journal %>
               <div class="homepagePostReplyContent break_word list_style upload_img table_maxWidth" id="reply_content_<%= comment.id %>">
                 <% if comment.class == Journal %>
@@ -85,7 +58,25 @@
                         </span>
                         <%= link_to('删除', {:controller => 'comments', :action => 'destroy', :id => activity_id, :comment_id => comment, :user_activity_id => user_activity_id},
                                   :remote => true, :confirm => l(:text_are_you_sure), :method => 'delete', :class => "fr mr20", :title => l(:button_delete)) if News.find(activity_id).author == User.current %>
-                        <% end %>
+                    <% elsif type == 'Issue' %>
+                        <span style="position: relative" class="fr mr20">
+                            <%= link_to(
+                                        l(:button_reply),
+                                        {:controller => 'users', :action => 'reply_to', :reply_id => comment.id, :type => type, :user_activity_id => user_activity_id, :activity_id => activity_id},
+                                        :remote => true,
+                                        :method => 'get',
+                                        :title => l(:button_reply)) %>
+                            <span id="reply_iconup_<%= comment.id %>" class="reply_iconup02" style="display: none"> ︿</span>
+                        </span>
+                        <%= link_to(
+                                  l(:button_delete),
+                                  {:controller => 'issues',:action => 'delete_journal', :id => activity_id,:journal_id=>comment.id, :user_activity_id => user_activity_id},
+                                  :method => 'get',
+                                  :remote=>true,
+                                  :class => 'fr mr20',
+                                  :title => l(:button_delete)
+                          ) if comment.user_id == User.current.id %>
+                    <% end %>
                 </span>
                   <div class="cl"></div>
                 </div>
diff --git a/app/views/users/_project_issue_reply.html.erb b/app/views/users/_project_issue_reply.html.erb
index 3dac8026a..fb2fc214e 100644
--- a/app/views/users/_project_issue_reply.html.erb
+++ b/app/views/users/_project_issue_reply.html.erb
@@ -5,7 +5,7 @@
   <% comments = activity.journals.includes(:user, :details).reorder("created_on desc").limit(3) %>
   <% if count > 0 %>
       <div class="" id="reply_div_<%= user_activity_id %>">
-        <%= render :partial => 'users/all_replies', :locals => {:comments => comments}%>
+        <%= render :partial => 'users/news_replies', :locals => {:comments => comments, :user_activity_id => user_activity_id, :type => 'Issue', :activity_id => activity.id} %>
       </div>
   <% end %>
 
diff --git a/app/views/users/_project_message.html.erb b/app/views/users/_project_message.html.erb
index df75e8385..ef39a89c5 100644
--- a/app/views/users/_project_message.html.erb
+++ b/app/views/users/_project_message.html.erb
@@ -98,7 +98,7 @@
           <div class="homepagePostReplyInputContainer mb10">
             <% if User.current.logged? %>
                 <div nhname='new_message_<%= user_activity_id%>' style="display:none;">
-                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
+                  <%= form_for('new_form',:url =>  {:controller=>'messages',:action => 'reply', :id => activity.id, :board_id => activity.board_id,:is_course => is_course, :is_board => 'true'},:method => "post", :remote => true) do |f|%>
                       <input type="hidden" name="quote[quote]" value="">
                       <input type="hidden" name="user_activity_id" value="<%=user_activity_id%>">
                       <div nhname='toolbar_container_<%= user_activity_id%>'></div>
diff --git a/app/views/users/_reply_to.html.erb b/app/views/users/_reply_to.html.erb
index d1aad2d48..aa519a5da 100644
--- a/app/views/users/_reply_to.html.erb
+++ b/app/views/users/_reply_to.html.erb
@@ -72,6 +72,16 @@
                   <div class="cl"></div>
                   <p nhname='contentmsg_<%= reply.id%>'></p>
                   <% end%>
+          <% elsif @type == 'Issue' %>
+              <%= form_for('new_form',:url => add_reply_issue_path(reply.issue.id),:method => "post", :remote => true) do |f|%>
+                  <%= hidden_field_tag 'journal_id',params[:journal_id],:value =>reply.id %>
+                  <%= hidden_field_tag 'user_activity_id',params[:user_activity_id],:value =>@user_activity_id %>
+                  <div nhname='toolbar_container_<%= reply.id%>' ></div>
+                  <textarea placeholder="有问题或有建议，请直接给我留言吧！" style="display: none" nhname='new_message_textarea_<%= reply.id%>' name="content"></textarea>
+                  <a id="new_message_submit_btn_<%= reply.id%>" href="javascript:void(0)" onclick="this.style.display='none'" class="blue_n_btn fr" style="display:none;margin-top:6px;">发送</a>
+                  <div class="cl"></div>
+                  <p nhname='contentmsg_<%= reply.id%>' class="fl"></p>
+              <% end %>
           <% end %>
         </div>
         <div class="cl"></div>
diff --git a/app/views/users/all_journals.js.erb b/app/views/users/all_journals.js.erb
index 78640033a..cc36ef3b3 100644
--- a/app/views/users/all_journals.js.erb
+++ b/app/views/users/all_journals.js.erb
@@ -8,7 +8,7 @@ $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :p
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals,:user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i, :homepage => @homepage}) %>');
 <% elsif params[:type] == 'OrgDocumentComment' %>
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/message_replies', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>');
-<% elsif params[:type] == 'News' %>
+<% elsif params[:type] == 'News' || params[:type] == 'Issue' %>
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/news_replies', :locals => {:comments => @journals, :user_activity_id => @user_activity_id, :type => @type, :activity_id => params[:id].to_i}) %>');
 <% else %>
 $('#reply_div_<%= params[:div_id].to_i %>').html('<%=escape_javascript(render :partial => 'users/all_replies', :locals => {:comments => @journals}) %>');
diff --git a/db/migrate/20160720094503_add_column_to_journal.rb b/db/migrate/20160720094503_add_column_to_journal.rb
new file mode 100644
index 000000000..3882109c3
--- /dev/null
+++ b/db/migrate/20160720094503_add_column_to_journal.rb
@@ -0,0 +1,7 @@
+class AddColumnToJournal < ActiveRecord::Migration
+  def change
+    add_column :journals, :parent_id, :integer
+    add_column :journals, :comments_count, :integer, :default => 0
+    add_column :journals, :reply_id, :integer
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 928adfe9b..3a92d4fc0 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
 
-ActiveRecord::Schema.define(:version => 20160719013955) do
+ActiveRecord::Schema.define(:version => 20160720094503) do
 
   create_table "activities", :force => true do |t|
     t.integer  "act_id",                                  :null => false
@@ -1055,6 +1055,9 @@ ActiveRecord::Schema.define(:version => 20160719013955) do
     t.text     "notes"
     t.datetime "created_on",                                        :null => false
     t.boolean  "private_notes",                  :default => false, :null => false
+    t.integer  "parent_id"
+    t.integer  "comments_count",                 :default => 0
+    t.integer  "reply_id"
   end
 
   add_index "journals", ["created_on"], :name => "index_journals_on_created_on"