diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt
index 43e18f52a9..db1de4345e 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/MessageContentProcessor.kt
@@ -279,6 +279,11 @@ open class MessageContentProcessor(private val context: Context) {
             Log.w(TAG, "Ignoring message from ${senderRecipient.id} because it has disallowed content, and they're not an admin in an announcement-only group.")
             return Gv2PreProcessResult.IGNORE
           }
+        } else if (content.editMessage?.dataMessage != null) {
+          if (content.editMessage!!.dataMessage!!.hasDisallowedAnnouncementOnlyContent) {
+            Log.w(TAG, "Ignoring edit message from ${senderRecipient.id} because it has disallowed content, and they're not an admin in an announcement-only group.")
+            return Gv2PreProcessResult.IGNORE
+          }
         } else if (content.typingMessage != null) {
           Log.w(TAG, "Ignoring typing indicator from ${senderRecipient.id} because they're not an admin in an announcement-only group.")
           return Gv2PreProcessResult.IGNORE
diff --git a/app/src/main/java/org/thoughtcrime/securesms/messages/SignalServiceProtoUtil.kt b/app/src/main/java/org/thoughtcrime/securesms/messages/SignalServiceProtoUtil.kt
index 8ba59d11d4..d8e29879f5 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/messages/SignalServiceProtoUtil.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/messages/SignalServiceProtoUtil.kt
@@ -67,7 +67,8 @@ object SignalServiceProtoUtil {
         quote != null ||
         preview.isNotEmpty() ||
         bodyRanges.isNotEmpty() ||
-        sticker != null
+        sticker != null ||
+        pollCreate != null
     }
 
   val DataMessage.isExpirationUpdate: Boolean