diff --git a/static/styles/zulip.css b/static/styles/zulip.css
index 9a51b32188..f0f0845460 100644
--- a/static/styles/zulip.css
+++ b/static/styles/zulip.css
@@ -2791,6 +2791,7 @@ div.edit_bot {
 .message_body_gravatar {
     width: 20px;
     height: 20px;
+    border-radius: 10px;
     margin: 2px 2px 2px 0px;
     border: 1px solid #000;
 }
diff --git a/zerver/lib/bugdown/__init__.py b/zerver/lib/bugdown/__init__.py
index ec77001719..c08e5a2c85 100644
--- a/zerver/lib/bugdown/__init__.py
+++ b/zerver/lib/bugdown/__init__.py
@@ -341,9 +341,12 @@ class InlineInterestingLinkProcessor(markdown.treeprocessors.Treeprocessor):
 class Gravatar(markdown.inlinepatterns.Pattern):
     def handleMatch(self, match):
         img = markdown.util.etree.Element('img')
-        img.set('class', 'message_body_gravatar img-rounded')
+        email_address = match.group('email')
+        img.set('class', 'message_body_gravatar')
         img.set('src', 'https://secure.gravatar.com/avatar/%s?d=identicon&s=30'
-            % (gravatar_hash(match.group('email')),))
+            % (gravatar_hash(email_address),))
+        img.set('title', email_address)
+        img.set('alt', email_address)
         return img
 
 path_to_emoji = os.path.join(os.path.dirname(__file__), '..', '..', '..',