Index: src/XMPPConnection.m
==================================================================
--- src/XMPPConnection.m
+++ src/XMPPConnection.m
@@ -693,10 +693,11 @@
 	bind = [OFXMLElement elementWithName: @"bind"
 				   namespace: XMPP_NS_BIND];
 
 	if (resource != nil)
 		[bind addChild: [OFXMLElement elementWithName: @"resource"
+						    namespace: XMPP_NS_BIND
 						  stringValue: resource]];
 
 	[iq addChild: bind];
 
 	[self sendStanza: iq];

Index: src/XMPPMessage.m
==================================================================
--- src/XMPPMessage.m
+++ src/XMPPMessage.m
@@ -20,10 +20,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #import "XMPPMessage.h"
+#import "XMPPConnection.h"
 
 @implementation XMPPMessage
 + message
 {
 	return [[[self alloc] init] autorelease];
@@ -73,8 +74,9 @@
 }
 
 - (void)addBody: (OFString*)body
 {
 	[self addChild: [OFXMLElement elementWithName: @"body"
+					    namespace: XMPP_NS_CLIENT
 					  stringValue: body]];
 }
 @end

Index: src/XMPPPresence.m
==================================================================
--- src/XMPPPresence.m
+++ src/XMPPPresence.m
@@ -20,10 +20,11 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
 #import "XMPPPresence.h"
+#import "XMPPConnection.h"
 
 @implementation XMPPPresence
 + presence
 {
 	return [[[self alloc] init] autorelease];
@@ -73,21 +74,24 @@
 }
 
 - (void)addShow: (OFString*)show
 {
 	[self addChild: [OFXMLElement elementWithName: @"show"
+					    namespace: XMPP_NS_CLIENT
 					  stringValue: show]];
 }
 
 - (void)addStatus: (OFString*)status
 {
 	[self addChild: [OFXMLElement elementWithName: @"status"
+					    namespace: XMPP_NS_CLIENT
 					  stringValue: status]];
 }
 
 - (void)addPriority: (int8_t)priority
 {
 	OFString* prio = [OFString stringWithFormat: @"%" @PRId8, priority];
 	[self addChild: [OFXMLElement elementWithName: @"priority"
+					    namespace: XMPP_NS_CLIENT
 					  stringValue: prio]];
 }
 @end

Index: src/XMPPStanza.m
==================================================================
--- src/XMPPStanza.m
+++ src/XMPPStanza.m
@@ -84,11 +84,12 @@
 
 - initWithName: (OFString*)name_
 	  type: (OFString*)type_
 	    ID: (OFString*)ID_
 {
-	self = [super initWithName: name_];
+	self = [super initWithName: name_
+			 namespace: XMPP_NS_CLIENT];
 
 	@try {
 		if (![name_ isEqual: @"iq"] && ![name_ isEqual: @"message"] &&
 		    ![name_ isEqual: @"presence"])
 			@throw [OFInvalidArgumentException newWithClass: isa