Index: ps/trunk/binaries/data/config/default.cfg
===================================================================
--- ps/trunk/binaries/data/config/default.cfg
+++ ps/trunk/binaries/data/config/default.cfg
@@ -150,7 +150,10 @@
 wireframe = "Alt+Shift+W"                ; Toggle wireframe mode
 silhouettes = "Alt+Shift+S"              ; Toggle unit silhouettes
 showsky = "Alt+Z"                        ; Toggle sky
+
+; > DIALOG HOTKEYS
 summary = "Ctrl+Tab"                     ; Toggle in-game summary
+lobby = "Alt+L"                          ; Show the multiplayer lobby in a dialog window.
 
 ; > CLIPBOARD CONTROLS
 copy = "Ctrl+C"                       ; Copy to clipboard
Index: ps/trunk/binaries/data/mods/public/gui/common/sprites.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/common/sprites.xml
+++ ps/trunk/binaries/data/mods/public/gui/common/sprites.xml
@@ -177,6 +177,22 @@
 		/>
 	</sprite>
 
+	<sprite name="iconBubbleGold">
+		<effect add_color="237 227 167"/>
+		<image
+			texture="global/icon/bubble.png"
+			size="0 3 100% 100%+3"
+		/>
+	</sprite>
+
+	<sprite name="iconBubbleWhite">
+		<effect add_color="255 255 255"/>
+		<image
+			texture="global/icon/bubble.png"
+			size="0 3 100% 100%+3"
+		/>
+	</sprite>
+
 	<!--
 	==========================================
 	SCREENSHOT WATERMARK
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.js
@@ -946,6 +946,13 @@
 	"teamResetButton": {
 		"hidden": () => g_GameAttributes.mapType == "scenario" || !g_IsController,
 	},
+	"lobbyButton": {
+		"onPress": () => function() {
+			if (Engine.HasXmppClient())
+				Engine.PushGuiPage("page_lobby.xml", { "dialog": true });
+		},
+		"hidden": () => !Engine.HasXmppClient()
+	},
 	// Display these after having hidden every GUI object in the "More Options" dialog
 	"moreOptionsLabel": {
 		"hidden": () => false,
@@ -1729,7 +1736,7 @@
 		if (g_IsController)
 			Engine.SendUnregisterGame();
 
-		Engine.SwitchGuiPage("page_lobby.xml");
+		Engine.SwitchGuiPage("page_lobby.xml", { "dialog": false });
 	}
 	else
 		Engine.SwitchGuiPage("page_pregame.xml");
Index: ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
+++ ps/trunk/binaries/data/mods/public/gui/gamesetup/gamesetup.xml
@@ -247,6 +247,17 @@
 
 			<!-- Options -->
 			<object name="gameOptionsBox" size="100%-425 529 100%-25 525">
+				<!-- View Lobby Button -->
+				<object name="lobbyButton"
+					type="button"
+					style="IconButton"
+					sprite="iconBubbleGold"
+					sprite_over="iconBubbleWhite"
+					size="100%-143 0 100%-127 16"
+					hotkey="lobby"
+				>
+					<translatableAttribute id="tooltip">Show the multiplayer lobby in a dialog window.</translatableAttribute>
+				</object>
 				<!-- More Options Button -->
 				<object
 					name="showMoreOptions"
Index: ps/trunk/binaries/data/mods/public/gui/lobby/lobby.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/lobby/lobby.js
+++ ps/trunk/binaries/data/mods/public/gui/lobby/lobby.js
@@ -75,6 +75,11 @@
 var g_ChatCommandColor = "200 200 255";
 
 /**
+ * Indicates if the lobby is opened as a dialog or window.
+ */
+var g_Dialog = false;
+
+/**
  * All chat messages received since init (i.e. after lobby join and after returning from a game).
  */
 var g_ChatMessages = [];
@@ -88,7 +93,7 @@
 /**
  * All games currently running.
  */
-var g_GameList = {};
+var g_GameList = [];
 
 /**
  * Used to restore the selection after updating the playerlist.
@@ -111,6 +116,12 @@
 var g_Kicked = false;
 
 /**
+ * Whether the player was already asked to reconnect to the lobby.
+ * Ensures that no more than one message box is opened at a time.
+ */
+var g_AskedReconnect = false;
+
+/**
  * Processing of notifications sent by XmppClient.cpp.
  *
  * @returns true if the playerlist GUI must be updated.
@@ -119,24 +130,28 @@
 	"system": {
 		// Three cases are handled in prelobby.js
 		"registered": msg => false,
-		"connected": msg => false,
+		"connected": msg => {
+
+			g_AskedReconnect = false;
+			updateConnectedState();
+			return false;
+		},
 		"disconnected": msg => {
 
 			updateGameList();
 			updateLeaderboard();
-
-			Engine.GetGUIObjectByName("chatInput").hidden = true;
-
-			for (let button of ["host", "leaderboard", "userprofile", "toggleBuddy"])
-				Engine.GetGUIObjectByName(button + "Button").enabled = false;
-			Engine.GetGUIObjectByName("chatInput").hidden = true;
+			updateConnectedState();
 
 			if (!g_Kicked)
+			{
 				addChatMessage({
 					"from": "system",
 					"time": msg.time,
 					"text": translate("Disconnected.") + " " + msg.reason
 				});
+				reconnectMessageBox();
+			}
+
 			return true;
 		},
 		"error": msg => {
@@ -363,7 +378,7 @@
 	"quit": {
 		"description": translate("Return to the main menu."),
 		"handler": args => {
-			returnToMainMenu();
+			leaveLobby();
 			return false;
 		}
 	}
@@ -376,16 +391,20 @@
  */
 function init(attribs)
 {
+	g_Dialog = attribs && attribs.dialog;
+
 	if (!g_Settings)
 	{
-		returnToMainMenu();
+		leaveLobby();
 		return;
 	}
 
 	initMusic();
 	global.music.setState(global.music.states.MENU);
 
+	initDialogStyle();
 	initGameFilters();
+	updateConnectedState();
 
 	Engine.LobbySetPlayerPresence("available");
 
@@ -401,6 +420,61 @@
 	// Get all messages since the login
 	for (let msg of Engine.LobbyGuiPollHistoricMessages())
 		g_NetMessageTypes[msg.type][msg.level](msg);
+
+	if (!Engine.IsXmppClientConnected())
+		reconnectMessageBox();
+}
+
+function reconnectMessageBox()
+{
+	if (g_AskedReconnect)
+		return;
+
+	g_AskedReconnect = true;
+
+	messageBox(
+		400, 200,
+		translate("You have been disconnected from the lobby. Do you want to reconnect?"),
+		translate("Confirmation"),
+		[translate("No"), translate("Yes")],
+		[null, Engine.ConnectXmppClient]);
+}
+
+/**
+ * Set style of GUI elements and the window style.
+ */
+function initDialogStyle()
+{
+	let lobbyWindow = Engine.GetGUIObjectByName("lobbyWindow");
+	lobbyWindow.sprite = g_Dialog ? "ModernDialog" : "ModernWindow";
+	lobbyWindow.size = g_Dialog ? "42 42 100%-42 100%-42" : "0 0 100% 100%";
+	Engine.GetGUIObjectByName("lobbyWindowTitle").size = g_Dialog ? "50%-128 -16 50%+128 16" : "50%-128 4 50%+128 36";
+
+	Engine.GetGUIObjectByName("leaveButton").caption = g_Dialog ?
+		translateWithContext("previous page", "Back") :
+		translateWithContext("previous page", "Main Menu");
+
+	Engine.GetGUIObjectByName("hostButton").hidden = g_Dialog;
+	Engine.GetGUIObjectByName("joinGameButton").hidden = g_Dialog;
+	Engine.GetGUIObjectByName("gameInfoEmpty").size = "0 0 100% 100%-30" + (g_Dialog ? "" : "-30");
+	Engine.GetGUIObjectByName("gameInfo").size = "0 0 100% 100%-30" + (g_Dialog ? "" : "-60");
+
+	if (g_Dialog)
+	{
+		Engine.GetGUIObjectByName("lobbyDialogToggle").onPress = leaveLobby;
+		Engine.GetGUIObjectByName("cancelDialog").onPress = leaveLobby;
+	}
+}
+
+/**
+ * Set style of GUI elements according to the connection state of the lobby.
+ */
+function updateConnectedState()
+{
+	Engine.GetGUIObjectByName("chatInput").hidden = !Engine.IsXmppClientConnected();
+
+	for (let button of ["host", "leaderboard", "userprofile", "toggleBuddy"])
+		Engine.GetGUIObjectByName(button + "Button").enabled = Engine.IsXmppClientConnected();
 }
 
 function updateLobbyColumns()
@@ -426,10 +500,18 @@
 	playersNumberFilter.size = size;
 }
 
-function returnToMainMenu()
+function leaveLobby()
 {
-	Engine.StopXmppClient();
-	Engine.SwitchGuiPage("page_pregame.xml");
+	if (g_Dialog)
+	{
+		Engine.LobbySetPlayerPresence("playing");
+		Engine.PopGuiPage();
+	}
+	else
+	{
+		Engine.StopXmppClient();
+		Engine.SwitchGuiPage("page_pregame.xml");
+	}
 }
 
 function initGameFilters()
@@ -1015,7 +1097,7 @@
 	let game = selectedGame();
 
 	Engine.GetGUIObjectByName("gameInfo").hidden = !game;
-	Engine.GetGUIObjectByName("joinGameButton").hidden = !game;
+	Engine.GetGUIObjectByName("joinGameButton").hidden = g_Dialog || !game;
 	Engine.GetGUIObjectByName("gameInfoEmpty").hidden = game;
 
 	if (!game)
@@ -1073,7 +1155,7 @@
 function joinButton()
 {
 	let game = selectedGame();
-	if (!game)
+	if (!game || g_Dialog)
 		return;
 
 	let rating = getRejoinRating(game);
Index: ps/trunk/binaries/data/mods/public/gui/lobby/lobby.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/lobby/lobby.xml
+++ ps/trunk/binaries/data/mods/public/gui/lobby/lobby.xml
@@ -5,9 +5,11 @@
 	<script directory="gui/common/"/>
 	<script directory="gui/lobby/"/>
 
+	<object type="image" sprite="ModernFade" name="fadeImage"/>
+
 	<object type="image" style="ModernWindow" size="0 0 100% 100%" name="lobbyWindow">
 
-		<object style="ModernLabelText" type="text" size="50%-128 0%+4 50%+128 36">
+		<object name="lobbyWindowTitle" style="ModernLabelText" type="text" size="50%-128 0%+4 50%+128 36">
 			<translatableAttribute id="caption">Multiplayer Lobby</translatableAttribute>
 		</object>
 
Index: ps/trunk/binaries/data/mods/public/gui/lobby/lobby_panels.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/lobby/lobby_panels.xml
+++ ps/trunk/binaries/data/mods/public/gui/lobby/lobby_panels.xml
@@ -6,6 +6,8 @@
 		onTick();
 	</action>
 
+	<object hotkey="lobby" name="lobbyDialogToggle"/>
+
 	<!-- Left panel: Player list. -->
 	<object name="leftPanel" size="20 30 20% 100%-310">
 		<object name="playersBox"
@@ -96,13 +98,13 @@
 
 	<!-- Right panel: Game details. -->
 	<object name="rightPanel" size="100%-250 30 100%-20 100%-20" >
-		<object name="gameInfoEmpty" size="0 0 100% 100%-60" type="image" sprite="ModernDarkBoxGold" hidden="false">
+		<object name="gameInfoEmpty" type="image" sprite="ModernDarkBoxGold" hidden="false">
 			<object name="logo" size="50%-110 40 50%+110 140" type="image" sprite="logo"/>
 			<object name="subjectBox" type="image" sprite="ModernDarkBoxWhite" size="3% 180 97% 99%">
 				<object name="subject" size="5 5 100%-5 100%-5" type="text" style="ModernText" text_align="center"/>
 			</object>
 		</object>
-		<object name="gameInfo" size="0 0 100% 100%-90" type="image" sprite="ModernDarkBoxGold" hidden="true">
+		<object name="gameInfo" type="image" sprite="ModernDarkBoxGold" hidden="true">
 
 			<!-- Map Name -->
 			<object name="sgMapName" size="0 5 100% 20" type="text" style="ModernLabelText"/>
@@ -164,9 +166,8 @@
 			</action>
 		</object>
 
-		<object type="button" style="ModernButtonRed" size="0 100%-25 100% 100%">
-			<translatableAttribute id="caption">Main Menu</translatableAttribute>
-			<action on="Press">returnToMainMenu();</action>
+		<object name="leaveButton" type="button" style="ModernButtonRed" size="0 100%-25 100% 100%">
+			<action on="Press">leaveLobby();</action>
 		</object>
 	</object>
 
@@ -361,4 +362,7 @@
 	</object>
 	<!-- End of user profile lookup -->
 
+	<!-- Keep this hotkey at the end of the gui, because the other cancel hotkeys must be processed first! -->
+	<object hotkey="cancel" name="cancelDialog"/>
+
 </object>
Index: ps/trunk/binaries/data/mods/public/gui/manual/intro.txt
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/manual/intro.txt
+++ ps/trunk/binaries/data/mods/public/gui/manual/intro.txt
@@ -90,6 +90,7 @@
 PageDown with units/buildings selected: Highlights the units guarding the selection.
 Tab: See all status bars (which would also show the building progress)
 Ctrl + Tab: Toggle summary window.
+Alt + L: Show the multiplayer lobby in a dialog window.
 Ctrl + B: Toggle in-game barter/trade page.
 Ctrl + P: Toggle in-game tutorial panel.
 
Index: ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml
+++ ps/trunk/binaries/data/mods/public/gui/pregame/mainmenu.xml
@@ -291,10 +291,13 @@
 					style="StoneButtonFancy"
 					size="0 64 100% 92"
 					tooltip_style="pgToolTip"
+					hotkey="lobby"
 				>
 					<translatableAttribute id="caption">Game Lobby</translatableAttribute>
 					<translatableAttribute id="tooltip">Launch the multiplayer lobby.</translatableAttribute>
 					<action on="Press">
+						if (!Engine.StartXmppClient)
+							return;
 						closeMenu();
 						Engine.PushGuiPage("page_prelobby.xml");
 					</action>
Index: ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.js
+++ ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.js
@@ -190,7 +190,7 @@
 		case "connected":
 		{
 			Engine.PopGuiPage();
-			Engine.SwitchGuiPage("page_lobby.xml");
+			Engine.SwitchGuiPage("page_lobby.xml", { "dialog": false });
 			Engine.ConfigDB_CreateValue("user", "playername.multiplayer", username);
 			Engine.ConfigDB_WriteValueToFile("user", "playername.multiplayer", username, "config/user.cfg");
 			Engine.ConfigDB_CreateValue("user", "lobby.login", username);
Index: ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.xml
+++ ps/trunk/binaries/data/mods/public/gui/prelobby/prelobby.xml
@@ -5,6 +5,13 @@
 	<script directory="gui/common/"/>
 	<script directory="gui/prelobby/"/>
 
+	<object hotkey="lobby">
+		<action on="Press">
+			lobbyStop();
+			Engine.PopGuiPage();
+		</action>
+	</object>
+
 	<!-- Add a translucent black background to fade out the menu page -->
 	<object type="image" z="0" sprite="ModernFade"/>
 
Index: ps/trunk/binaries/data/mods/public/gui/session/menu.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/menu.js
+++ ps/trunk/binaries/data/mods/public/gui/session/menu.js
@@ -2,7 +2,7 @@
 var MARGIN = 4;
 
 // Includes the main menu button
-const NUM_BUTTONS = 9;
+const NUM_BUTTONS = 10;
 
 // Regular menu buttons
 var BUTTON_HEIGHT = 32;
@@ -121,6 +121,15 @@
 	openOptions();
 }
 
+function lobbyDialogButton()
+{
+	if (!Engine.HasXmppClient())
+		return;
+
+	closeOpenDialogs();
+	Engine.PushGuiPage("page_lobby.xml", { "dialog": true });
+}
+
 function chatMenuButton()
 {
 	closeOpenDialogs();
Index: ps/trunk/binaries/data/mods/public/gui/session/menu.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/menu.xml
+++ ps/trunk/binaries/data/mods/public/gui/session/menu.xml
@@ -53,11 +53,24 @@
 			<action on="Press">openGameSummary();</action>
 		</object>
 
+		<!-- Lobby button -->
+		<object type="button"
+			name="lobbyButton"
+			style="StoneButtonFancy"
+			size="0 128 100% 156"
+			tooltip_style="sessionToolTip"
+			hotkey="lobby"
+		>
+			<translatableAttribute id="caption">Lobby</translatableAttribute>
+			<translatableAttribute id="tooltip">Show the multiplayer lobby in a dialog window.</translatableAttribute>
+			<action on="Press">lobbyDialogButton();</action>
+		</object>
+
 		<!-- Options button -->
 		<object type="button"
 			name="optionsButton"
 			style="StoneButtonFancy"
-			size="0 128 100% 156"
+			size="0 160 100% 188"
 			tooltip_style="sessionToolTip"
 		>
 			<translatableAttribute id="caption">Options</translatableAttribute>
@@ -68,7 +81,7 @@
 		<object type="button"
 			name="pauseButton"
 			style="StoneButtonFancy"
-			size="0 160 100% 188"
+			size="0 192 100% 220"
 			tooltip_style="sessionToolTip"
 		>
 			<translatableAttribute id="caption">Pause</translatableAttribute>
@@ -79,7 +92,7 @@
 		<object type="button"
 			name="menuResignButton"
 			style="StoneButtonFancy"
-			size="0 192 100% 220"
+			size="0 224 100% 252"
 			tooltip_style="sessionToolTip"
 		>
 			<translatableAttribute id="caption">Resign</translatableAttribute>
@@ -90,7 +103,7 @@
 		<object type="button"
 			name="menuExitButton"
 			style="StoneButtonFancy"
-			size="0 224 100% 252"
+			size="0 256 100% 256+28"
 			tooltip_style="sessionToolTip"
 		>
 			<translatableAttribute id="caption">Exit</translatableAttribute>
Index: ps/trunk/binaries/data/mods/public/gui/session/session.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/session/session.js
+++ ps/trunk/binaries/data/mods/public/gui/session/session.js
@@ -615,6 +615,7 @@
 
 	Engine.GetGUIObjectByName("pauseButton").enabled = !g_IsObserver || !g_IsNetworked || g_IsController;
 	Engine.GetGUIObjectByName("menuResignButton").enabled = !g_IsObserver;
+	Engine.GetGUIObjectByName("lobbyButton").enabled = Engine.HasXmppClient();
 }
 
 function reportPerformance(time)
Index: ps/trunk/binaries/data/mods/public/gui/summary/summary.js
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/summary/summary.js
+++ ps/trunk/binaries/data/mods/public/gui/summary/summary.js
@@ -465,7 +465,7 @@
 			"summarySelectedData": summarySelectedData
 		});
 	else if (Engine.HasXmppClient())
-		Engine.SwitchGuiPage("page_lobby.xml");
+		Engine.SwitchGuiPage("page_lobby.xml", { "dialog": false });
 	else
 		Engine.SwitchGuiPage("page_pregame.xml");
 }
Index: ps/trunk/binaries/data/mods/public/gui/summary/summary.xml
===================================================================
--- ps/trunk/binaries/data/mods/public/gui/summary/summary.xml
+++ ps/trunk/binaries/data/mods/public/gui/summary/summary.xml
@@ -26,6 +26,13 @@
 
 	<object type="image" sprite="ModernFade" name="fadeImage"/>
 
+	<object hotkey="lobby">
+		<action on="Press">
+			if (Engine.HasXmppClient())
+				Engine.PushGuiPage("page_lobby.xml", { "dialog": true });
+		</action>
+	</object>
+
 	<object name="summaryWindow"
 		type="image"
 		style="ModernWindow"