diff --git a/src/text_buffer.py b/src/text_buffer.py
index 2d83ab7e..b615e96c 100644
--- a/src/text_buffer.py
+++ b/src/text_buffer.py
@@ -45,7 +45,7 @@ class TextBuffer(object):
             else:
                 color = None
             # TODO: display the bg color too.
-            txt = ("\x19%(info_col)s}* \x19%(col)s}" % {'col':color or 5, 'info_col':get_theme().COLOR_INFORMATION_TEXT[0]})+ nickname + ' \x19%(info_col)s}' % {'info_col':get_theme().COLOR_INFORMATION_TEXT[0]} + txt[4:]
+            txt = '\x19%(info_col)s}* \x19%(col)s}%(nick)s \x19%(info_col)s}%(msg)s' % {'info_col':get_theme().COLOR_ME_MESSAGE[0], 'col': color or 5, 'nick': nickname, 'msg': txt[4:]}
             nickname = None
         msg = Message(txt='%s\x19o'%(txt.replace('\t', '    '),), nick_color=nick_color,
                       time=time, str_time=time.strftime("%Y-%m-%d %H:%M:%S")\
diff --git a/src/theming.py b/src/theming.py
index e45a25ff..94d7b005 100644
--- a/src/theming.py
+++ b/src/theming.py
@@ -108,6 +108,9 @@ class Theme(object):
     CHAR_AFFILIATION_MEMBER = '+'
     CHAR_AFFILIATION_NONE = '-'
 
+    # Color for the /me message
+    COLOR_ME_MESSAGE = (6, -1)
+
     # Separators
     COLOR_VERTICAL_SEPARATOR = (4, -1)
     COLOR_NEW_TEXT_SEPARATOR = (2, -1)