1 files changed, 9 insertions, 5 deletions

diff --git a/hyperkitty/templates/messages/message.html b/hyperkitty/templates/messages/message.html
index 7140d75..23fa458 100644
--- a/hyperkitty/templates/messages/message.html
+++ b/hyperkitty/templates/messages/message.html
@@ -27,17 +27,21 @@
             {% gravatar email.sender_email 40 %}
         </div>
         <div class="email-author inline-block">
-            <span class="name"><a
-                href="{% url 'public_user_profile' email=email.sender_email %}"
-                title="See {{ email.sender_name|escapeemail|escape }}'s profile"
-                >{{email.sender_name|escapeemail}}</a></span>
+            <span class="name">
+                {% if email.user_id %}
+                <a href="{% url 'public_user_profile' user_id=email.user_id %}"
+                   title="See {{ email.sender_name|escapeemail|escape }}'s profile"
+                   >{{email.sender_name|escapeemail}}</a>
+                {% else %}
+                   {{email.sender_name|escapeemail}}
+                {% endif %}
+            </span>
             <br />
             <span class="messagelink">
                 (<a href="{% url 'message_index' mlist_fqdn=mlist.name message_id_hash=email.message_id_hash %}"
                     title="{{ email.subject }}">permalink</a>)
             </span>
             {% if use_mockups %}
-            <br />
             <span class="rank">
                 Rank 8
             </span>