diff --git a/app/views/conversations/index.haml b/app/views/conversations/index.haml
index e5e38d5e2..a0f3d7fc2 100644
--- a/app/views/conversations/index.haml
+++ b/app/views/conversations/index.haml
@@ -12,11 +12,10 @@
 .row
   .col-md-2.list-group
     - @boxes.each do |box_name, item_count|
-      = link_to conversations_path(box: box_name), class: 'nav-link' do
-        .list-group-item.d-flex.justify-content-between{class: "#{box_name == @box ? 'active' : ''} #{box_name}"}
-          = icon 'fas', box_name
-          = box_name
-          %span.badge.badge-primary.badge-pill= item_count
+      = link_to conversations_path(box: box_name), class: "nav-link list-group-item d-flex justify-content-between #{box_name == @box ? 'active' : ''} #{box_name}" do
+        = icon 'fas', box_name
+        = box_name
+        %span.badge.badge-primary.badge-pill= item_count
 
   .col-md-10
     .list-group
@@ -29,7 +28,16 @@
               - else
                 %i.far.fa-envelope-open.mr-4.pr-3
               %strong= conversation.subject
-            %small= time_ago_in_words conversation.messages.last.created_at
+              %small
+                #{time_ago_in_words conversation.messages.last.created_at} ago
+                %span.text-muted= conversation.messages.last.created_at
+
+            %ul.list-group
+              - conversation.recipients.each do |member|
+                - if member != current_member
+                  %li.member-chip
+                    = image_tag(avatar_uri(member, 100), alt: '', height: 50, width: 50)
+                    = member
 
           %p.mb-2
             = truncate(strip_tags(conversation.messages.last.body), length: 100, separator: ' ', omission: '... ')
diff --git a/app/views/conversations/show.html.haml b/app/views/conversations/show.html.haml
index 7dc5fc1c7..791f72b96 100644
--- a/app/views/conversations/show.html.haml
+++ b/app/views/conversations/show.html.haml
@@ -3,18 +3,18 @@
   %li.breadcrumb-item.active= link_to @conversation.subject, conversation_path(@conversation)
 
 .row
-  .col-md-4
-  .col-md-8
+  .col-md-2
+  .col-md-10
     %h1= @conversation.subject
 .row
-  .col-md-4
+  .col-md-2
     .card
       .card-header
         %h6 Participants
       %ul.list-group.list-group-flush
         - @participants.each do |member|
           %li.list-group-item= render 'members/tiny', member: member
-  .col-md-8
+  .col-md-10
     .card
       %ul.list-group.list-group-flush
         - @conversation.messages.order(:created_at).each do |message|