diff --git a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
index 53d38dcaa..3953baa82 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/model/LocalCache.kt
@@ -747,7 +747,9 @@ object LocalCache {
 
         if (version.event == null) {
             version.loadEvent(event, author, emptyList())
-
+            if (version.liveSet != null) {
+                updateListCache()
+            }
             version.liveSet?.innerOts?.invalidateData()
         }
 
@@ -1406,8 +1408,8 @@ object LocalCache {
         event.editedNote()?.let {
             checkGetOrCreateNote(it)?.let { editedNote ->
                 modificationCache.remove(editedNote.idHex)
-                // if it is a new post from the user, must update list of Notes to quickly update the user.
-                if (relay == null) {
+                // must update list of Notes to quickly update the user.
+                if (editedNote.liveSet != null) {
                     updateListCache()
                 }
                 editedNote.liveSet?.innerModifications?.invalidateData()
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt
index a92a0d4a5..33d86af79 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/dal/NotificationFeedFilter.kt
@@ -99,8 +99,10 @@ class NotificationFeedFilter(val account: Account) : AdditiveFeedFilter<Note>()
 
             val isAuthoredPostCited = event.findCitations().any { LocalCache.getNoteIfExists(it)?.author?.pubkeyHex == authorHex }
             val isAuthorDirectlyCited = event.citedUsers().contains(authorHex)
+            val isAuthorOfAFork =
+                event.isForkFromAddressWithPubkey(authorHex) || (event.forkFromVersion()?.let { LocalCache.getNoteIfExists(it)?.author?.pubkeyHex == authorHex } == true)
 
-            return isAuthoredPostCited || isAuthorDirectlyCited
+            return isAuthoredPostCited || isAuthorDirectlyCited || isAuthorOfAFork
         }
 
         if (event is ReactionEvent) {
diff --git a/quartz/src/main/java/com/vitorpamplona/quartz/events/BaseTextNoteEvent.kt b/quartz/src/main/java/com/vitorpamplona/quartz/events/BaseTextNoteEvent.kt
index a6d202298..aa65eb642 100644
--- a/quartz/src/main/java/com/vitorpamplona/quartz/events/BaseTextNoteEvent.kt
+++ b/quartz/src/main/java/com/vitorpamplona/quartz/events/BaseTextNoteEvent.kt
@@ -55,6 +55,8 @@ open class BaseTextNoteEvent(
 
     fun forkFromVersion() = tags.firstOrNull { it.size > 3 && it[0] == "e" && it[3] == "fork" }?.get(1)
 
+    fun isForkFromAddressWithPubkey(authorHex: HexKey) = tags.any { it.size > 3 && it[0] == "a" && it[3] == "fork" && it[1].contains(authorHex) }
+
     open fun replyTos(): List<HexKey> {
         val oldStylePositional = tags.filter { it.size > 1 && it.size <= 3 && it[0] == "e" }.map { it[1] }
         val newStyleReply = tags.lastOrNull { it.size > 3 && it[0] == "e" && it[3] == "reply" }?.get(1)