diff --git a/app/models/homework_common.rb b/app/models/homework_common.rb
index c1e5666ac..796080645 100644
--- a/app/models/homework_common.rb
+++ b/app/models/homework_common.rb
@@ -40,9 +40,9 @@ class HomeworkCommon < ActiveRecord::Base
   def act_as_course_message
     if self.course
       self.course.members.each do |m|
-        if m.user_id != self.user_id
+        # if m.user_id != self.user_id
           self.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => self.course_id, :viewed => false)
-        end
+        # end
       end
     end
   end
diff --git a/app/models/mailer.rb b/app/models/mailer.rb
index a8ba4f4ee..6c4aca02d 100644
--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -53,16 +53,17 @@ class Mailer < ActionMailer::Base
     recipients ||= []
     course.members.each do |member|
       user = User.find(member.user_id)
-      # @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
+      @subject = "#{l(:mail_homework)}#{homework_common.name} #{l(:mail_anonymous_comment_open)}"
       @token = Token.get_token_from_user(user, 'autologin')
       @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
       @anonymous_comment_close_name = homework_common.name
       @author = homework_common.user
       #收件人邮箱
+     
       recipients << user.mail
     end
     mail :to => recipients,
-         :subject => "[#{l(:mail_homework)}#{homework_common.name}] #{l(:mail_anonymous_comment_open)}"
+         :subject => @subject
   end
 
   # 作业匿评关闭
@@ -71,7 +72,7 @@ class Mailer < ActionMailer::Base
     recipients ||= []
     course.members.each do |member|
       user = User.find(member.user_id)
-      #@subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_open)}"
+      @subject = "#{l(:mail_homework)}#{homework_common.name}  #{l(:mail_anonymous_comment_close)}"
       @token = Token.get_token_from_user(user, 'autologin')
       @anonymous_comment_close_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
       @anonymous_comment_close_name = homework_common.name
@@ -80,7 +81,7 @@ class Mailer < ActionMailer::Base
       recipients << user.mail
     end
     mail :to => recipients,
-         :subject => "[#{l(:mail_homework)}#{homework_common.name}]  #{l(:mail_anonymous_comment_open)}"
+         :subject => @subject
   end
 
   # 匿评失败给老师发送邮件通知
@@ -91,17 +92,21 @@ class Mailer < ActionMailer::Base
     course.members.each do |member|
       if member.user.allowed_to?(:as_teacher,course)
         user = User.find(member.user_id)
-        #@subject = "[#{l(:mail_homework)} #{homework_common.name}]  #{l(:mail_anonymous_comment_failed)}"
+        @subject = "[#{l(:mail_homework)} #{homework_common.name}]  #{l(:mail_anonymous_comment_failed)}"
         @token = Token.get_token_from_user(user, 'autologin')
         @anonymous_comment_fail_url = url_for(student_work_index_url(:homework => homework_common.id, :token => @token.value))
         @anonymous_comment_fail_name = homework_common.name
         @author = homework_common.user
         #收件人邮箱
+        puts "######################"
+        puts homework_common.id
+        puts recipients
+        puts "######################"
         recipients << user.mail
       end
     end
     mail :to => recipients,
-         :subject => "[#{l(:mail_homework)} #{homework_common.name}]  #{l(:mail_anonymous_comment_failed)}"
+         :subject => @subject
   end
 
   # author: alan
diff --git a/app/views/memos/_praise_tread.html.erb b/app/views/memos/_praise_tread.html.erb
index 13287836e..5850cf50a 100644
--- a/app/views/memos/_praise_tread.html.erb
+++ b/app/views/memos/_praise_tread.html.erb
@@ -7,13 +7,13 @@
           <% if @is_valuate.size > 0 %> <!-- 评价过   1代表赞 0代表踩 -->
               <% @flag = @is_valuate.first.praise_or_tread %>
               <% if  @flag == 1 %> <!-- 顶过  --><!-- modified by bai -->
-                  <a href="javascript:void(0);" class="linkGrey2 postLikeIcon" title="<%= l(:label_issue_praise_over)%>" >   <%= get_praise_num(obj)%></a>
+                  <a href="javascript:void(0);" class="<%= @obj.author.id == User.current.id ? 'linkGrey2 postLikeIcon mr30':'linkGrey2 postLikeIcon' %>" title="<%= l(:label_issue_praise_over)%>" >   <%= get_praise_num(obj)%></a>
               <% end %>
           <% else %>
               <% if user_id == obj.author_id %>
 
                         <!--<%#= image_tag "/images/praise_tread/praise_true.png" , weight:"22px", height:"22px",:title => l(:label_issue_not_praise_over) %>-->
-                        <a href="javascript:void(0);" class="linkGrey2 postLikeIcon" title="<%= l(:label_issue_not_praise_over)%>" >   <%= get_praise_num(obj)%></a>
+                        <a href="javascript:void(0);" class="linkGrey2 postLikeIcon mr30" title="<%= l(:label_issue_not_praise_over)%>" >   <%= get_praise_num(obj)%></a>
 
               <% else %>
                   <!-- 积分少于2分不能踩帖 -->
diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index f2ab0c525..4224d0987 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -33,7 +33,7 @@
 
     function del_confirm(){
         if(confirm('确认删除么?')){
-            $("#del_link").click();
+            $("#del_memo_link").click();
         }else{
 
         }
@@ -52,7 +52,7 @@
             <ul class="homepagePostSettiongText">
               <li><a href="<%= edit_forum_memo_path(@memo.forum,@memo)%>" class="postOptionLink">编辑</a></li>
               <li><a href="javascript:void(0);"  class="postOptionLink" onclick="del_confirm();">删除</a></li>
-              <li style="display: none"><a href="<%= forum_memo_path(@memo.forum,@memo) %>" data-method="delete" id="del_link" ></a></li>
+              <li style="display: none"><a href="<%= forum_memo_path(@memo.forum,@memo) %>" data-method="delete" id="del_memo_link" ></a></li>
             </ul>
           </li>
         </ul>
@@ -64,7 +64,8 @@
       <%= render :partial => "memos/praise_tread",:locals => {:obj => @memo,:show_flag => true,:user_id =>User.current.id,:horizontal => true}%>
       <div class="cl"></div>
 
-      <div class="postDetailCreater"><a href="javascript:void(0);" class="linkBlue2" target="_blank"><%= @memo.author.name%></a></div>
+      <div class="postDetailCreater">
+        <%= link_to @memo.author.name, user_path(@memo.author), :class => "linkBlue2", :target=> "_blank"%></div>
       <div class="postDetailDate mb5"><%= format_date( @memo.created_at)%></div>
       <div class="cl"></div>
       <div class="memo-content" style="word-break: break-all; word-wrap:break-word;margin-bottom: 0px !important;" >
diff --git a/app/views/users/_user_message_forge.html.erb b/app/views/users/_user_message_forge.html.erb
index 641fb9269..b93122bd2 100644
--- a/app/views/users/_user_message_forge.html.erb
+++ b/app/views/users/_user_message_forge.html.erb
@@ -197,7 +197,7 @@
           <li class="homepageNewsPubType fl"><%=link_to ma.forge_message.author, user_path(ma.forge_message.author), :class => "newsBlue homepageNewsPublisher" %>
             <span class="<%= ma.viewed == 0 ? "homepageNewsTypeNotRead fl":"homepageNewsType fl" %>">评论了新闻：</span></li>
           <li class="homepageNewsContent fl">
-            <%= link_to "#{ma.forge_message.comments.html_safe}",
+            <%= link_to "#{ma.forge_message.commented.title}",
                         {:controller => 'news', :action => 'show', :id => ma.forge_message.commented.id },:class =>"#{ma.viewed == 0 ? "newsBlack" : "newsGrey"}",
                         :onmouseover => "message_titile_show($(this),event)",
                         :onmouseout => "message_titile_hide($(this))" %>
diff --git a/lib/tasks/homework_evaluation.rake b/lib/tasks/homework_evaluation.rake
index 63640bbb5..6cf4dd6da 100644
--- a/lib/tasks/homework_evaluation.rake
+++ b/lib/tasks/homework_evaluation.rake
@@ -32,7 +32,7 @@ namespace :homework_evaluation do
             homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 2)
           end
           # 邮件通知
-          Mailer.send_mail_anonymous_comment_close(homework_common).deliver
+          Mailer.send_mail_anonymous_comment_open(homework_common).deliver
         else
           #作业数小于2，启动失败, 只给老师发
           # status==4 发送失败
@@ -65,7 +65,10 @@ namespace :homework_evaluation do
         end
         homework_detail_manual.update_column('comment_status', 3)
         # 匿评关闭消息通知 给所有人发
-        send_message_anonymous_comment(homework_common, 3)
+        course = homework_common.course
+        course.members.each do |m|
+          homework_common.course_messages << CourseMessage.new(:user_id => m.user_id, :course_id => course.id, :viewed => false, :status => 3)
+        end
         # 邮件通知
         Mailer.send_mail_anonymous_comment_close(homework_common).deliver
       end
diff --git a/public/stylesheets/new_user.css b/public/stylesheets/new_user.css
index d55da7e75..ace5cb651 100644
--- a/public/stylesheets/new_user.css
+++ b/public/stylesheets/new_user.css
@@ -808,7 +808,7 @@ a.postReplyIcon:hover {background:url(images/post_image_list.png) -40px -29px no
 .postAttIcon:hover {background:url(images/post_image_list.png) 0px -113px no-repeat;}
 .postThemeContainer {width:720px;}
 .postThemeWrap {width:655px; float:left;position: relative}
-.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; margin-right:30px; margin-top:3px;}
+.postLikeIcon {background:url(images/post_image_list.png) 0px -42px no-repeat ;float:right; padding-left:18px; margin-top:3px;}
 .postLikeIcon:hover {background:url(images/post_image_list.png) 0px -64px no-repeat ;}
 a.AnnexBtn{  background: url(images/homepage_icon2.png) 0px -343px no-repeat !important; width:70px; height:20px; display:block; padding-left:20px; color:#888888;}
 a:hover.AnnexBtn{background: url(images/homepage_icon2.png) -90px -343px no-repeat !important; color:#3598db;}
diff --git a/public/stylesheets/prettify.css b/public/stylesheets/prettify.css
index c7d16ffd4..2e750f076 100644
--- a/public/stylesheets/prettify.css
+++ b/public/stylesheets/prettify.css
@@ -75,3 +75,7 @@ li.L9 { background: #eee }
 /*.prettyprint .dec,*/
 /*.prettyprint .var { color: #A6E22E; }*/
 /*.prettyprint .pln { color: #66D9EF; }*/
+.memo-content pre {
+    white-space:pre !important;
+    word-wrap: break-word;
+}
\ No newline at end of file