diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
index dcfc31473..6e8f290d2 100644
--- a/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
+++ b/app/src/main/java/app/fedilab/android/ui/drawer/ComposeAdapter.java
@@ -1023,13 +1023,13 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 for (Attachment attachment : attachmentList) {
                     ComposeAttachmentItemBinding composeAttachmentItemBinding = ComposeAttachmentItemBinding.inflate(LayoutInflater.from(context), holder.binding.attachmentsList, false);
                     composeAttachmentItemBinding.buttonPlay.setVisibility(View.GONE);
-                    if (editMessageId != null) {
+                   /* if (editMessageId != null) {
                         composeAttachmentItemBinding.editPreview.setVisibility(View.INVISIBLE);
                         composeAttachmentItemBinding.buttonDescription.setVisibility(View.INVISIBLE);
                         composeAttachmentItemBinding.buttonOrderDown.setVisibility(View.INVISIBLE);
                         composeAttachmentItemBinding.buttonOrderUp.setVisibility(View.INVISIBLE);
                         composeAttachmentItemBinding.buttonRemove.setVisibility(View.INVISIBLE);
-                    }
+                    }*/
                     String attachmentPath = attachment.local_path != null && !attachment.local_path.trim().isEmpty() ? attachment.local_path : attachment.preview_url;
                     if (attachment.type != null || attachment.mimeType != null) {
                         if ((attachment.type != null && attachment.type.toLowerCase().startsWith("image")) || (attachment.mimeType != null && attachment.mimeType.toLowerCase().startsWith("image"))) {
@@ -1440,7 +1440,8 @@ public class ComposeAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder
                 statusDraft.visibility = MastodonHelper.visibility.PUBLIC.name();
                 unlisted_changed = true;
             });
-            if (statusDraft.spoilerChecked) {
+
+            if (statusDraft.spoilerChecked || statusDraft.spoiler_text != null && statusDraft.spoiler_text.trim().length() > 0) {
                 holder.binding.contentSpoiler.setVisibility(View.VISIBLE);
             } else {
                 holder.binding.contentSpoiler.setVisibility(View.GONE);
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/458.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/458.txt
new file mode 100644
index 000000000..e00871da3
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/458.txt
@@ -0,0 +1,8 @@
+Added:
+- Add Bubble timeline support in extra-features
+
+Changed:
+
+
+Fixed:
+- Spoiler text when editing
\ No newline at end of file