diff --git a/src/eu/siacs/conversations/entities/Contact.java b/src/eu/siacs/conversations/entities/Contact.java
index ab05b9d10..5892563d5 100644
--- a/src/eu/siacs/conversations/entities/Contact.java
+++ b/src/eu/siacs/conversations/entities/Contact.java
@@ -32,6 +32,7 @@ public class Contact implements ListItem {
 	protected String accountUuid;
 	protected String systemName;
 	protected String serverName;
+	protected String presenceName;
 	protected String jid;
 	protected int subscription = 0;
 	protected String systemAccount;
@@ -76,6 +77,8 @@ public class Contact implements ListItem {
 			return this.systemName;
 		} else if (this.serverName != null) {
 			return this.serverName;
+		} else if (this.presenceName != null) {
+			return this.presenceName;
 		} else {
 			return this.jid.split("@")[0];
 		}
@@ -175,6 +178,10 @@ public class Contact implements ListItem {
 		this.systemName = systemName;
 	}
 
+	public void setPresenceName(String presenceName) {
+		this.presenceName = presenceName;
+	}
+
 	public String getSystemAccount() {
 		return systemAccount;
 	}
diff --git a/src/eu/siacs/conversations/parser/PresenceParser.java b/src/eu/siacs/conversations/parser/PresenceParser.java
index 5e5501dda..9188924fe 100644
--- a/src/eu/siacs/conversations/parser/PresenceParser.java
+++ b/src/eu/siacs/conversations/parser/PresenceParser.java
@@ -109,7 +109,7 @@ public class PresenceParser extends AbstractParser implements
 			}
 			Element nick = packet.findChild("nick", "http://jabber.org/protocol/nick");
 			if (nick != null) {
-				contact.setSystemName(nick.getContent());
+				contact.setPresenceName(nick.getContent());
 			}
 		}
 		mXmppConnectionService.updateRosterUi();