diff --git a/src/routes/status.nim b/src/routes/status.nim
index b780132..dc109c3 100644
--- a/src/routes/status.nim
+++ b/src/routes/status.nim
@@ -81,8 +81,12 @@ proc createStatusRouter*(cfg: Config) =
         let 
           quote = tweet.quote.get()
           quoteUser = quote.user
-        context = &"↘ Quoting: {quoteUser.fullname} (@{quoteUser.username})"
-        contextUrl = &"{getUrlPrefix(cfg)}/i/status/{quote.id}"
+        if tweet.replyId != 0:
+          context = &"↩ Replying to: @{tweet.replyHandle}\n↘ Quoting: {quoteUser.fullname} (@{quoteUser.username})"
+          contextUrl = &"{getUrlPrefix(cfg)}/i/status/{tweet.replyId}"
+        else:
+          context = &"↘ Quoting: {quoteUser.fullname} (@{quoteUser.username})"
+          contextUrl = &"{getUrlPrefix(cfg)}/i/status/{quote.id}"
       elif tweet.replyId != 0:
         context = &"↩ Replying to: @{tweet.replyHandle}"
         contextUrl = &"{getUrlPrefix(cfg)}/i/status/{tweet.replyId}"