Index: src/XMPPStanza.m
==================================================================
--- src/XMPPStanza.m
+++ src/XMPPStanza.m
@@ -158,11 +158,11 @@
 {
 	OFString* old = from;
 	from = [from_ copy];
 	[old release];
 
-	/* FIXME: Remove old attribute! */
+	[self removeAttributeForName: @"from"];
 	[self addAttributeWithName: @"from"
 		       stringValue: from_];
 }
 
 - (void)setTo: (OFString*)to_
@@ -169,11 +169,11 @@
 {
 	OFString* old = to;
 	to = [to_ copy];
 	[old release];
 
-	/* FIXME: Remove old attribute! */
+	[self removeAttributeForName: @"to"];
 	[self addAttributeWithName: @"to"
 		       stringValue: to];
 }
 
 - (void)setType: (OFString*)type_
@@ -180,11 +180,11 @@
 {
 	OFString* old = type;
 	type = [type_ copy];
 	[old release];
 
-	/* FIXME: Remove old attribute! */
+	[self removeAttributeForName: @"type"];
 	[self addAttributeWithName: @"type"
 		       stringValue: type];
 }
 
 - (void)setID: (OFString*)ID_
@@ -191,10 +191,10 @@
 {
 	OFString* old = ID;
 	ID = [ID_ copy];
 	[old release];
 
-	/* FIXME: Remove old attribute! */
+	[self removeAttributeForName: @"id"];
 	[self addAttributeWithName: @"id"
 		       stringValue: ID];
 }
 @end