diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index a8fecc6f740c0f83824c39abfb86d0b32c4819ed..c195fb13b41c0af2cb9ca24bf0c86987e07c4e7f 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -2034,9 +2034,12 @@ public class ConversationFragment extends XmppFragment implements EditMessage.Ke
         toggleInputMethod();
     }
 
-    public void reInit(Conversation conversation, Bundle extras) {
+    public void reInit(final Conversation conversation, final Bundle extras) {
         QuickLoader.set(conversation.getUuid());
-        this.saveMessageDraftStopAudioPlayer();
+        final boolean changedConversation = this.conversation != conversation;
+        if (changedConversation) {
+            this.saveMessageDraftStopAudioPlayer();
+        }
         this.clearPending();
         if (this.reInit(conversation, extras != null)) {
             if (extras != null) {
diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
index 261907d5bf8e665e64b509e9ef1cf39f45c1d1b5..451f4d1057b5cb23298f3966a3ddf492dfdc1af7 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationsActivity.java
@@ -266,8 +266,8 @@ public class ConversationsActivity extends XmppActivity implements OnConversatio
     }
 
     private boolean processViewIntent(Intent intent) {
-        String uuid = intent.getStringExtra(EXTRA_CONVERSATION);
-        Conversation conversation = uuid != null ? xmppConnectionService.findConversationByUuid(uuid) : null;
+        final String uuid = intent.getStringExtra(EXTRA_CONVERSATION);
+        final Conversation conversation = uuid != null ? xmppConnectionService.findConversationByUuid(uuid) : null;
         if (conversation == null) {
             Log.d(Config.LOGTAG, "unable to view conversation with uuid:" + uuid);
             return false;