@@ -160,11 +160,11 @@
 	if (from_ != nil)
 		[self addAttributeWithName: @"from"
 			       stringValue: from_.fullJID];
 }
 
-- (OFString*)from
+- (XMPPJID*)from
 {
 	return [[from copy] autorelease];
 }
 
 - (void)setTo: (XMPPJID*)to_
@@ -178,11 +178,11 @@
 	if (to_ != nil)
 		[self addAttributeWithName: @"to"
 			       stringValue: to_.fullJID];
 }
 
-- (OFString*)to
+- (XMPPJID*)to
 {
 	return [[to copy] autorelease];
 }
 
 - (void)setType: (OFString*)type_