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 c4edd6194..21f479931 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
@@ -251,4 +251,8 @@ open class NewPostViewModel : ViewModel() {
         return message.text.isNotBlank() && !isUploadingImage &&
             (!wantsPoll || pollOptions.values.all { it.isNotEmpty() })
     }
+
+    fun canUsePoll(): Boolean {
+        return originalNote?.event !is PrivateDmEvent && originalNote?.channel() == null
+    }
 }
diff --git a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
index 1301bc917..6c5f6a633 100644
--- a/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
+++ b/app/src/main/java/com/vitorpamplona/amethyst/ui/note/ChatroomMessageCompose.kt
@@ -286,7 +286,7 @@ fun ChatroomMessageCompose(
                                         TranslatableRichTextViewer(
                                             eventContent,
                                             canPreview,
-                                            Modifier,
+                                            Modifier.padding(top = 5.dp),
                                             note.event?.tags(),
                                             backgroundBubbleColor,
                                             accountViewModel,
@@ -296,7 +296,7 @@ fun ChatroomMessageCompose(
                                         TranslatableRichTextViewer(
                                             stringResource(R.string.could_not_decrypt_the_message),
                                             true,
-                                            Modifier,
+                                            Modifier.padding(top = 5.dp),
                                             note.event?.tags(),
                                             backgroundBubbleColor,
                                             accountViewModel,