diff --git a/app/src/main/java/com/geeksville/mesh/ui/ContactsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/ContactsFragment.kt
index 320a3076e..d6f732b4f 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/ContactsFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/ContactsFragment.kt
@@ -213,6 +213,7 @@ class ContactsFragment : ScreenFragment("Messages"), Logging {
     private inner class ActionModeCallback : ActionMode.Callback {
         override fun onCreateActionMode(mode: ActionMode, menu: Menu): Boolean {
             mode.menuInflater.inflate(R.menu.menu_messages, menu)
+            menu.findItem(R.id.resendButton).isVisible = false
             mode.title = "1"
             return true
         }
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 5e490c6af..4847f0691 100644
--- a/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
+++ b/app/src/main/java/com/geeksville/mesh/ui/MessagesFragment.kt
@@ -357,6 +357,7 @@ class MessagesFragment : Fragment(), Logging {
                 }
                 R.id.resendButton -> {
                     debug("User clicked resendButton")
+                    val selectedList = messagesAdapter.selectedList
                     var resendText = ""
                     selectedList.forEach {
                         resendText = resendText + it.text + System.lineSeparator()