1 files changed, 4 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 29862861c..d6e3f49da 100644
--- a/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
+++ b/src/main/java/de/pixart/messenger/ui/ConversationFragment.java
@@ -889,6 +889,9 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
     @Override
     public void onStop() {
         super.onStop();
+        if (activity == null || !activity.isChangingConfigurations()) {
+            messageListAdapter.stopAudioPlayer();
+        }
         if (this.conversation != null) {
             final String msg = mEditMessage.getText().toString();
             this.conversation.setNextMessage(msg);
@@ -915,6 +918,7 @@ public class ConversationFragment extends Fragment implements EditMessage.Keyboa
             this.conversation.setNextMessage(msg);
             if (this.conversation != conversation) {
                 updateChatState(this.conversation, msg);
+                messageListAdapter.stopAudioPlayer();
             }
             this.conversation.trim();
         }