diff --git a/src/routes/status.nim b/src/routes/status.nim
index 47b7871..aacd15f 100644
--- a/src/routes/status.nim
+++ b/src/routes/status.nim
@@ -110,13 +110,15 @@ proc createStatusRouter*(cfg: Config) =
           quote = get(tweet.quote)
           quoteUser = quote.user
         if tweet.replyId != 0:
-          context = &"↩ Replying to: @{tweet.replyHandle}\n↘ Quoting: {quoteUser.fullname} (@{quoteUser.username})"
+          let replyUser = await getGraphUser(tweet.replyHandle)
+          context = &"↩ {replyUser.fullname} (@{tweet.replyHandle})\n↘ {quoteUser.fullname} (@{quoteUser.username})"
           contextUrl = &"{getUrlPrefix(cfg)}/i/status/{tweet.replyId}"
         else:
-          context = &"↘ Quoting: {quoteUser.fullname} (@{quoteUser.username})"
+          context = &"↘ {quoteUser.fullname} (@{quoteUser.username})"
           contextUrl = &"{getUrlPrefix(cfg)}/i/status/{quote.id}"
       elif tweet.replyId != 0:
-        context = &"↩ Replying to: @{tweet.replyHandle}"
+        let replyUser = await getGraphUser(tweet.replyHandle)
+        context = &"↩ {replyUser.fullname} (@{tweet.replyHandle})"
         contextUrl = &"{getUrlPrefix(cfg)}/i/status/{tweet.replyId}"
 
       if tweet.video.isSome():