diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index 377e6e2b8..cd2c7e3db 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -136,11 +136,12 @@ textarea {
   display: inline-block;
   overflow: hidden;
   min-width: 30px;
-  // To limit messages with things forcing them wider, like long attachment names
-  max-width: 100%;
+  // To limit messages with things forcing them wider, like long attachment names.
+  width: 100%;
   align-items: center;
   border-radius: var(--border-radius-message-box);
 }
+
 label {
   user-select: none;
 }
diff --git a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
index 9a621112e..0a4d9ddc3 100644
--- a/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
+++ b/ts/components/conversation/message/message-content/MessageContentWithStatus.tsx
@@ -18,7 +18,7 @@ import { ExpirableReadableMessage } from '../message-item/ExpirableReadableMessa
 import { MessageAuthorText } from './MessageAuthorText';
 import { MessageContent } from './MessageContent';
 import { MessageContextMenu } from './MessageContextMenu';
-import { MessageReactions, StyledMessageReactions } from './MessageReactions';
+import { MessageReactions } from './MessageReactions';
 import { MessageStatus } from './MessageStatus';
 
 export type MessageContentWithStatusSelectorProps = { isGroup: boolean } & Pick<
@@ -39,11 +39,10 @@ const StyledMessageContentContainer = styled.div<{ isIncoming: boolean }>`
   flex-direction: column;
   justify-content: flex-start;
   align-items: ${props => (props.isIncoming ? 'flex-start' : 'flex-end')};
+  padding-left: ${props => (props.isIncoming ? 0 : '25%')};
+  padding-right: ${props => (props.isIncoming ? '25%' : 0)};
   width: 100%;
-
-  ${StyledMessageReactions} {
-    margin-right: var(--margins-md);
-  }
+  margin-right: var(--margins-md);
 `;
 
 const StyledMessageWithAuthor = styled.div`
diff --git a/ts/models/message.ts b/ts/models/message.ts
index 46732e3f2..7b7bfe827 100644
--- a/ts/models/message.ts
+++ b/ts/models/message.ts
@@ -200,7 +200,6 @@ export class MessageModel extends Backbone.Model<MessageAttributes> {
       };
     }
 
-    perfEnd(`getPropsMessage-${this.id}`, 'getPropsMessage');
     return messageProps;
   }