Merge pull request #7004 from gitstart/K9-OSS-18

Message view: Account chip not displayed when viewing messages in a thread (from Unified Inbox)

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

@@ -1100,6 +1100,7 @@ open class MessageList :
         showMessageViewPlaceHolder()
 
         val tmpSearch = LocalSearch().apply {
+            setId(search?.id)
             addAccountUuid(account.uuid)
             and(SearchField.THREAD_ID, threadRootId.toString(), SearchSpecification.Attribute.EQUALS)
         }

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

@@ -157,7 +157,7 @@ class MessageListFragment :
         }
 
     val isShowAccountChip: Boolean
-        get() = !isSingleAccountMode
+        get() = isUnifiedInbox || !isSingleAccountMode
 
     override fun onAttach(context: Context) {
         super.onAttach(context)