--- a/src/core/xmpp.py	Fri Nov 11 19:49:00 2011 +0100
+++ b/src/core/xmpp.py	Fri Nov 11 19:49:21 2011 +0100
@@ -109,9 +109,10 @@
       for e in message.elements():
           if e.name == "body":
               mess_type = message['type'] if message.hasAttribute('type') else 'normal'
-              self.host.bridge.newMessage(message["from"], e.children[0], mess_type, message['to'], profile=self.parent.profile)
+              mess_body = e.children[0] if e.children else ""
+              self.host.bridge.newMessage(message["from"], mess_body, mess_type, message['to'], profile=self.parent.profile)
               if not u"delay" in [elem.name for elem in message.elements()]: #we don't save delayed messages in history
-                  self.host.memory.addToHistory(jid.JID(message["from"]), jid.JID(message["to"]), e.children[0], profile=self.parent.profile)
+                  self.host.memory.addToHistory(jid.JID(message["from"]), jid.JID(message["to"]), mess_body, profile=self.parent.profile)
               break
     
 class SatRosterProtocol(xmppim.RosterClientProtocol):