--- a/main_gui.c	Tue Dec 14 15:24:36 2004 +0000
+++ b/main_gui.c	Tue Dec 14 16:53:38 2004 +0000
@@ -334,11 +334,12 @@
 }
 
 #ifdef ENABLE_NETWORK
+
 void ShowNetworkChatQueryWindow(byte desttype, byte dest)
 {
 	_rename_id = desttype + (dest << 8);
 	_rename_what = 2;
-	ShowQueryString(STR_EMPTY, STR_NETWORK_CHAT_QUERY_CAPTION, 60, 250, 1, 0);
+	ShowChatWindow(STR_EMPTY, STR_NETWORK_CHAT_QUERY_CAPTION, 60, 250, 1, 0);
 }
 
 void ShowNetworkGiveMoneyWindow(byte player)
@@ -2337,8 +2338,10 @@
 			break;
 
 #ifdef ENABLE_NETWORK
+		case WKC_RETURN:
 		case 'T' | WKC_SHIFT:
-			ShowNetworkChatQueryWindow(DESTTYPE_BROADCAST, 0);
+			if(_networking)
+				ShowNetworkChatQueryWindow(DESTTYPE_BROADCAST, 0);
 			break;
 #endif /* ENABLE_NETWORK */