1 files changed, 2 insertions, 7 deletions
diff --git a/src/main/java/eu/siacs/conversations/entities/Message.java b/src/main/java/eu/siacs/conversations/entities/Message.java
index ce21addc..53df1ddf 100644
--- a/src/main/java/eu/siacs/conversations/entities/Message.java
+++ b/src/main/java/eu/siacs/conversations/entities/Message.java
@@ -248,13 +248,8 @@ public class Message extends AbstractEntity {
 		this.trueCounterpart = trueCounterpart;
 	}
 
-	public String getPresence() {
-		if (!counterpart.getResourcepart().isEmpty()) {
-			return counterpart.getResourcepart();
-		} else {
-            // TODO: Return empty string or null?
-			return null;
-		}
+	public Jid getPresence() {
+		return counterpart;
 	}
 
 	public void setDownloadable(Downloadable downloadable) {