fixed muc sender history for some cases (where the previous nick was a valid jid)

1 files changed, 5 insertions, 4 deletions

diff --git a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
index cb7988cb..5d133e87 100644
--- a/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
+++ b/src/main/java/eu/siacs/conversations/ui/ConversationFragment.java
@@ -280,10 +280,11 @@ public class ConversationFragment extends Fragment {
 						if (message.getStatus() <= Message.STATUS_RECEIVED) {
 							if (message.getConversation().getMode() == Conversation.MODE_MULTI) {
 								if (message.getCounterpart() != null) {
-									highlightInConference(message.getCounterpart().getResourcepart());
-								} else {
-									highlightInConference(message
-											.getContact().getDisplayName());
+									if (!message.getCounterpart().getResourcepart().isEmpty()) {
+										highlightInConference(message.getCounterpart().getResourcepart());
+									} else {
+										highlightInConference(message.getCounterpart().toString());
+									}
 								}
 							} else {
 								Contact contact = message.getConversation()