diff --git a/zephyr/management/commands/render_old_messages.py b/zephyr/management/commands/render_old_messages.py
new file mode 100644
index 0000000000..489f81934e
--- /dev/null
+++ b/zephyr/management/commands/render_old_messages.py
@@ -0,0 +1,26 @@
+from __future__ import absolute_import
+
+from django.core.management.base import BaseCommand
+
+from zephyr.lib.actions import update_message_flags
+from zephyr.models import UserProfile, Message, get_user_profile_by_email
+import datetime
+import time
+
+class Command(BaseCommand):
+    help = """Render all historical messages that haven't been rendered yet.
+
+Usage: python manage.py render_old_messages"""
+
+    def handle(self, *args, **options):
+        total_rendered = 0
+        while True:
+            messages = Message.objects.filter(rendered_content_version=None)[0:100]
+            if len(messages) == 0:
+                break
+            for message in messages:
+                message.maybe_render_content(save=True)
+            total_rendered += len(messages)
+            print datetime.datetime.now(), total_rendered
+            # Put in some sleep so this can run safely on low resource machines
+            time.sleep(0.25)