diff --git a/pkg/interface/chat/src/css/custom.css b/pkg/interface/chat/src/css/custom.css
index 2f29bd562..135551016 100644
--- a/pkg/interface/chat/src/css/custom.css
+++ b/pkg/interface/chat/src/css/custom.css
@@ -124,7 +124,7 @@ h2 {
 }
 
 .clamp-message {
-  max-width: calc(100% - 32px - .5em);
+  max-width: calc(100% - 36px - 1.5rem);
 }
 
 .clamp-attachment {
diff --git a/pkg/interface/chat/src/js/components/lib/message.js b/pkg/interface/chat/src/js/components/lib/message.js
index db07e6e47..77f7d4a20 100644
--- a/pkg/interface/chat/src/js/components/lib/message.js
+++ b/pkg/interface/chat/src/js/components/lib/message.js
@@ -178,7 +178,7 @@ export class Message extends Component {
           <div className="fl mr2">
             <Sigil ship={props.msg.aut} size={36} />
           </div>
-          <div className="fr" style={{ flexGrow: 1, marginTop: -8 }}>
+          <div className="fr clamp-message" style={{ flexGrow: 1, marginTop: -8 }}>
             <div className="hide-child">
               <p className="v-top label-small-mono gray dib mr3">
                 {this.renderAuthor()}
@@ -201,7 +201,7 @@ export class Message extends Component {
                minHeight: 'min-content'
              }}>
           <p className="child pl3 pr2 label-small-mono gray dib">{timestamp}</p>
-          <div className="fr" style={{ flexGrow: 1 }}>
+          <div className="fr clamp-message" style={{ flexGrow: 1 }}>
             {this.renderContent()}
           </div>
         </div>