diff --git a/src/graphics/draw/MessageRenderer.cpp b/src/graphics/draw/MessageRenderer.cpp
index 36516d670..86bd2cce0 100644
--- a/src/graphics/draw/MessageRenderer.cpp
+++ b/src/graphics/draw/MessageRenderer.cpp
@@ -698,7 +698,10 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 
         // Shrink Sender name if needed
         int availWidth = SCREEN_WIDTH - display->getStringWidth(timeBuf) - display->getStringWidth(chanType) -
-                         display->getStringWidth(" @...") - 10;
+                         display->getStringWidth(" @...") - 12;
+        if (currentMode == ThreadMode::ALL) {
+            availWidth -= 6;
+        }
         if (availWidth < 0)
             availWidth = 0;