--- a/gui.h	Fri Apr 07 08:42:30 2006 +0000
+++ b/gui.h	Fri Apr 07 08:57:03 2006 +0000
@@ -124,7 +124,7 @@
 
 /* network gui */
 void ShowNetworkGameWindow(void);
-void ShowChatWindow(int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number);
+void ShowChatWindow(int maxlen, WindowClass window_class, WindowNumber window_number);
 
 /* bridge_gui.c */
 void ShowBuildBridgeWindow(uint start, uint end, byte type);

--- a/main_gui.c	Fri Apr 07 08:42:30 2006 +0000
+++ b/main_gui.c	Fri Apr 07 08:57:03 2006 +0000
@@ -332,7 +332,7 @@
 {
 	_rename_id = desttype + (dest << 8);
 	_rename_what = 2;
-	ShowChatWindow(150, 338, 1, 0);
+	ShowChatWindow(150, 1, 0);
 }
 
 void ShowNetworkGiveMoneyWindow(byte player)

--- a/network_gui.c	Fri Apr 07 08:42:30 2006 +0000
+++ b/network_gui.c	Fri Apr 07 08:57:03 2006 +0000
@@ -1545,7 +1545,7 @@
 	ChatWindowWndProc
 };
 
-void ShowChatWindow(int maxlen, int maxwidth, WindowClass window_class, WindowNumber window_number)
+void ShowChatWindow(int maxlen, WindowClass window_class, WindowNumber window_number)
 {
 	Window *w;
 
@@ -1561,7 +1561,7 @@
 	WP(w,querystr_d).wnd_num = window_number;
 	WP(w,querystr_d).text.caret = false;
 	WP(w,querystr_d).text.maxlength = maxlen;
-	WP(w,querystr_d).text.maxwidth = maxwidth;
+	WP(w,querystr_d).text.maxwidth = w->widget[1].right - w->widget[1].left - 2; // widget[1] is the "text box"
 	WP(w,querystr_d).text.buf = _edit_str_buf;
 	UpdateTextBufferSize(&WP(w, querystr_d).text);
 }