--- a/default/chat/message.html	Tue Jan 30 07:47:23 2018 +0100
+++ b/default/chat/message.html	Tue Jan 30 07:47:26 2018 +0100
@@ -1,11 +1,9 @@
+{% import 'components/avatar.html' as avatar with context %}
+
 <p id="{{msg.id}}" class="msg_{{msg.type}} {{'own_msg' if msg.from_ == own_jid.full()}}">
     {%- if msg.type != C.MESS_TYPE_INFO %}
         {%- set author = identities[msg.from_].nick | default(msg.from_) -%}
-        {%- if identities[msg.from_].avatar_basename is defined %}
-            <img class="avatar" src="{{cache_path}}{{identities[msg.from_].avatar_basename}}">
-        {% else %}
-            <span class="avatar generated">{{author|first|upper}}</span>
-        {%- endif -%}
+        {{ avatar.avatar(msg.from_) }}
         <span class="msg_header">
             <span class="author">{{author}}</span>
             <span class="date">{{msg.timestamp|date_fmt('auto_day')}}</span>