Index: viewer.hpp
===================================================================
--- viewer.hpp	(revision 5885)
+++ viewer.hpp	(working copy)
@@ -164,6 +164,7 @@
 
 		UINT DefCodePage;
 		int vgetc_ready;
+      __int64 EOF_Pos;
 
 	private:
 		virtual void DisplayObject();
Index: viewer.cpp
===================================================================
--- viewer.cpp	(revision 5885)
+++ viewer.cpp	(working copy)
@@ -128,6 +128,7 @@
 	bVE_READ_Sent = false;
 	Signature = false;
 	vgetc_ready = -1;
+   EOF_Pos = -1;
 }
 
 
@@ -454,7 +455,11 @@
 	if (!SelectSize)
 		SelectPos=FilePos;
 
-	switch (nMode)
+   __int64 last_filepos = -1;
+   bool eof_mode = EOF_Pos >= 0 && nMode == SHOW_RELOAD;
+   do {
+   
+   switch (nMode)
 	{
 		case SHOW_HEX:
 			CtrlObject->Plugins.CurViewer = this; //HostFileViewer;
@@ -473,6 +478,13 @@
 				ReadString(Strings[I],-1,MAX_VIEWLINEB);
 			}
 
+         if (eof_mode)
+         {
+            last_filepos = vtell();
+            eof_mode = last_filepos < EOF_Pos;
+            if (eof_mode)
+               nMode = SHOW_DOWN;
+         }
 			break;
 		case SHOW_UP:
 
@@ -506,8 +518,20 @@
 			ReadString(Strings[Y2-Y1],-1,MAX_VIEWLINEB);
 			Strings[Y2-Y1]->nFilePos = vtell();
 			ReadString(Strings[Y2-Y1],-1,MAX_VIEWLINEB);
+
+         if (eof_mode)
+         {
+            __int64 fpos = vtell();
+            if (fpos >= EOF_Pos || fpos <= last_filepos)
+            {
+               eof_mode = false; nMode = SHOW_RELOAD;
+            }
+            else
+               last_filepos = fpos;
+         }
 			break;
 	}
+   } while ( eof_mode );
 
 	if (nMode != SHOW_HEX)
 	{
@@ -676,7 +700,7 @@
 
 					if (!X)
 					{
-						*OutStr=0;
+						*OutStr = L'\0';
 						break;
 					}
 
@@ -721,7 +745,7 @@
 
 			if (!nr)
 			{
-				*OutStr=0;
+				*OutStr = L'\0';
 			}
 			else
 			{
@@ -816,7 +840,7 @@
 
 					if (!X)
 					{
-						*OutStr=0;
+						*OutStr = L'\0';
 						break;
 					}
 
@@ -1796,6 +1820,8 @@
 				}
 
 				FilePos=vtell();
+            if (!VM.Hex && VM.Wrap && VM.WordWrap)
+               EOF_Pos = FilePos; //!!! hack to adjust possible incorrect last page show
 
 				/*
 				        {
@@ -1826,6 +1852,7 @@
 				        }
 				*/
 				Show();
+            EOF_Pos = -1;
 //        LastSelPos=FilePos;
 			}