diff --git a/source/glest_game/game/commander.cpp b/source/glest_game/game/commander.cpp
index ac2d0a36..96d46f79 100644
--- a/source/glest_game/game/commander.cpp
+++ b/source/glest_game/game/commander.cpp
@@ -573,6 +573,10 @@ bool Commander::hasReplayCommandListForFrame() const {
 	return (replayCommandList.empty() == false);
 }
 
+int Commander::getReplayCommandListForFrameCount() const {
+	return replayCommandList.size();
+}
+
 void Commander::updateNetwork(Game *game) {
 	NetworkManager &networkManager= NetworkManager::getInstance();
 
diff --git a/source/glest_game/game/commander.h b/source/glest_game/game/commander.h
index 07313db9..ff21ab0f 100644
--- a/source/glest_game/game/commander.h
+++ b/source/glest_game/game/commander.h
@@ -93,6 +93,7 @@ public:
 	void addToReplayCommandList(NetworkCommand &command,int worldFrameCount);
 	bool getReplayCommandListForFrame(int worldFrameCount);
 	bool hasReplayCommandListForFrame() const;
+	int getReplayCommandListForFrameCount() const;
 
 	CommandResult tryGiveCommand(const Selection *selection, const CommandType *commandType,
 										const Vec2i &pos, const UnitType* unitType,
diff --git a/source/glest_game/game/game.cpp b/source/glest_game/game/game.cpp
index 0e5d1628..0fec4b54 100644
--- a/source/glest_game/game/game.cpp
+++ b/source/glest_game/game/game.cpp
@@ -1202,7 +1202,15 @@ void Game::update() {
 			world.getStats()->addFramesToCalculatePlaytime();
 
 			//update
+			Chrono chronoReplay;
+			int64 lastReplaySecond = -1;
+			int replayCommandsPlayed = 0;
+			int replayTotal = commander.getReplayCommandListForFrameCount();
+			if(replayTotal > 0) {
+				chronoReplay.start();
+			}
 			do {
+				replayCommandsPlayed = (replayTotal - commander.getReplayCommandListForFrameCount());
 				for(int i = 0; i < updateLoops; ++i) {
 					chrono.start();
 					//AiInterface
@@ -1220,6 +1228,48 @@ void Game::update() {
 							}
 						}
 					}
+					else {
+						if(lastReplaySecond < chronoReplay.getSeconds()) {
+							lastReplaySecond = chronoReplay.getSeconds();
+							const Metrics &metrics= Metrics::getInstance();
+							Renderer &renderer= Renderer::getInstance();
+							renderer.clearBuffers();
+							renderer.clearZBuffer();
+							renderer.reset2d();
+
+							char szBuf[4096]="";
+							sprintf(szBuf,"Please wait, loading game with replay [%d / %d]...",replayCommandsPlayed,replayTotal);
+							string text = szBuf;
+							if(Renderer::renderText3DEnabled) {
+								Font3D *font = CoreData::getInstance().getMenuFontBig3D();
+								const Metrics &metrics= Metrics::getInstance();
+								int w= metrics.getVirtualW();
+								int renderX = (w / 2) - (font->getMetrics()->getTextWidth(text) / 2);
+								int h= metrics.getVirtualH();
+								int renderY = (h / 2) + (font->getMetrics()->getHeight(text) / 2);
+
+								renderer.renderText3D(
+									text, font,
+									Vec3f(1.f, 1.f, 0.f),
+									renderX, renderY, false);
+							}
+							else {
+								Font2D *font = CoreData::getInstance().getMenuFontBig();
+								const Metrics &metrics= Metrics::getInstance();
+								int w= metrics.getVirtualW();
+								int renderX = (w / 2);
+								int h= metrics.getVirtualH();
+								int renderY = (h / 2);
+
+								renderer.renderText(
+									text, font,
+									Vec3f(1.f, 1.f, 0.f),
+									renderX, renderY, true);
+							}
+
+							renderer.swapBuffers();
+						}
+					}
 
 					if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) SystemFlags::OutputDebug(SystemFlags::debugPerformance,"In [%s::%s] Line: %d took msecs: %lld [AI updates]\n",extractFileFromDirectoryPath(__FILE__).c_str(),__FUNCTION__,__LINE__,chrono.getMillis());
 					if(SystemFlags::getSystemSettingType(SystemFlags::debugPerformance).enabled && chrono.getMillis() > 0) chrono.start();