diff --git a/src/client/views/conversation-viewer.vala b/src/client/views/conversation-viewer.vala
index 638fe46..3d0162c 100644
--- a/src/client/views/conversation-viewer.vala
+++ b/src/client/views/conversation-viewer.vala
@@ -437,10 +437,16 @@ public class ConversationViewer : Gtk.Box {
         Geary.RFC822.MailboxAddress? primary = message.sender;
         if (primary != null) {
             try {
-                WebKit.DOM.HTMLImageElement icon = Util.DOM.select(div_message, ".avatar")
-                    as WebKit.DOM.HTMLImageElement;
-                icon.set_attribute("src",
-                    Gravatar.get_image_uri(primary, Gravatar.Default.MYSTERY_MAN, 48));
+                string gravatar_uri = Gravatar.get_image_uri(primary, Gravatar.Default.NOT_FOUND, 48);
+                var session = new Soup.SessionAsync ();
+                var avatarmessage = new Soup.Message ("GET", gravatar_uri);
+                Soup.KnownStatusCode avatarstatus = (Soup.KnownStatusCode) session.send_message ( avatarmessage);
+                print(avatarstatus.to_string() + "\n");
+                if(avatarstatus == Soup.KnownStatusCode.OK) {
+                    WebKit.DOM.HTMLImageElement icon = Util.DOM.select(div_message, ".avatar")
+                        as WebKit.DOM.HTMLImageElement;
+                    icon.set_attribute("src", gravatar_uri);
+                }
             } catch (Error error) {
                 debug("Failed to inject avatar URL: %s", error.message);
             }
diff --git a/src/client/views/conversation-web-view.vala b/src/client/views/conversation-web-view.vala
index 87d6008..7f7c9d3 100644
--- a/src/client/views/conversation-web-view.vala
+++ b/src/client/views/conversation-web-view.vala
@@ -141,12 +141,13 @@ public class ConversationWebView : WebKit.WebView {
         assert(container != null);
         
         // Load the icons.
-        set_icon_src("#email_template .menu .icon", "go-down");
-        set_icon_src("#email_template .starred .icon", "starred");
-        set_icon_src("#email_template .unstarred .icon", "non-starred-grey");
-        set_icon_src("#email_template .attachment.icon", "mail-attachment");
-        set_icon_src("#email_template .close_show_images", "gtk-close");
-        set_icon_src("#link_warning_template .close_link_warning", "gtk-close");
+        set_icon_src("#email_template .avatar", "avatar-default", 48);
+        set_icon_src("#email_template .menu .icon", "go-down", 16);
+        set_icon_src("#email_template .starred .icon", "starred", 16);
+        set_icon_src("#email_template .unstarred .icon", "non-starred-grey", 16);
+        set_icon_src("#email_template .attachment.icon", "mail-attachment", 16);
+        set_icon_src("#email_template .close_show_images", "gtk-close", 16);
+        set_icon_src("#link_warning_template .close_link_warning", "gtk-close", 16);
     }
     
     private void load_user_style() {
@@ -198,10 +199,10 @@ public class ConversationWebView : WebKit.WebView {
         }
     }
     
-    private void set_icon_src(string selector, string icon_name) {
+    private void set_icon_src(string selector, string icon_name, int size) {
         try {
             // Load the icon.
-            string icon_filename = IconFactory.instance.lookup_icon(icon_name, 16).get_filename();
+            string icon_filename = IconFactory.instance.lookup_icon(icon_name, size).get_filename();
             uint8[] icon_content;
             FileUtils.get_data(icon_filename, out icon_content);
             
diff --git a/theming/message-viewer.css b/theming/message-viewer.css
index 6da19de..98c4799 100644
--- a/theming/message-viewer.css
+++ b/theming/message-viewer.css
@@ -145,7 +145,9 @@ hr {
     overflow: hidden;
 }
 .avatar {
-    display: none;
+    display: inline;
+    float: left;
+    border-radius: 5px;
     image-rendering: optimizeQuality;
 }
 
