diff --git a/src/plugins/plugin_misc_text_commands.py b/src/plugins/plugin_misc_text_commands.py
index c16f70eb..80cff0e7 100755
--- a/src/plugins/plugin_misc_text_commands.py
+++ b/src/plugins/plugin_misc_text_commands.py
@@ -290,7 +290,7 @@ class TextCommands(object):
         mess_data["type"] = C.MESS_TYPE_INFO
         mess_data["message"] = {'': message}
         mess_data["extra"]["info_type"] = info_type
-        self.host.sendMessageToBridge(mess_data, client)
+        client.messageSendToBridge(mess_data)
 
     def cmd_whois(self, client, mess_data):
         """show informations on entity
diff --git a/src/plugins/plugin_xep_0033.py b/src/plugins/plugin_xep_0033.py
index 243a1778..dd92faa0 100644
--- a/src/plugins/plugin_xep_0033.py
+++ b/src/plugins/plugin_xep_0033.py
@@ -126,8 +126,8 @@ class XEP_0033(object):
             d = defer.Deferred()
             if not skip_send:
                 d.addCallback(client.sendMessageData)
-            d.addCallback(self.host.messageAddToHistory, client)
-            d.addCallback(self.host.sendMessageToBridge, client)
+            d.addCallback(client.messageAddToHistory)
+            d.addCallback(client.messageSendToBridge)
             d.addErrback(lambda failure: failure.trap(exceptions.CancelError))
             return d.callback(mess_data)
 
diff --git a/src/plugins/plugin_xep_0280.py b/src/plugins/plugin_xep_0280.py
index e27f5e54..90b68e12 100755
--- a/src/plugins/plugin_xep_0280.py
+++ b/src/plugins/plugin_xep_0280.py
@@ -147,8 +147,8 @@ class XEP_0280(object):
             mess_data = SatMessageProtocol.parseMessage(cc_message_elt, client)
             if not mess_data['message'] and not mess_data['subject']:
                 return False
-            self.host.messageAddToHistory(mess_data, client)
-            self.host.sendMessageToBridge(mess_data, client)
+            client.messageAddToHistory(mess_data)
+            client.messageSendToBridge(mess_data)
         else:
             log.warning(u"invalid message carbons received:\n{xml}".format(
                 xml = message_elt.toXml()))