diff --git a/ietf/ipr/templatetags/ipr_filters.py b/ietf/ipr/templatetags/ipr_filters.py
index 19586d1eb..21d5579bf 100644
--- a/ietf/ipr/templatetags/ipr_filters.py
+++ b/ietf/ipr/templatetags/ipr_filters.py
@@ -12,13 +12,16 @@ register = template.Library()
 def render_message_for_history(msg):
     """Format message for display in history.  Suppress the 'To' line for incoming responses
     """
-    if msg.to.startswith('ietf-ipr+'):
-        return format_html('Date: {}<br>From: {}<br>Subject: {}<br>Cc: {}<br><br>{}',
-            msg.time,msg.frm,msg.subject,msg.cc,msg.body)
+    from ietf.message.models import Message
+    if isinstance(msg, Message):
+        if msg.to.startswith('ietf-ipr+'):
+            return format_html('Date: {}<br>From: {}<br>Subject: {}<br>Cc: {}<br><br>{}',
+                msg.time,msg.frm,msg.subject,msg.cc,msg.body)
+        else:
+            return format_html('Date: {}<br>From: {}<br>To: {}<br>Subject: {}<br>Cc: {}<br><br>{}',
+                msg.time,msg.frm,msg.to,msg.subject,msg.cc,msg.body)
     else:
-        return format_html('Date: {}<br>From: {}<br>To: {}<br>Subject: {}<br>Cc: {}<br><br>{}',
-            msg.time,msg.frm,msg.to,msg.subject,msg.cc,msg.body)
-
+        return msg
 
 @register.filter
 def to_class_name(value):