diff --git a/src/accounts/templatetags/__init__.py b/src/accounts/templatetags/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/accounts/templatetags/__init__.py
diff --git a/src/accounts/templatetags/gravatar.py b/src/accounts/templatetags/gravatar.py
new file mode 100644
index 0000000..bc57069
--- /dev/null
+++ b/src/accounts/templatetags/gravatar.py
@@ -0,0 +1,20 @@
+
+from django import template
+
+from super_archives.models import EmailAddress
+
+
+register = template.Library()
+
+
+@register.simple_tag
+def gravatar(email, size=80):
+    if isinstance(email, basestring):
+        try:
+            email = EmailAddress.objects.get(address=email)
+        except EmailAddress.DoesNotExist:
+            pass
+
+    email_md5 = getattr(email, 'md5', 'anonymous')
+
+    return u'<img src="http://www.gravatar.com/avatar/{}?s={}&d=mm" height="{}px" width="{}px">'.format(email_md5, size, size, size)
diff --git a/src/super_archives/templates/message-thread.html b/src/super_archives/templates/message-thread.html
index c8eb5ee..d4a1cf6 100644
--- a/src/super_archives/templates/message-thread.html
+++ b/src/super_archives/templates/message-thread.html
@@ -1,6 +1,7 @@
 {% extends "base.html" %}
 {% load i18n %}
 {% load append_to_get %}
+{% load gravatar %}
 {% block main-content %}
 <div class="row">
 
@@ -47,8 +48,7 @@
     <li>
       <div class="col-lg-2 text-center">
         <a href="{{ email.from_address.get_profile_link }}">
-          <img width="80px" height="80px"
-               src="http://www.gravatar.com/avatar/{{ email.from_address.md5 }}?s=80&d=identicon" />
+          {% gravatar email.from_address 80 %}
           <div>&nbsp;</div>
           {% trans "Anonymous" as anonymous %}
           <span>{% firstof email.from_address.get_full_name anonymous %}</span>
--
libgit2 0.21.2