diff --git a/app/views/memos/show.html.erb b/app/views/memos/show.html.erb
index 5ffcedacc..1252483d2 100644
--- a/app/views/memos/show.html.erb
+++ b/app/views/memos/show.html.erb
@@ -48,13 +48,14 @@
 
 		<div class="memo-title <%= @memo.sticky ? 'sticky' : '' %> <%= @memo.locked? ? 'locked' : '' %>"><%= label_tag l(:field_subject) %>: <%=h @memo.subject %></div>
 		<div class="memo-content">
-			<%= raw @memo.content %>
+		<%=h sanitize(@memo.content.html_safe) %>
 			<p>							
 				<% if @memo.attachments.any?%>
 				<% options = {:author => true, :deletable => @memo.deleted_attach_able_by?(User.current) } %>
 				<%= render :partial => 'attachments/links', :locals => {:attachments => @memo.attachments, :options => options} %>
 				<% end %>
 			</p>
+			<div class="clearfix"></div>
 		</div>
 		<div class="memo-timestamp"> <%= authoring @memo.created_at, @memo.author.name %></div>
 
diff --git a/app/views/users/user_fanslist.html.erb b/app/views/users/user_fanslist.html.erb
index 3247c67ab..fb1a6d0dc 100644
--- a/app/views/users/user_fanslist.html.erb
+++ b/app/views/users/user_fanslist.html.erb
@@ -1,51 +1,58 @@
 <!--add by huang-->
-<h3><%= l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count)%></h3>
+<h3><%= l(:label_x_user_fans, :count => User.current.watcher_users(User.current.id).count) %></h3>
 <div class="inf_user_image">
-	<% for user in @user.watcher_users %>
-	<ul class="list_watch"><li>
-<table width="660px" border="0" align="center">
-  <tr>
-    <td colspan="2" valign="top" width="50" ><%= link_to image_tag(url_to_avatar(user), :class => "avatar"), 
-                                                                                        user_path(user), 
-                                                                                        :title => "#{user.name}" %></td>   
-     <td><table width="580px" border="0">
-      <tr>  <!-- modified by bai -->
-        <td colspan="2" valign="top"><strong><%= content_tag "div", link_to(user.name,user_path(user)), :class => "project_avatar_name" %>
-        </td>
-        </tr>
-      
-      	<tr>
-      	<!-- added by bai 区分了个人列表里的项目与课程 -->
-         <td colspan="2" width="580px" ><p class="font_description">
-			<% unless user.memberships.empty? %>
-			<% cond = Project.visible_condition(User.current) + "AND projects.project_type <> 1" %>
-			<% memberships = user.memberships.all(:conditions => cond) %>
-			<%= l(:label_x_contribute_to, :count => memberships.count) %>
-			<% for member in memberships %>
-			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
-			<% end %>
-			<% end %>
-		 </p>
-		 <p class="font_description">
-			<% unless user.memberships.empty? %>
-			<% cond = Project.visible_condition(User.current) + "AND projects.project_type = 1" %>
-			<% memberships = user.memberships.all(:conditions => cond) %>
-			<%= l(:label_x_course_contribute_to, :count => memberships.count) %>
-			<% for member in memberships %>
-			<%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
-			<% end %>
-			<% end %>
-		  </p>
-		 </td>
-        </tr>
-       <!-- end -->
-       
-      <tr>        
-        <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
-        </td>
-      </tr>
-    </table></td>
-  </tr>
-</table></li></ul>
-<% end %>
+  <% for user in @user.watcher_users %>
+      <ul class="list_watch">
+        <li>
+          <table width="660px" border="0" align="center">
+            <tr>
+              <td colspan="2" valign="top" width="50"><%= link_to image_tag(url_to_avatar(user), :class => "avatar"),
+                                                                  user_path(user),
+                                                                  :title => "#{user.name}" %></td>
+              <td>
+                <table width="580px" border="0">
+                  <tr>  <!-- modified by bai -->
+                    <td colspan="2" valign="top">
+                      <strong><%= content_tag "div", link_to(user.name, user_path(user)), :class => "project_avatar_name" %></strong>
+                    </td>
+                  </tr>
+
+                  <tr>
+                    <!-- added by bai 区分了个人列表里的项目与课程 -->
+                    <td colspan="2" width="580px"><p class="font_description">
+                      <% unless user.memberships.empty? %>
+                          <% cond = Project.visible_condition(User.current) + " AND projects.project_type <> 1" %>
+                          <% memberships = user.memberships.all(:conditions => cond) %>
+                          <%= l(:label_x_contribute_to, :count => memberships.count) %>
+                          <% for member in memberships %>
+                              <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
+                          <% end %>
+                      <% end %>
+                    </p>
+
+                      <p class="font_description">
+                        <% unless user.memberships.empty? %>
+                            <% cond = Project.visible_condition(User.current) + " AND projects.project_type = 1" %>
+                            <% memberships = user.memberships.all(:conditions => cond) %>
+                            <%= l(:label_x_course_contribute_to, :count => memberships.count) %>
+                            <% for member in memberships %>
+                                <%= link_to_project(member.project) %><%= (user.memberships.last == member) ? '' : '，' %>
+                            <% end %>
+                        <% end %>
+                      </p>
+                    </td>
+                  </tr>
+                  <!-- end -->
+
+                  <tr>
+                    <td width="200" align="right" class="font_lighter"><%= l(:label_user_joinin) %><%= format_date(user.created_on) %>
+                    </td>
+                  </tr>
+                </table>
+              </td>
+            </tr>
+          </table>
+        </li>
+      </ul>
+  <% end %>
 </div>
\ No newline at end of file