diff --git a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt
index 08f8001f48..3bfaa538f9 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/service/NostrSingleEventDataSource.kt
@@ -134,7 +134,7 @@ object NostrSingleEventDataSource : NostrDataSource("SingleEventFeed") {
                                 LnZapEvent.KIND,
                                 PollNoteEvent.KIND,
                             ),
-                        tags = mapOf("e" to it.map { it.idHex }),
+                        tags = mapOf("e" to it.map { it.idHex }, "q" to it.map { it.idHex }),
                         since = findMinimumEOSEs(it),
                         // Max amount of "replies" to download on a specific event.
                         limit = 1000,
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/TextNoteEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/TextNoteEvent.kt
index 083fc4523a..bd0efc5045 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/TextNoteEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/TextNoteEvent.kt
@@ -79,6 +79,11 @@ class TextNoteEvent(
                     tags.add(arrayOf("p", it))
                 }
             }
+            replyTos?.forEach {
+                if (it in directMentions) {
+                    tags.add(arrayOf("q", it))
+                }
+            }
             addresses
                 ?.map { it.toTag() }
                 ?.let {