diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5149d6d89..40475ae98 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D2X-Rebirth Changelog
 
+20120405
+--------
+main/multi.c: variable declarations come first
+
 20120331
 --------
 d2x-rebirth.xcodeproj/project.pbxproj, 2d/font.c: Make sure the ogl font code recognises the editor font is fixed width, fixing a crash; take the plunge and make D2X Rebirth compile with editor for Mac OpenGL build (won't work yet)
diff --git a/main/multi.c b/main/multi.c
index 654de71a8..98e719ddb 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -1606,8 +1606,8 @@ multi_do_message(char *buf)
 
 	if (((colon = strstr(buf+loc, ": ")) == NULL) || (colon-(buf+loc) < 1) || (colon-(buf+loc) > CALLSIGN_LEN))
 	{
-		mesbuf[0] = CC_COLOR;
 		int color = 0;
+		mesbuf[0] = CC_COLOR;
 		if (Game_mode & GM_TEAM)
 			color = get_team((int)buf[1]);
 		else
@@ -1629,8 +1629,8 @@ multi_do_message(char *buf)
 		if ( (!strnicmp(Players[Player_num].callsign, buf+loc, colon-(buf+loc))) ||
 			 ((Game_mode & GM_TEAM) && ( (get_team(Player_num) == atoi(buf+loc)-1) || !strnicmp(Netgame.team_name[get_team(Player_num)], buf+loc, colon-(buf+loc)))) )
 		{
-			mesbuf[0] = CC_COLOR;
 			int color = 0;
+			mesbuf[0] = CC_COLOR;
 			if (Game_mode & GM_TEAM)
 				color = get_team((int)buf[1]);
 			else