diff --git a/mailpile/www/default/html/partials/search_item.html b/mailpile/www/default/html/partials/search_item.html
index d0c33a69c..4abf74c8b 100644
--- a/mailpile/www/default/html/partials/search_item.html
+++ b/mailpile/www/default/html/partials/search_item.html
@@ -19,13 +19,14 @@
 <tr id="pile-message-{{mid}}"
     class="result{% for tid in metadata.tag_tids %} in_{{result.data.tags[tid].slug}}{% endfor %}{% if metadata.flags.replied %} replied{% endif %}"
     data-state="normal"
-{%- if metadata.body.list and
+{%- if metadata.body and metadata.body.list and
        ('list:' + metadata.body.list) not in state.query_args.q %}
     data-context-hint="{{ _('View e-mail from this mailing list') }}"
     data-context-icon="groups"
     data-context-url="{{ U('/search/?q=list:', metadata.body.list) }}"
 {%- else %}
-  {%- if ('from:' + from.address) not in state.query_args.q %}
+  {%- if from and from.address and
+         ('from:' + from.address) not in state.query_args.q %}
     data-context-hint="{{ _('Search for e-mail from:') }} {{metadata.from.fn}}"
     data-context-icon="user"
     data-context-url="{{ U('/search/?q=from:', from.address) }}"