1 files changed, 12 insertions, 16 deletions
diff --git a/src/ui/ui_atoms.c b/src/ui/ui_atoms.c
index ab35533c..bb12a972 100644
--- a/src/ui/ui_atoms.c
+++ b/src/ui/ui_atoms.c
@@ -160,28 +160,24 @@ qboolean UI_ConsoleCommand( int realTime )
     return qtrue;
   }
 
-  if( Q_strncmp( cmd, "ui_messagemode", 14 ) == 0 )
+  if( Q_stricmp( cmd, "ui_messagemode" ) == 0 )
   {
     trap_Cvar_Set( "ui_sayBuffer", "" );
+    uiInfo.chatTeam = qfalse;
 
-    switch( cmd[ 14 ] )
-    {
-      default:
-      case '\0':
-        // Global
-        uiInfo.chatTeam             = qfalse;
-    uiInfo.chatTargetClientNum = -1;
-        break;
+    trap_Key_SetCatcher( KEYCATCH_UI );
+    Menus_ActivateByName( "say" );
+    return qtrue;
+  }
 
-      case '2':
-        // Team
-        uiInfo.chatTeam             = qtrue;
-        uiInfo.chatTargetClientNum  = -1;
-        break;
-    }
+  if( Q_stricmp( cmd, "ui_messagemode2" ) == 0 )
+  {
+    trap_Cvar_Set( "ui_sayBuffer", "" );
+    uiInfo.chatTargetClientNum = -1;
+    uiInfo.chatTeam = qtrue;
 
     trap_Key_SetCatcher( KEYCATCH_UI );
-    Menus_ActivateByName( "say" );
+    Menus_ActivateByName( "say_team" );
     return qtrue;
   }