diff --git a/stylesheets/_session.scss b/stylesheets/_session.scss
index b106a78a7..5b6c5f9af 100644
--- a/stylesheets/_session.scss
+++ b/stylesheets/_session.scss
@@ -313,11 +313,11 @@ textarea {
 
 .module-message--incoming {
   margin-inline-start: 0;
-  margin-inline-end: 10px;
+  margin-inline-end: auto;
 }
 .module-message--outgoing {
   margin-inline-end: 0;
-  margin-inline-start: 10px;
+  margin-inline-start: auto;
 }
 
 pre {
diff --git a/stylesheets/_session_theme.scss b/stylesheets/_session_theme.scss
index 1024ab8b0..33654766d 100644
--- a/stylesheets/_session_theme.scss
+++ b/stylesheets/_session_theme.scss
@@ -11,6 +11,7 @@
   display: inline-flex;
   flex-direction: row;
   align-items: center;
+  max-width: 75%;
 
   &__text-error {
     font-style: italic;