diff --git a/src/super_archives/templates/superarchives/tags/display_message.html b/src/super_archives/templates/superarchives/tags/display_message.html
index 29957bf..edb4701 100644
--- a/src/super_archives/templates/superarchives/tags/display_message.html
+++ b/src/super_archives/templates/superarchives/tags/display_message.html
@@ -1,5 +1,9 @@
+{% load cache %}
+
+{% cache cache_timeout 'display_message' cache_key %}
 {% for message, class in messages %}
   {% if class == 'reply' %}
     <button class="btn btn-info btn-xs" onclick="$(this).next().toggle();">...</button>
     <pre style="display: none; color: #707";>{% else %}<pre>{% endif %}{{ message }}</pre>
 {% endfor %}
+{% endcache %}
diff --git a/src/super_archives/templatetags/superarchives.py b/src/super_archives/templatetags/superarchives.py
index 76c20d4..b58d3b4 100644
--- a/src/super_archives/templatetags/superarchives.py
+++ b/src/super_archives/templatetags/superarchives.py
@@ -2,6 +2,7 @@
 import re
 
 from django import template
+from django.core.cache import cache
 
 from html2text import html2text
 
@@ -68,4 +69,6 @@ def display_message(email, thread):
     else:
         messages.append((join(block), 'normal'))
 
-    return {'messages': messages}
+    return {'messages': messages,
+            'cache_key': email.pk,
+            'cache_timeout': cache.default_timeout}
--
libgit2 0.21.2