diff --git a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
index c8f1fef4..6e8c193e 100644
--- a/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
+++ b/app/src/main/kotlin/com/tutpro/baresip/ChatActivity.kt
@@ -179,16 +179,6 @@ class ChatActivity : AppCompatActivity() {
         return true
     }
 
-    override fun onPause() {
-        if (newMessage.text.toString() != "") {
-            Log.d(TAG, "Saving newMessage ${newMessage.text} for $aor::$peerUri")
-            BaresipService.chatTexts["$aor::$peerUri"] = newMessage.text.toString()
-        }
-        MainActivity.activityAor = aor
-        LocalBroadcastManager.getInstance(this).unregisterReceiver(messageResponseReceiver)
-        super.onPause()
-    }
-
     override fun onResume() {
         super.onResume()
         val chatText = BaresipService.chatTexts["$aor::$peerUri"]
@@ -204,6 +194,20 @@ class ChatActivity : AppCompatActivity() {
         listView.adapter = mlAdapter
     }
 
+    override fun onPause() {
+        super.onPause()
+        if (newMessage.text.toString() != "") {
+            Log.d(TAG, "Saving newMessage ${newMessage.text} for $aor::$peerUri")
+            BaresipService.chatTexts["$aor::$peerUri"] = newMessage.text.toString()
+        }
+        MainActivity.activityAor = aor
+    }
+
+    override fun onDestroy() {
+        super.onDestroy()
+        LocalBroadcastManager.getInstance(this).unregisterReceiver(messageResponseReceiver)
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
 
         if ((BaresipService.activities.indexOf("chat,$aor,$peerUri,false") == -1) &&