diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 16aea97be..cb0c27715 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -593,6 +593,7 @@ module ApplicationHelper
     css << 'project-' + @project.identifier if @project && @project.identifier.present?
     css << 'controller-' + controller_name
     css << 'action-' + action_name
+    css << 'avatars-' + (Setting.gravatar_enabled? ? 'on' : 'off')
     if UserPreference::TEXTAREA_FONT_OPTIONS.include?(User.current.pref.textarea_font)
       css << "textarea-#{User.current.pref.textarea_font}"
     end
diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb
index 180a2ba7d..db41b0cc3 100644
--- a/app/views/messages/show.html.erb
+++ b/app/views/messages/show.html.erb
@@ -34,6 +34,7 @@
 <br />
 
 <% unless @replies.empty? %>
+<div id="replies">
 <h3 class="comments icon icon-comments"><%= l(:label_reply_plural) %> (<%= @reply_count %>)</h3>
 <% if !@topic.locked? && authorize_for('messages', 'reply') && @replies.size >= 3 %>
   <p><%= toggle_link l(:button_reply), "reply", :focus => 'message_content', :scroll => "message_content" %></p>
@@ -74,6 +75,7 @@
   <%= link_to_attachments message, :author => false, :thumbnails => true %>
   </div>
 <% end %>
+</div>
 <span class="pagination"><%= pagination_links_full @reply_pages, @reply_count, :per_page_links => false %></span>
 <% end %>
 
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index f1f7efea6..11a1d836b 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -300,11 +300,15 @@ table.files tr.file td.digest { font-size: 80%; }
 
 table.members td.roles, table.memberships td.roles { width: 45%; }
 
+table.messages td.last_message {text-align:left;}
 tr.message { height: 2.6em; }
 tr.message td.created_on { white-space: nowrap; }
 tr.message td.last_message { font-size: 80%; white-space: nowrap; }
 tr.message.sticky td.subject { font-weight: bold; }
 
+body.avatars-on #replies .message {padding-left:32px;}
+#replies h4 img.gravatar {margin-left:-32px;}
+
 tr.version.closed, tr.version.closed a { color: #999; }
 tr.version td.name { padding-left: 20px; }
 tr.version td.date, tr.version td.status, tr.version td.sharing { text-align: center; white-space:nowrap; }
@@ -362,8 +366,6 @@ table.boards td.last-message {text-align:left;font-size:80%;}
 
 div.table-list.boards .table-list-cell.name {width: 30%;}
 
-table.messages td.last_message {text-align:left;}
-
 #query_form_content {font-size:90%;}
 #query_form_with_buttons > p.contextual {font-size:12px; margin:12px 0px;}
 
@@ -502,12 +504,13 @@ div#issue-changesets div.changeset { border-bottom: 1px solid #ddd; }
 div#issue-changesets p { margin-top: 0; margin-bottom: 1em;}
 .changeset-comments {margin-bottom:1em;}
 
-div.journal {overflow:auto;}
 div.journal .contextual {margin-top: 0;}
-div.journal.private-notes {border-left:2px solid #d22; padding-left:4px; margin-left:-6px;}
+div.journal.private-notes .wiki {border-left:2px solid #d22; padding-left:4px; margin-left:-6px;}
 div.journal ul.details, ul.revision-info {color:#959595; margin-bottom: 1.5em;}
 div.journal ul.details a, ul.revision-info a {color:#70A7CD;}
-div.journal ul.details a:hover,  ul.revision-info a:hover {color:#D14848;}
+div.journal ul.details a:hover, ul.revision-info a:hover {color:#D14848;}
+body.avatars-on div.journal {padding-left:32px;}
+div.journal h4 img.gravatar {margin-left:-32px;}
 
 div#activity dl, #search-results { margin-left: 2em; }
 div#activity dd, #search-results dd { margin-bottom: 1em; padding-left: 18px; font-size: 0.9em; }