2 files changed, 7 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
index 5f66c4200..0da5cf69c 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -2131,6 +2131,8 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         }
         updateChatState(this.conversation, msg);
         messageListAdapter.stopAudioPlayer();
+        mediaPreviewAdapter.clearPreviews();
+        toggleInputMethod();
     }
 
     public void reInit(Conversation conversation, Bundle extras) {
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java
index 3d9bce508..9192c6555 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/MediaPreviewAdapter.java
@@ -179,6 +179,11 @@ public class MediaPreviewAdapter extends RecyclerView.Adapter<MediaPreviewAdapte
         }
     }
 
+    public void clearPreviews() {
+        this.mediaPreviews.clear();
+    }
+
+
     class MediaPreviewViewHolder extends RecyclerView.ViewHolder {
 
         private final MediaPreviewBinding binding;