diff --git a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
index 533086621..2293c66c2 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
@@ -233,6 +233,12 @@ class MessagesFragment : Fragment(), Logging {
         return binding.root
     }
 
+    override fun onSaveInstanceState(outState: Bundle) {
+        super.onSaveInstanceState(outState)
+        outState.putString("contactKey", contactKey)
+        outState.putString("contactName", contactName)
+    }
+
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
@@ -243,6 +249,11 @@ class MessagesFragment : Fragment(), Logging {
             model.setContactKey(contactKey)
             binding.messageTitle.text = contactName
         }
+        if (savedInstanceState != null) {
+            contactKey = savedInstanceState.getString("contactKey").toString()
+            contactName = savedInstanceState.getString("contactName").toString()
+            binding.messageTitle.text = contactName
+        }
 
         binding.sendButton.setOnClickListener {
             debug("User clicked sendButton")