diff --git a/app/views/mailer/message_posted.html.erb b/app/views/mailer/message_posted.html.erb
index dbe41976a..2be4e486e 100644
--- a/app/views/mailer/message_posted.html.erb
+++ b/app/views/mailer/message_posted.html.erb
@@ -23,7 +23,7 @@
     </li>
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
-        	<%= @message.content %>
+        	<%= @message.content.html_safe? %>
         </span>
     </li>
 
diff --git a/app/views/mailer/send_invite_in_project.html.erb b/app/views/mailer/send_invite_in_project.html.erb
index 51b189f37..ec559732f 100644
--- a/app/views/mailer/send_invite_in_project.html.erb
+++ b/app/views/mailer/send_invite_in_project.html.erb
@@ -5,7 +5,7 @@
     <li style="list-style-type:none; margin:0; padding:0;"><span style="float: left;"><strong><%= l(:mail_issue_content)%></strong></span>
 		<span style="float: left; width: 526px">
           <p><%= @subject %> </p>
-          <p style="color: #15BCCF ">点击链接激活账号，系统会依据给出的密码和账号自动登录Trustie平台。</p>
+          <p style="color: #15BCCF ">点击下面的链接即可激活账号，系统会根据给出的密码和账号自动登录Trustie平台。</p>
           <p> <%= link_to @project_url, @project_url%></p>
           <p>您的账号为:<%= @email %></p>
           <p>密码为： <%= @password %></p>
diff --git a/app/views/mailer/wiki_content_added.html.erb b/app/views/mailer/wiki_content_added.html.erb
index 8c83f62c8..c4f6929a8 100644
--- a/app/views/mailer/wiki_content_added.html.erb
+++ b/app/views/mailer/wiki_content_added.html.erb
@@ -1,3 +1,3 @@
 <p><%= l(:mail_body_wiki_content_added, :id => link_to(h(@wiki_content.page.pretty_title), @wiki_content_url),
                                         :author => h(@wiki_content.author)).html_safe %><br />
-<em><%=h @wiki_content.comments %></em></p>
+<em><%=h @wiki_content.comments.html_safe? %></em></p>