diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
index 9dcac91269..98556a90db 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/NoteCompose.kt
@@ -164,7 +164,7 @@ fun NoteCompose(baseNote: Note, modifier: Modifier = Modifier, isInnerNote: Bool
                         note.replyTo?.mapIndexed { index, note ->
                             NoteCompose(
                                 note,
-                                modifier = Modifier.padding(top = 5.dp),
+                                modifier = Modifier,
                                 isInnerNote = true,
                                 accountViewModel = accountViewModel,
                                 navController = navController
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
index 2fffa3cd4b..2b71ef7972 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/screen/FeedViewModel.kt
@@ -56,7 +56,7 @@ class NostrHomeFeedViewModel: FeedViewModel(NostrHomeDataSource) {
     override fun newListFromDataSource(): List<Note> {
         // Filter: no replies
         return dataSource.feed().filter {
-            it.replyTo == null || it.replyTo?.size == 0
+            it.event is RepostEvent || it.replyTo == null || it.replyTo?.size == 0
         }.take(100)
     }
 }