diff --git a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
index 17253cff98806cfc0f2b51ad442f428f8f02d290..5975f0f8279004bf074f699c59de50919d02bb72 100644
--- a/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
+++ b/src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
@@ -149,7 +149,11 @@ public class MessageAdapter extends ArrayAdapter<Message> {
 					info = contact.getDisplayName();
 				} else {
 					if (message.getPresence() != null) {
-						info = message.getPresence().getResourcepart();
+                        if (message.getPresence().isBareJid()) {
+                            info = message.getPresence().toString();
+                        } else {
+                            info = message.getPresence().getResourcepart();
+                        }
 					} else {
 						info = message.getCounterpart().toString();
 					}