diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 6e59f63..688e3d2 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -1251,6 +1251,14 @@ module ApplicationHelper
     end
   end
 
+  # Returns a link to edit user's avatar if avatars are enabled
+  def avatar_edit_link(user, options={})
+    if Setting.gravatar_enabled?
+      url = "http://gravatar.com"
+      link_to avatar(user, {:title => l(:button_edit)}.merge(options)), url, :target => '_blank'
+    end
+  end
+
   def sanitize_anchor_name(anchor)
     anchor.gsub(%r{[^\s\-\p{Word}]}, '').gsub(%r{\s+(\-+\s*)?}, '-')
   end
diff --git a/app/views/my/account.html.erb b/app/views/my/account.html.erb
index cadf0e8..2d7aa9a 100644
--- a/app/views/my/account.html.erb
+++ b/app/views/my/account.html.erb
@@ -4,7 +4,11 @@
 <%= call_hook(:view_my_account_contextual, :user => @user)%>
 </div>
 
-<h2><%=l(:label_my_account)%></h2>
+<h2>
+  <%= avatar_edit_link(@user, :size => "50") %>
+  <%=l(:label_my_account)%>
+</h2>
+
 <%= error_messages_for 'user' %>
 
 <%= labelled_form_for :user, @user,