Merge remote-tracking branch 'upstream/pull/1816'

diff --combined app/views/diary_entry/_diary_entry.html.erb
index 46565869e362e90db4b208d962a9b2fa899fb9ab,e4b2c214391d1ea02b221d42828a68ee50a83b92..6b585b3f311c68d52197c9ebe6de545da7fbd04e
--- 1/app/views/diary_entry/_diary_entry.html.erb
--- 2/app/views/diary_entry/_diary_entry.html.erb
+++ b/app/views/diary_entry/_diary_entry.html.erb
@@@ -1,6 -1,6 +1,6 @@@
  <div class='diary_post'>
    <div class='post_heading clearfix'>
 -    <% if !@this_user %>
 +    <% if !@user %>
        <%= user_thumbnail diary_entry.user %>
      <% end %>
  
@@@ -23,7 -23,7 +23,7 @@@
    <ul class='secondary-actions clearfix'>
      <% if params[:action] == 'list' %>
        <li><%= link_to t('diary_entry.diary_entry.comment_link'), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'newcomment' %></li>
-       <li><%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :title => "Re: #{diary_entry.title}" %></li>
+       <li><%= link_to t('diary_entry.diary_entry.reply_link'), :controller => 'message', :action => 'new', :display_name => diary_entry.user.display_name, :message => { :title => "Re: #{diary_entry.title}" } %></li>
        <li><%= link_to t('diary_entry.diary_entry.comment_count', :count => diary_entry.visible_comments.count), :action => 'view', :display_name => diary_entry.user.display_name, :id => diary_entry.id, :anchor => 'comments' %></li>
      <% end %>