diff --git a/app/assets/stylesheets/bulma.css b/app/assets/stylesheets/bulma.css
index 84f828a..49dc5b3 100644
--- a/app/assets/stylesheets/bulma.css
+++ b/app/assets/stylesheets/bulma.css
@@ -45,4 +45,5 @@
 
 .chat .message {
   --bulma-message-border-style: none;
+  width: 300px;
 }
diff --git a/app/controllers/conversations/messages_controller.rb b/app/controllers/conversations/messages_controller.rb
index 176cff7..4d2f93f 100644
--- a/app/controllers/conversations/messages_controller.rb
+++ b/app/controllers/conversations/messages_controller.rb
@@ -3,7 +3,7 @@
 module Conversations
   class MessagesController < ApplicationController
     def show
-      @profile_info = retro_meet_client.profile_info
+      @basic_profile_info = basic_profile_info
       # TODO: everything here is a placeholder, make it real
       @conversation = retro_meet_client.find_conversations.first
       @messages = [
diff --git a/app/views/conversations/messages/show.html.haml b/app/views/conversations/messages/show.html.haml
index cded955..4472085 100644
--- a/app/views/conversations/messages/show.html.haml
+++ b/app/views/conversations/messages/show.html.haml
@@ -3,17 +3,14 @@
     %h1 Chat with #{@conversation.other_profile.display_name}
     %hr
     - @messages.each do |message|
-      - if message.sender == @profile_info.id
+      - if message.sender == @basic_profile_info.id
         .media.chat-right
           .message.is-success
             .message-body
               %p
                 #{message.content}
-              %p
+              %p.is-size-7.has-text-right
                 sent #{time_ago_in_words(message.sent_at)} ago
-          .media-right
-            %figure.image.is-48x48.is-32x32-mobile
-              %img.is-rounded{:alt => "Image", :src => @profile_info.profile_picture}/
       - else
         .media
           .media-left
@@ -23,5 +20,5 @@
             .message-body
               %p
                 #{message.content}
-              %p
+              %p.is-size-7.has-text-right
                 sent #{time_ago_in_words(message.sent_at)} ago