diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
index 944f01097..1c7284708 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostViewModel.kt
@@ -199,11 +199,6 @@ open class NewPostViewModel() : ViewModel() {
                 pTags = null
             }
 
-        quote?.let {
-            message = TextFieldValue(message.text + "\nnostr:${it.toNEvent()}")
-            urlPreview = findUrlInMessage()
-        }
-
         canAddInvoice = accountViewModel.userProfile().info?.lnAddress() != null
         canAddZapRaiser = accountViewModel.userProfile().info?.lnAddress() != null
         canUsePoll = originalNote?.event !is PrivateDmEvent && originalNote?.channelHex() == null
@@ -217,6 +212,25 @@ open class NewPostViewModel() : ViewModel() {
         forwardZapTo = Split()
         forwardZapToEditting = TextFieldValue("")
 
+        quote?.let {
+            message = TextFieldValue(message.text + "\nnostr:${it.toNEvent()}")
+            urlPreview = findUrlInMessage()
+
+            it.author?.let { quotedUser ->
+                if (quotedUser.pubkeyHex != accountViewModel.userProfile().pubkeyHex) {
+                    if (forwardZapTo.items.none { it.key.pubkeyHex == quotedUser.pubkeyHex }) {
+                        forwardZapTo.addItem(quotedUser)
+                    }
+                    if (forwardZapTo.items.none { it.key.pubkeyHex == accountViewModel.userProfile().pubkeyHex }) {
+                        forwardZapTo.addItem(accountViewModel.userProfile())
+                    }
+
+                    val pos = forwardZapTo.items.indexOfFirst { it.key.pubkeyHex == quotedUser.pubkeyHex }
+                    forwardZapTo.updatePercentage(pos, 0.9f)
+                }
+            }
+        }
+
         fork?.let {
             message = TextFieldValue(it.event?.content() ?: "")
             urlPreview = findUrlInMessage()
@@ -239,6 +253,19 @@ open class NewPostViewModel() : ViewModel() {
                 }
             }
 
+            // Only adds if it is not already set up.
+            if (forwardZapTo.items.isEmpty()) {
+                it.author?.let { forkedAuthor ->
+                    if (forkedAuthor.pubkeyHex != accountViewModel.userProfile().pubkeyHex) {
+                        if (forwardZapTo.items.none { it.key.pubkeyHex == forkedAuthor.pubkeyHex }) forwardZapTo.addItem(forkedAuthor)
+                        if (forwardZapTo.items.none { it.key.pubkeyHex == accountViewModel.userProfile().pubkeyHex }) forwardZapTo.addItem(accountViewModel.userProfile())
+
+                        val pos = forwardZapTo.items.indexOfFirst { it.key.pubkeyHex == forkedAuthor.pubkeyHex }
+                        forwardZapTo.updatePercentage(pos, 0.8f)
+                    }
+                }
+            }
+
             it.author?.let {
                 if (this.pTags?.contains(it) != true) {
                     this.pTags = listOf(it) + (this.pTags ?: emptyList())
@@ -247,6 +274,10 @@ open class NewPostViewModel() : ViewModel() {
 
             forkedFromNote = it
         }
+
+        if (!forwardZapTo.items.isEmpty()) {
+            wantsForwardZapTo = true
+        }
     }
 
     fun sendPost(relayList: List<Relay>? = null) {