diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 034ba3307..a16e38600 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -380,10 +380,15 @@ static void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state
         display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
         display->setColor(BLACK);
     }
-    display->drawStringf(0 + x, 0 + y, tempBuf, "From: %s", (node && node->has_user) ? node->user.short_name : "???");
+
     if(config.display.heading_bold) {
-        display->drawStringf(1 + x, 0 + y, tempBuf, "From: %s", (node && node->has_user) ? node->user.short_name : "???");
+        display->drawStringf(1 + x, 0 + y, tempBuf, "           From: %s", (node && node->has_user) ? node->user.short_name : "???");
     }
+    tm *tm = localtime(reinterpret_cast<const time_t *>(&mp.rx_time));
+    display->drawStringf(0 + x, 0 + y, tempBuf, "[%02d:%02d:%02d] From: %s",
+		    tm->tm_hour, tm->tm_min, tm->tm_sec,
+		    (node && node->has_user) ? node->user.short_name : "???");
+
     display->setColor(WHITE);
     snprintf(tempBuf, sizeof(tempBuf), "%s", mp.decoded.payload.bytes);
     display->drawStringMaxWidth(0 + x, 0 + y + FONT_HEIGHT_SMALL, x + display->getWidth(), tempBuf);