diff --git a/js/background.js b/js/background.js
index ca8d8d190..092edf848 100644
--- a/js/background.js
+++ b/js/background.js
@@ -351,7 +351,6 @@
         // turning ON "call permissions" forces turning on "audio/video permissions"
         window.setMediaPermissions(true);
       }
-      console.warn('toggling toggleCallMediaPermissionsTo to ', enabled);
       window.setCallMediaPermissions(enabled);
     };
 
diff --git a/main.js b/main.js
index 7dd77022f..74fad5c04 100644
--- a/main.js
+++ b/main.js
@@ -949,14 +949,11 @@ ipc.on('close-debug-log', () => {
 
 // This should be called with an ipc sendSync
 ipc.on('get-media-permissions', event => {
-  console.warn('get-media-permissions', userConfig.get('mediaPermissions'));
-
   // eslint-disable-next-line no-param-reassign
   event.returnValue = userConfig.get('mediaPermissions') || false;
 });
 ipc.on('set-media-permissions', (event, value) => {
   userConfig.set('mediaPermissions', value);
-  console.warn('set-media-permissions', value);
 
   // We reinstall permissions handler to ensure that a revoked permission takes effect
   installPermissionsHandler({ session, userConfig });
@@ -966,13 +963,11 @@ ipc.on('set-media-permissions', (event, value) => {
 
 // This should be called with an ipc sendSync
 ipc.on('get-call-media-permissions', event => {
-  console.warn('get-call-media-permissions', userConfig.get('callMediaPermissions'));
   // eslint-disable-next-line no-param-reassign
   event.returnValue = userConfig.get('callMediaPermissions') || false;
 });
 ipc.on('set-call-media-permissions', (event, value) => {
   userConfig.set('callMediaPermissions', value);
-  console.warn('set-call-media-permissions', value);
 
   // We reinstall permissions handler to ensure that a revoked permission takes effect
   installPermissionsHandler({ session, userConfig });
diff --git a/preload.js b/preload.js
index e528d678c..1fa7cf90c 100644
--- a/preload.js
+++ b/preload.js
@@ -84,10 +84,6 @@ window.setZoomFactor = number => {
   webFrame.setZoomFactor(number);
 };
 
-window.getZoomFactor = () => {
-  webFrame.getZoomFactor();
-};
-
 // Set the password for the database
 window.setPassword = (passPhrase, oldPhrase) =>
   new Promise((resolve, reject) => {
@@ -179,12 +175,6 @@ window.setSettingValue = (settingID, value) => {
   }
 
   window.storage.put(settingID, value);
-
-  // FIXME - This should be called in the settings object in
-  // SessionSettings
-  if (settingID === 'zoom-factor-setting') {
-    window.updateZoomFactor();
-  }
 };
 
 window.getMediaPermissions = () => ipc.sendSync('get-media-permissions');
diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss
index 33654766d..47fda61fb 100644
--- a/stylesheets/_session_theme.scss
+++ b/stylesheets/_session_theme.scss
@@ -11,7 +11,7 @@
   display: inline-flex;
   flex-direction: row;
   align-items: center;
-  max-width: 75%;
+  max-width: 65%;
 
   &__text-error {
     font-style: italic;
@@ -119,10 +119,6 @@
       }
     }
   }
-
-  &-outgoing {
-    margin-inline-start: auto;
-  }
 }
 
 .inbox {
diff --git a/ts/components/conversation/message/MessageContentWithStatus.tsx b/ts/components/conversation/message/MessageContentWithStatus.tsx
index f2351d1c9..4a15127f4 100644
--- a/ts/components/conversation/message/MessageContentWithStatus.tsx
+++ b/ts/components/conversation/message/MessageContentWithStatus.tsx
@@ -16,7 +16,7 @@ import { MessageStatus } from './MessageStatus';
 export type MessageContentWithStatusSelectorProps = Pick<
   MessageRenderingProps,
   'direction' | 'isDeleted'
->;
+> & { hasAttachments: boolean };
 
 type Props = {
   messageId: string;
@@ -63,7 +63,7 @@ export const MessageContentWithStatuses = (props: Props) => {
   if (!contentProps) {
     return null;
   }
-  const { direction, isDeleted } = contentProps;
+  const { direction, isDeleted, hasAttachments } = contentProps;
   const isIncoming = direction === 'incoming';
 
   return (
@@ -71,6 +71,7 @@ export const MessageContentWithStatuses = (props: Props) => {
       className={classNames('module-message', `module-message--${direction}`)}
       role="button"
       onClick={onClickOnMessageOuterContainer}
+      style={{ width: hasAttachments ? 'min-content' : 'auto' }}
     >
       <MessageStatus messageId={messageId} isCorrectSide={isIncoming} />
       <div>