1 files changed, 22 insertions, 12 deletions
diff --git a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
index eef41c79..54028a45 100644
--- a/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
+++ b/src/main/java/eu/siacs/conversations/xmpp/stanzas/AbstractStanza.java
@@ -1,6 +1,8 @@
 package eu.siacs.conversations.xmpp.stanzas;
 
 import eu.siacs.conversations.xml.Element;
+import eu.siacs.conversations.xmpp.jid.InvalidJidException;
+import eu.siacs.conversations.xmpp.jid.Jid;
 
 public class AbstractStanza extends Element {
 
@@ -8,27 +10,35 @@ public class AbstractStanza extends Element {
 		super(name);
 	}
 
-	public String getTo() {
-		return getAttribute("to");
-	}
-
-	public String getFrom() {
-		return getAttribute("from");
-	}
+	public Jid getTo() {
+        try {
+            return Jid.fromString(getAttribute("to"));
+        } catch (final InvalidJidException e) {
+            return null;
+        }
+    }
+
+	public Jid getFrom() {
+        try {
+            return Jid.fromString(getAttribute("from"));
+        } catch (final InvalidJidException e) {
+            return null;
+        }
+    }
 
 	public String getId() {
 		return this.getAttribute("id");
 	}
 
-	public void setTo(String to) {
-		setAttribute("to", to);
+	public void setTo(final Jid to) {
+		setAttribute("to", to.toString());
 	}
 
-	public void setFrom(String from) {
-		setAttribute("from", from);
+	public void setFrom(final Jid from) {
+		setAttribute("from", from.toString());
 	}
 
-	public void setId(String id) {
+	public void setId(final String id) {
 		setAttribute("id", id);
 	}
 }