diff --git a/ChangeLog b/ChangeLog
index 15b69708f..8ed38c6f3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-07-11  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
+
+	* src/ejabberd_s2s_in.erl, src/ejabberd_s2s_out.erl,
+	src/ejabberd_c2s.erl: Exmpp now takes care of stanza serialization and
+	compatible namespaces.
+
 2008-07-09  Jean-Sébastien Pédron  <js.pedron@meetic-corp.com>
 
 	* src/ejabberd_c2s.erl: Convert #xmlelement returned by the
diff --git a/src/ejabberd_c2s.erl b/src/ejabberd_c2s.erl
index 9ecd3ebf5..dae88f07a 100644
--- a/src/ejabberd_c2s.erl
+++ b/src/ejabberd_c2s.erl
@@ -1305,10 +1305,8 @@ send_text(StateData, Text) ->
 
 send_element(StateData, #xmlel{ns = ?NS_XMPP, name = 'stream'} = El) ->
     send_text(StateData, exmpp_stream:to_list(El));
-send_element(StateData, #xmlel{ns = ?NS_JABBER_SERVER} = El) ->
-    send_text(StateData, exmpp_stanza:to_list(El, ?NS_JABBER_SERVER));
 send_element(StateData, El) ->
-    send_text(StateData, exmpp_stanza:to_list(El, ?DEFAULT_NS)).
+    send_text(StateData, exmpp_stanza:to_list(El)).
 
 
 new_id() ->
diff --git a/src/ejabberd_s2s_in.erl b/src/ejabberd_s2s_in.erl
index 562033076..c0c863c1e 100644
--- a/src/ejabberd_s2s_in.erl
+++ b/src/ejabberd_s2s_in.erl
@@ -564,12 +564,8 @@ send_text(StateData, Text) ->
 
 send_element(StateData, #xmlel{ns = ?NS_XMPP, name = 'stream'} = El) ->
     send_text(StateData, exmpp_stream:to_list(El));
-send_element(StateData, #xmlel{ns = ?NS_JABBER_CLIENT} = El) ->
-    send_text(StateData, exmpp_stanza:to_list(El,
-	?NS_JABBER_CLIENT, ?PREFIXED_NS));
 send_element(StateData, El) ->
-    send_text(StateData, exmpp_stanza:to_list(El,
-	?DEFAULT_NS, ?PREFIXED_NS)).
+    send_text(StateData, exmpp_stanza:to_list(El)).
 
 
 change_shaper(StateData, Host, JID) ->
diff --git a/src/ejabberd_s2s_out.erl b/src/ejabberd_s2s_out.erl
index 93171ced3..baa5d23f5 100644
--- a/src/ejabberd_s2s_out.erl
+++ b/src/ejabberd_s2s_out.erl
@@ -790,12 +790,8 @@ send_text(StateData, Text) ->
 
 send_element(StateData, #xmlel{ns = ?NS_XMPP, name = 'stream'} = El) ->
     send_text(StateData, exmpp_stream:to_list(El));
-send_element(StateData, #xmlel{ns = ?NS_JABBER_CLIENT} = El) ->
-    send_text(StateData, exmpp_stanza:to_list(El,
-	?NS_JABBER_CLIENT, ?PREFIXED_NS));
 send_element(StateData, El) ->
-    send_text(StateData, exmpp_stanza:to_list(El,
-	?DEFAULT_NS, ?PREFIXED_NS)).
+    send_text(StateData, exmpp_stanza:to_list(El)).
 
 send_queue(StateData, Q) ->
     case queue:out(Q) of