diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt b/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt
index 2ab7338be6..7606300522 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/PollComponent.kt
@@ -244,7 +244,7 @@ private fun PollOption(
     }
 
     Column {
-      Row(verticalAlignment = Alignment.Bottom) {
+      Row(verticalAlignment = Alignment.CenterVertically) {
         Text(
           text = option.text,
           style = MaterialTheme.typography.bodyLarge.copy(fontSize = fontSize.sp),
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
index d0b61d4cae..16d821c2eb 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/MessageTable.kt
@@ -2228,6 +2228,7 @@ open class MessageTable(context: Context?, databaseHelper: SignalDatabase) : Dat
       reactions.deleteReactions(MessageId(messageId))
       deleteGroupStoryReplies(messageId)
       disassociateStoryQuotes(messageId)
+      polls.deletePoll(messageId)
       disassociatePollFromPollTerminate(polls.getPollTerminateMessageId(messageId))
 
       val threadId = getThreadIdForMessage(messageId)
diff --git a/app/src/main/java/org/thoughtcrime/securesms/database/PollTables.kt b/app/src/main/java/org/thoughtcrime/securesms/database/PollTables.kt
index e3e82703a7..e261c294f8 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/database/PollTables.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/database/PollTables.kt
@@ -700,6 +700,13 @@ class PollTables(context: Context?, databaseHelper: SignalDatabase?) : DatabaseT
       .readToSingleBoolean()
   }
 
+  fun deletePoll(messageId: Long) {
+    writableDatabase
+      .delete(PollTable.TABLE_NAME)
+      .where("${PollTable.MESSAGE_ID} = ?", messageId)
+      .run()
+  }
+
   private fun isPending(pollId: Long, optionId: Long, voterId: Long): Boolean {
     return readableDatabase
       .exists(PollVoteTable.TABLE_NAME)
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index e54c3037d9..ef81ad99f5 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -8845,7 +8845,7 @@
 
     <!-- Polls -->
     <!-- Caption in poll message to select an option  -->
-    <string name="Poll__select_one">Poll · Select One</string>
+    <string name="Poll__select_one">Poll · Select one</string>
     <!-- Caption in poll message to select one or more options  -->
     <string name="Poll__select_multiple">Poll · Select one or more</string>
     <!-- Caption in poll message once a poll has ended  -->