diff --git a/app/helpers/issues_helper.rb b/app/helpers/issues_helper.rb
index d1fb28961c..27c6fdd5b0 100644
--- a/app/helpers/issues_helper.rb
+++ b/app/helpers/issues_helper.rb
@@ -60,6 +60,7 @@ module IssuesHelper
     @cached_label_priority ||= l(:field_priority)
     @cached_label_project ||= l(:field_project)
 
+    avatar(issue.author, :size => "14", :title => l(:field_author)) +
     link_to_issue(issue) + "<br /><br />".html_safe +
       "<strong>#{@cached_label_project}</strong>: #{link_to_project(issue.project)}<br />".html_safe +
       "<strong>#{@cached_label_status}</strong>: #{h(issue.status.name)}<br />".html_safe +
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 6abf7788c5..78edf47314 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -1186,10 +1186,6 @@ div.wiki img {vertical-align:middle; max-width:100%;}
 .gantt_subjects div { line-height:16px;height:16px;overflow:hidden;white-space:nowrap;text-overflow: ellipsis; }
 .gantt_subjects div.issue-subject:hover { background-color:#ffffdd; }
 
-.gantt_subjects .issue-subject img.icon-gravatar {
-  margin: 2px 5px 0px 2px;
-}
-
 .task {
   position: absolute;
   height:8px;
@@ -1352,6 +1348,10 @@ div.issue img.gravatar {
   margin: 0 12px 6px 0;
 }
 
+.gantt_subjects .issue-subject img.icon-gravatar, div.tooltip img.gravatar {
+  margin: 2px 5px 0px 2px;
+}
+
 div.gravatar-with-child {
   position: relative;
 }
diff --git a/test/functional/calendars_controller_test.rb b/test/functional/calendars_controller_test.rb
index 9f9b2a2ef4..a1036441db 100644
--- a/test/functional/calendars_controller_test.rb
+++ b/test/functional/calendars_controller_test.rb
@@ -33,9 +33,11 @@ class CalendarsControllerTest < Redmine::ControllerTest
            :queries
 
   def test_show
-    get :show, :params => {
-        :project_id => 1
-      }
+    with_settings :gravatar_enabled => '1' do
+      get :show, :params => {
+          :project_id => 1
+        }
+    end
     assert_response :success
 
     # query form
@@ -51,8 +53,9 @@ class CalendarsControllerTest < Redmine::ControllerTest
 
     # Assert context menu on issues
     assert_select 'form[data-cm-url=?]', '/issues/context_menu'
-    assert_select 'div.issue.hascontextmenu' do
+    assert_select 'div.issue.hascontextmenu.tooltip' do
       assert_select 'input[name=?][type=?]', 'ids[]', 'checkbox'
+      assert_select 'img[class="gravatar"]'
     end
   end
 
diff --git a/test/functional/gantts_controller_test.rb b/test/functional/gantts_controller_test.rb
index dd397d0e42..2ca34aef04 100644
--- a/test/functional/gantts_controller_test.rb
+++ b/test/functional/gantts_controller_test.rb
@@ -30,9 +30,11 @@ class GanttsControllerTest < Redmine::ControllerTest
   def test_gantt_should_work
     i2 = Issue.find(2)
     i2.update_attribute(:due_date, 1.month.from_now)
-    get :show, :params => {
-        :project_id => 1
-      }
+    with_settings :gravatar_enabled => '1' do
+      get :show, :params => {
+          :project_id => 1
+        }
+    end
     assert_response :success
 
     # query form
@@ -49,7 +51,9 @@ class GanttsControllerTest < Redmine::ControllerTest
 
     # Assert context menu on issues subject and gantt bar
     assert_select 'div[class=?]', 'issue-subject hascontextmenu'
-    assert_select 'div[class=?]', 'tooltip hascontextmenu'
+    assert_select 'div.tooltip.hascontextmenu' do
+      assert_select 'img[class="gravatar"]'
+    end
     assert_select "form[data-cm-url=?]", '/issues/context_menu'
 
     # Issue with start and due dates