diff --git a/src/guiMessageMenu.cpp b/src/guiMessageMenu.cpp
index ff9316b89..7ea743257 100644
--- a/src/guiMessageMenu.cpp
+++ b/src/guiMessageMenu.cpp
@@ -81,19 +81,29 @@ void GUIMessageMenu::regenerateGui(v2u32 screensize)
 
 	v2s32 size = rect.getSize();
 
+	gui::IGUISkin *skin = Environment->getSkin();
+	gui::IGUIFont *font = skin->getFont();
+	s32 msg_h = font->getDimension(m_message_text.c_str()).Height;
+	s32 msg_w = font->getDimension(m_message_text.c_str()).Width;
+	if(msg_h > 200)
+		msg_h = 200;
+	if(msg_w > 540)
+		msg_w = 540;
+
 	/*
 		Add stuff
 	*/
 	{
-		core::rect<s32> rect(0, 0, 400, 70);
-		rect = rect + v2s32(size.X/2-400/2, size.Y/2-50/2-25);
-		Environment->addStaticText(m_message_text.c_str(), rect, false,
-				true, this, 256);
+		core::rect<s32> rect(0, 0, msg_w, msg_h);
+		rect += v2s32(size.X/2-msg_w/2, size.Y/2-30/2 - msg_h/2);
+		Environment->addStaticText(m_message_text.c_str(),
+			rect, false, true, this, -1);
 	}
 	changeCtype("");
+	int bw = 140;
 	{
-		core::rect<s32> rect(0, 0, 140, 30);
-		rect = rect + v2s32(size.X/2-140/2, size.Y/2-30/2+45);
+		core::rect<s32> rect(0, 0, bw, 30);
+		rect = rect + v2s32(size.X/2-bw/2, size.Y/2-30/2+5 + msg_h/2);
 		gui::IGUIElement *e = 
 		Environment->addButton(rect, this, 257,
 			wgettext("Proceed"));