diff --git a/app/views/messages/edit.html.erb b/app/views/messages/edit.html.erb
index 6371b5c45..fdea28e87 100644
--- a/app/views/messages/edit.html.erb
+++ b/app/views/messages/edit.html.erb
@@ -1,6 +1,7 @@
-<h2><%= link_to h(@board.name), :controller => 'boards',
-               :action => 'show', :project_id => @project,
-               :id => @board %> &#187; <%= h @message.subject %></h2>
+<%= breadcrumb link_to(l(:label_board_plural), project_boards_path(@project)),
+               link_to(h(@board.name), project_board_path(@project, @board)) %>
+
+<h2><%= avatar(@topic.author, :size => "24") %><%=h @topic.subject %></h2>
 
 <%= form_for @message, {
                :as => :message,