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 8c5a03ae5..08fde7898 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
@@ -309,6 +309,8 @@ open class NewPostViewModel() : ViewModel() {
         draft: Note,
         accountViewModel: AccountViewModel,
     ) {
+        Log.d("draft", draft.event!!.toJson())
+
         draftTag = LocalCache.drafts.filter {
             it.value.contains(draft.idHex)
         }.keys.firstOrNull() ?: draftTag
@@ -363,6 +365,22 @@ open class NewPostViewModel() : ViewModel() {
             wantsForwardZapTo = true
         }
 
+        val polls = draft.event?.tags()?.filter { it.size > 1 && it[0] == "poll_option" } ?: emptyList()
+        wantsPoll = polls.isNotEmpty()
+
+        polls.forEach {
+            pollOptions[it[1].toInt()] = it[2]
+        }
+
+        val minMax = draft.event?.tags()?.filter { it.size > 1 && (it[0] == "value_minimum" || it[0] == "value_maximum") } ?: listOf()
+        minMax.forEach {
+            if (it[0] == "value_maximum") {
+                valueMaximum = it[1].toInt()
+            } else if (it[0] == "value_minimum") {
+                valueMinimum = it[1].toInt()
+            }
+        }
+
         message = TextFieldValue(draft.event?.content() ?: "")
         urlPreview = findUrlInMessage()
     }