diff --git a/app/build.gradle b/app/build.gradle
index 47616d83..1ad481d4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -13,8 +13,8 @@ android {
     defaultConfig {
         minSdk 21
         targetSdk 33
-        versionCode 459
-        versionName "3.13.5"
+        versionCode 460
+        versionName "3.13.6"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
     flavorDimensions "default"
diff --git a/app/src/main/assets/release_notes/notes.json b/app/src/main/assets/release_notes/notes.json
index f0b81c4b..e8fc6545 100644
--- a/app/src/main/assets/release_notes/notes.json
+++ b/app/src/main/assets/release_notes/notes.json
@@ -1,4 +1,9 @@
 [
+  {
+    "version": "3.13.6",
+    "code": "460",
+    "note": "Fixed:\n- Cross-compose: Wrong instance emojis\n- Custom emojis not displayed in notifications\n- Fav/Boost markers with shared messages\n- Empty notifications\n- Fix cw removed when replying\n- Fix expand media with fit preview images when sensitive\n- Fix an issue with fetch more displayed too often (cache clear will help or wait new messages)"
+  },
   {
     "version": "3.13.5",
     "code": "459",
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 fbd59767..b09f4b08 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
@@ -68,7 +68,6 @@ import androidx.preference.PreferenceManager;
 import androidx.recyclerview.widget.RecyclerView;
 
 import com.bumptech.glide.Glide;
-import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.bumptech.glide.request.RequestOptions;
 import com.bumptech.glide.request.target.CustomTarget;
 import com.bumptech.glide.request.transition.Transition;
@@ -1023,19 +1022,18 @@ 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) {
-                        composeAttachmentItemBinding.editPreview.setVisibility(View.INVISIBLE);
+                    if (editMessageId != null && attachment.url != null) {
+                        composeAttachmentItemBinding.editPreview.setVisibility(View.GONE);
                         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"))) {
                             Glide.with(composeAttachmentItemBinding.preview.getContext())
                                     .load(attachmentPath)
-                                    .diskCacheStrategy(DiskCacheStrategy.NONE)
+                                    //.diskCacheStrategy(DiskCacheStrategy.NONE)
                                     .skipMemoryCache(true)
                                     .into(composeAttachmentItemBinding.preview);
                         } else if ((attachment.type != null && attachment.type.toLowerCase().startsWith("video")) || (attachment.mimeType != null && attachment.mimeType.toLowerCase().startsWith("video"))) {
diff --git a/src/fdroid/fastlane/metadata/android/en/changelogs/460.txt b/src/fdroid/fastlane/metadata/android/en/changelogs/460.txt
new file mode 100644
index 00000000..5aa91b71
--- /dev/null
+++ b/src/fdroid/fastlane/metadata/android/en/changelogs/460.txt
@@ -0,0 +1,8 @@
+Fixed:
+- Cross-compose: Wrong instance emojis
+- Custom emojis not displayed in notifications
+- Fav/Boost markers with shared messages
+- Empty notifications
+- Fix cw removed when replying
+- Fix expand media with fit preview images when sensitive
+- Fix an issue with fetch more displayed too often (cache clear will help or wait new messages)
\ No newline at end of file