diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
index 82175a913..213573b22 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/actions/NewPostView.kt
@@ -271,8 +271,10 @@ fun NewPostView(onClose: () -> Unit, baseReplyTo: Note? = null, quote: Note? = n
                         }
 
                         if (postViewModel.canUsePoll) {
+                            val hashtag = stringResource(R.string.poll_hashtag)
                             AddPollButton(postViewModel.wantsPoll) {
                                 postViewModel.wantsPoll = !postViewModel.wantsPoll
+                                postViewModel.includePollHashtagInMessage(postViewModel.wantsPoll, hashtag)
                             }
                         }
 
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 5765faf05..1a98c4e97 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
@@ -195,4 +195,17 @@ open class NewPostViewModel : ViewModel() {
         return message.text.isNotBlank() && !isUploadingImage && !wantsInvoice &&
             (!wantsPoll || pollOptions.values.all { it.isNotEmpty() })
     }
+
+    fun includePollHashtagInMessage(include: Boolean, hashtag: String) {
+        if (include) {
+            updateMessage(TextFieldValue(message.text + " $hashtag"))
+        } else {
+            updateMessage(
+                TextFieldValue(
+                    message.text.replace(" $hashtag", "")
+                        .replace(hashtag, "")
+                )
+            )
+        }
+    }
 }
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 60375a15a..f1878907d 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -291,4 +291,5 @@
 
     <string name="lightning_create_and_add_invoice">Create and Add</string>
     <string name="poll_author_no_vote">Poll authors can\'t vote in their own polls.</string>
+    <string name="poll_hashtag" translatable="false">#zappoll</string>
 </resources>