Collapse search view and finish action mode when drawer was opened

app/ui/legacy/src/main/java/com/fsck/k9/activity/MessageList.kt

@@ -616,7 +616,10 @@ open class MessageList :
 
             override fun onDrawerStateChanged(newState: Int) = Unit
 
-            override fun onDrawerOpened(drawerView: View) = Unit
+            override fun onDrawerOpened(drawerView: View) {
+                collapseSearchView()
+                messageListFragment?.finishActionMode()
+            }
 
             override fun onDrawerSlide(drawerView: View, slideOffset: Float) = Unit
         }
@@ -912,7 +915,6 @@ open class MessageList :
                     if (drawer!!.isOpen) {
                         drawer!!.close()
                     } else {
-                        collapseSearchView()
                         drawer!!.open()
                     }
                 } else {

app/ui/legacy/src/main/java/com/fsck/k9/fragment/MessageListFragment.kt

@@ -1319,6 +1319,10 @@ class MessageListFragment :
         actionMode?.invalidate()
     }
 
+    fun finishActionMode() {
+        actionMode?.finish()
+    }
+
     fun remoteSearchFinished() {
         remoteSearchFuture = null
     }