diff --git a/sugar/chat/chat.py b/sugar/chat/chat.py
index edc1c6a9..cb472fba 100755
--- a/sugar/chat/chat.py
+++ b/sugar/chat/chat.py
@@ -19,6 +19,7 @@ from sugar.p2p.Stream import Stream
 from sugar.session.LogWriter import LogWriter
 from sugar.chat.sketchpad.Toolbox import Toolbox
 from sugar.chat.sketchpad.SketchPad import SketchPad
+from sugar.chat.Emoticons import Emoticons
 import sugar.env
 
 import richtext
@@ -192,6 +193,8 @@ class Chat(activity.Activity):
 		# FIXME self._controller.notify_activate(self)
 
 	def _insert_rich_message(self, nick, msg):
+		msg = Emoticons.get_instance().replace(msg)
+	
 		buf = self._chat_view.get_buffer()
 		aniter = buf.get_end_iter()
 		buf.insert(aniter, nick + ": ")