2 files changed, 15 insertions, 0 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
index 27d623117..15efb7921 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ConversationAdapter.java
@@ -59,6 +59,13 @@ public class ConversationAdapter extends RecyclerView.Adapter<ConversationAdapte
             viewHolder.binding.conversationName.setText(EmojiWrapper.transform(name));
         }
 
+        if (activity.xmppConnectionService.multipleAccounts() && activity.xmppConnectionService.showOwnAccounts()) {
+            viewHolder.binding.account.setVisibility(View.VISIBLE);
+            viewHolder.binding.account.setText(conversation.getAccount().getJid().asBareJid());
+        } else {
+            viewHolder.binding.account.setVisibility(View.GONE);
+        }
+
         if (conversation == ConversationFragment.getConversation(activity)) {
             viewHolder.binding.frame.setBackgroundColor(StyledAttributes.getColor(activity, R.attr.color_background_tertiary));
         } else {
diff --git a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
index 93a822ea3..250dcc1cd 100644
--- a/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
+++ b/src/main/java/de/pixart/messenger/ui/adapter/ListItemAdapter.java
@@ -89,6 +89,12 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
         } else {
             viewHolder.jid.setVisibility(View.GONE);
         }
+        if (activity.xmppConnectionService.multipleAccounts() && activity.xmppConnectionService.showOwnAccounts()) {
+            viewHolder.account.setVisibility(View.VISIBLE);
+            viewHolder.account.setText(item.getAccount().getJid().asBareJid());
+        } else {
+            viewHolder.account.setVisibility(View.GONE);
+        }
         viewHolder.name.setText(EmojiWrapper.transform(item.getDisplayName()));
         if (tags.size() != 0) {
             for (ListItem.Tag tag : tags) {
@@ -128,6 +134,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
     private static class ViewHolder {
         private TextView name;
         private TextView jid;
+        private TextView account;
         private ImageView avatar;
         private FlowLayout tags;
 
@@ -138,6 +145,7 @@ public class ListItemAdapter extends ArrayAdapter<ListItem> {
             ViewHolder viewHolder = new ViewHolder();
             viewHolder.name = binding.contactDisplayName;
             viewHolder.jid = binding.contactJid;
+            viewHolder.account = binding.account;
             viewHolder.avatar = binding.contactPhoto;
             viewHolder.tags = binding.tags;
             binding.getRoot().setTag(viewHolder);