<table>
<tr>
<th align="right">From</th>
- <td><%= link_to @message.sender.display_name, :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
+ <td>
+ <% if @message.sender.image %>
+ <%= image_tag url_for_file_column(@message.sender, "image") %>
+ <% end %>
+
+<%= link_to h(@message.sender.display_name), :controller => 'user', :action => 'view', :display_name => @message.sender.display_name %></td>
</tr>
<tr>
<th align="right">Subject</th>
</tr>
<tr>
<th></th>
- <td><%= sanitize(@message.body) %></td>
+ <td><%= htmlize(@message.body) %></td>
</tr>
</table>
<table>
<tr>
<th align="right">To</th>
- <td><%= link_to @message.recipient.display_name, :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
+ <td><%= link_to h(@message.recipient.display_name), :controller => 'user', :action => 'view', :display_name => @message.recipient.display_name %></td>
</tr>
<tr>
<th align="right">Subject</th>
</tr>
<tr>
<th></th>
- <td><%= sanitize(@message.body) %></td>
+ <td><%= htmlize(@message.body) %></td>
</tr>
</table>