diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index bc808724e..7dbef3e3f 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1,5 +1,9 @@
 D1X-Rebirth Changelog
 
+20120618
+--------
+main/gamerend.c, main/multi.c: removed temp_string buffer for ingame message inputs preventing the string from being messed up if containing special characters
+
 20120610
 --------
 arch/sdl/digi_mixer_music.c, arch/sdl/jukebox.c, main/songs.c, main/songs.h: added songs_play_file() to play any song depending on filename-extension as a more streamlined approach to handle all different kinds of formats; also used for jukebox to make it independent from SDL_mixer; cleaned up supported filename extenstions
diff --git a/main/gamerend.c b/main/gamerend.c
index bfe2e4381..246f58a6b 100644
--- a/main/gamerend.c
+++ b/main/gamerend.c
@@ -62,20 +62,17 @@ int	netplayerinfo_on=0;
 #ifdef NETWORK
 void game_draw_multi_message()
 {
-	char temp_string[MAX_MULTI_MESSAGE_LEN+25];
-	
+
 	if ( (Game_mode&GM_MULTI) && (multi_sending_message[Player_num]))	{
 		gr_set_curfont(GAME_FONT);
 		gr_set_fontcolor(BM_XRGB(0,63,0),-1);
-		sprintf( temp_string, "%s: %s_", TXT_MESSAGE, Network_message );
-		gr_printf(0x8000, (LINE_SPACING*5)+FSPACY(1), temp_string );
+		gr_printf(0x8000, (LINE_SPACING*5)+FSPACY(1), "%s: %s_", TXT_MESSAGE, Network_message );
 	}
 	
 	if ( (Game_mode&GM_MULTI) && (multi_defining_message))	{
 		gr_set_curfont(GAME_FONT);
 		gr_set_fontcolor(BM_XRGB(0,63,0),-1);
-		sprintf( temp_string, "%s #%d: %s_", TXT_MACRO, multi_defining_message, Network_message );
-		gr_printf(0x8000, (LINE_SPACING*5)+FSPACY(1), temp_string );
+		gr_printf(0x8000, (LINE_SPACING*5)+FSPACY(1), "%s #%d: %s_", TXT_MACRO, multi_defining_message, Network_message );
 	}
 }
 #endif
diff --git a/main/multi.c b/main/multi.c
index ad02838f9..f9d3231be 100644
--- a/main/multi.c
+++ b/main/multi.c
@@ -1317,7 +1317,7 @@ int multi_message_input_sub(int key)
 		default:
 		{
 			int ascii = key_ascii();
-			if ((ascii < 255 ) && (ascii != 37))	{
+			if ( ascii < 255 )	{
 				if (multi_message_index < MAX_MESSAGE_LEN-2 )	{
 					Network_message[multi_message_index++] = ascii;
 					Network_message[multi_message_index] = 0;