diff --git a/web/src/components/TimelineMail.vue b/web/src/components/TimelineMail.vue
index ba2ff30..fd2003c 100644
--- a/web/src/components/TimelineMail.vue
+++ b/web/src/components/TimelineMail.vue
@@ -4,25 +4,29 @@
             <i class="avatar | small">
                 <font-awesome-icon icon="user"/>
             </i>
-            <span><a href="#">$USER</a> commented on <time
-                :datetime="timestamp">{{ timestamp }}</time></span>
+            <span><!--a href="#">$USER</a--> sent by <span class="badge badge-primary">{{ item.sender }} </span> on <time
+                :datetime="timestamp">{{ timestamp }}</time>
+                to <span class="badge badge-secondary ml-1">{{ item.recipient }}</span>
+            </span>
         </div>
         <div class="card bg-dark">
             <div class="card-header">
                 {{ item.subject }}
             </div>
             <div class="card-body">
-            <p><span v-html="body"></span></p>
-            <!--button class="button">👏 2</button>
-            <button class="button | square">
-                <font-awesome-icon icon="user"/>
-            </button-->
+                <p><span v-html="body"></span></p>
+                <!--button class="button">👏 2</button>
+                <button class="button | square">
+                    <font-awesome-icon icon="user"/>
+                </button-->
             </div>
             <div class="card-footer" v-if="item.attachments.length">
                 <ul>
                     <li v-for="attachment in item.attachments">
-                        <AuthenticatedImage :src="`/media/2/256/${attachment.hash}/`" :alt="attachment.name" v-if="attachment.mime_type.startsWith('image/')"/>
-                        <AuthenticatedDataLink :href="`/media/2/256/${attachment.hash}/`" :download="attachment.name" v-else/>
+                        <AuthenticatedImage :src="`/media/2/256/${attachment.hash}/`" :alt="attachment.name"
+                                            v-if="attachment.mime_type.startsWith('image/')"/>
+                        <AuthenticatedDataLink :href="`/media/2/256/${attachment.hash}/`" :download="attachment.name"
+                                               v-else/>
                     </li>
                 </ul>
             </div>