diff --git a/sugar/chat/GroupChat.py b/sugar/chat/GroupChat.py
new file mode 100644
index 00000000..d7580dab
--- /dev/null
+++ b/sugar/chat/GroupChat.py
@@ -0,0 +1,37 @@
+# Copyright (C) 2006, Red Hat, Inc.
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2 of the License, or (at your option) any later version.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the
+# Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
+
+import logging
+
+from sugar.chat.Chat import Chat
+from sugar.p2p.Stream import Stream
+from sugar.presence.PresenceService import PresenceService
+import sugar.env
+
+class GroupChat(Chat):
+	def __init__(self):
+		Chat.__init__(self)
+		self._group_stream = None
+
+	def _setup_stream(self, service):
+		self._group_stream = Stream.new_from_service(service)
+		self._group_stream.set_data_listener(self._group_recv_message)
+		self._stream_writer = self._group_stream.new_writer()
+
+	def _group_recv_message(self, address, msg):
+		logging.debug('Group chat received from %s message %s' % (address, msg))
+		self.recv_message(msg)
diff --git a/sugar/chat/Makefile.am b/sugar/chat/Makefile.am
index 0b6a5d7a..f7370cfb 100644
--- a/sugar/chat/Makefile.am
+++ b/sugar/chat/Makefile.am
@@ -8,6 +8,7 @@ sugar_PYTHON =		\
 	ChatEditor.py	\
 	ChatToolbar.py	\
 	Emoticons.py	\
+	GroupChat.py	\
 	richtext.py
 
 EXTRA_DIST = \