diff --git a/src/eu/siacs/conversations/entities/Message.java b/src/eu/siacs/conversations/entities/Message.java
index f36ffa9012c2b900070bbf22259631138c51d25c..2b76773b884b71c164841b63e4a9a3531a0c49f9 100644
--- a/src/eu/siacs/conversations/entities/Message.java
+++ b/src/eu/siacs/conversations/entities/Message.java
@@ -244,7 +244,7 @@ public class Message extends AbstractEntity {
 	}
 
 	public void setPresence(String presence) {
-		if (presence == null || presence.isEmpty()) {
+		if (presence == null) {
 			this.counterpart = this.counterpart.split("/")[0];
 		} else {
 			this.counterpart = this.counterpart.split("/")[0] + "/" + presence;
@@ -260,7 +260,11 @@ public class Message extends AbstractEntity {
 		if (counterparts.length == 2) {
 			return counterparts[1];
 		} else {
-			return null;
+			if (this.counterpart.contains("/")) {
+				return "";
+			} else {
+				return null;
+			}
 		}
 	}