diff --git a/src/core/sat_main.py b/src/core/sat_main.py
index 2059ec45..0b4617cd 100644
--- a/src/core/sat_main.py
+++ b/src/core/sat_main.py
@@ -438,8 +438,9 @@ class SAT(service.Service):
             message.addElement("subject", "jabber:client", subject)
         message.addElement("body", "jabber:client", msg)
         self.profiles[profile].xmlstream.send(message)
-        self.memory.addToHistory(current_jid, jid.JID(to), unicode(msg), profile=profile)
         if type!="groupchat":
+            self.memory.addToHistory(current_jid, jid.JID(to), unicode(msg), profile=profile) #we don't add groupchat message to history, as we get them back
+                                                                                              #and they will we added then
             self.bridge.newMessage(message['from'], unicode(msg), mess_type=type, to_jid=message['to'], profile=profile) #We send back the message, so all clients are aware of it