diff --git a/src/Edit.c b/src/Edit.c
index e463afb35..1cf6861b1 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -825,7 +825,8 @@ bool EditCopyAppend(HWND hwnd, bool bAppend)
   HANDLE const hOld   = GetClipboardData(CF_UNICODETEXT);
   const WCHAR* pszOld = GlobalLock(hOld);
 
-  const WCHAR *pszSep = ((Globals.iEOLMode == SC_EOL_CRLF) ? L"\r\n" : ((Globals.iEOLMode == SC_EOL_CR) ? L"\r" : L"\n"));
+  int const _eol_mode = SciCall_GetEOLMode();
+  const WCHAR *pszSep = ((_eol_mode == SC_EOL_CRLF) ? L"\r\n" : ((_eol_mode == SC_EOL_CR) ? L"\r" : L"\n"));
 
   size_t cchNewText = cchTextW;
   if (pszOld && *pszOld) {
@@ -1293,13 +1294,13 @@ bool EditSaveFile(
 
   // ensure consistent line endings
   if (Settings.FixLineEndings) {
-    SciCall_ConvertEOLs(SciCall_GetEOLMode());
-    EditFixPositions(hwnd);
+    EditEnsureConsistentLineEndings(hwnd);
   }
 
   // strip trailing blanks
-  if (Settings.FixTrailingBlanks)
+  if (Settings.FixTrailingBlanks) {
     EditStripLastCharacter(hwnd, true, true);
+  }
 
   // get text
   cbData = (DWORD)SciCall_GetTextLength();
@@ -4394,6 +4395,17 @@ void EditEnsureSelectionVisible(HWND hwnd)
 }
 
 
+//=============================================================================
+//
+//  EditEnsureConsistentLineEndings()
+//
+void EditEnsureConsistentLineEndings(HWND hwnd)
+{
+  SciCall_ConvertEOLs(SciCall_GetEOLMode());
+  EditFixPositions(hwnd);
+}
+
+
 //=============================================================================
 //
 //  EditScrollTo()
@@ -4449,23 +4461,24 @@ void EditFixPositions(HWND hwnd)
 {
   UNUSED(hwnd);
 
-  DocPos iCurrentPos = SciCall_GetCurrentPos();
-  const DocPos iAnchorPos = SciCall_GetAnchor();
-  const DocPos iMaxPos = Sci_GetDocEndPosition();
+  DocPos const iCurrentPos = SciCall_GetCurrentPos();
+  DocPos const iAnchorPos = SciCall_GetAnchor();
+  DocPos const iMaxPos = Sci_GetDocEndPosition();
+  
+  DocPos iNewPos = iCurrentPos;
 
   if ((iCurrentPos > 0) && (iCurrentPos < iMaxPos)) 
   {
-    const DocPos iNewPos = SciCall_PositionAfter( SciCall_PositionBefore(iCurrentPos) );
+    iNewPos = SciCall_PositionAfter(SciCall_PositionBefore(iCurrentPos));
 
     if (iNewPos != iCurrentPos) {
       SciCall_SetCurrentPos(iNewPos);
-      iCurrentPos = iNewPos;
     }
   }
 
-  if ((iAnchorPos != iCurrentPos) && (iAnchorPos > 0) && (iAnchorPos < iMaxPos)) 
+  if ((iAnchorPos != iNewPos) && (iAnchorPos > 0) && (iAnchorPos < iMaxPos))
   {
-    const DocPos iNewPos = SciCall_PositionAfter(SciCall_PositionBefore(iAnchorPos));
+    iNewPos = SciCall_PositionAfter(SciCall_PositionBefore(iAnchorPos));
     if (iNewPos != iAnchorPos) { 
       SciCall_SetAnchor(iNewPos); 
     }
diff --git a/src/Edit.h b/src/Edit.h
index 097e92b0a..64160b381 100644
--- a/src/Edit.h
+++ b/src/Edit.h
@@ -77,6 +77,7 @@ void  EditScrollTo(HWND hwnd, DocLn iScrollToLine, int iSlop);
 void  EditSetSelectionEx(HWND hwnd, DocPos iAnchorPos, DocPos iCurrentPos, DocPos vSpcAnchor, DocPos vSpcCurrent);
 void  EditFixPositions(HWND hwnd);
 void  EditEnsureSelectionVisible(HWND hwnd);
+void	EditEnsureConsistentLineEndings(HWND hwnd);
 void  EditGetExcerpt(HWND hwnd,LPWSTR lpszExcerpt,DWORD cchExcerpt);
 
 HWND  EditFindReplaceDlg(HWND hwnd,LPCEDITFINDREPLACE lpefr,bool);
diff --git a/src/Encoding.c b/src/Encoding.c
index 748a213eb..c7ea3f371 100644
--- a/src/Encoding.c
+++ b/src/Encoding.c
@@ -109,7 +109,8 @@ int  Encoding_SrcWeak(int iSrcWeakEnc)
 // ============================================================================
 
 
-bool Encoding_HasChanged(int iOriginalEncoding) {
+bool Encoding_HasChanged(int iOriginalEncoding) 
+{
   static int OriginalEncoding = CPI_NONE;
 
   if (iOriginalEncoding >= CPI_NONE) {
diff --git a/src/Helpers.c b/src/Helpers.c
index 0905af6e8..0fa82b072 100644
--- a/src/Helpers.c
+++ b/src/Helpers.c
@@ -1928,7 +1928,6 @@ void TransformBackslashes(char* pszInput, bool bRegEx, UINT cpEdit, int* iReplac
 }
 
 
-
 void TransformMetaChars(char* pszInput, bool bRegEx, int iEOLMode)
 {
   if (!bRegEx)  return;
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 2b3130146..e0d983b8c 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -2677,16 +2677,17 @@ LRESULT MsgInitMenu(HWND hwnd, WPARAM wParam, LPARAM lParam)
   }
   CheckMenuRadioItem(hmenu,IDM_ENCODING_ANSI,IDM_ENCODING_UTF8SIGN,i,MF_BYCOMMAND);
 
-  if (Globals.iEOLMode == SC_EOL_CRLF) {
+  int const _eol_mode = SciCall_GetEOLMode();
+  if (_eol_mode == SC_EOL_CRLF) {
     i = IDM_LINEENDINGS_CRLF;
   }
-  else if (Globals.iEOLMode == SC_EOL_LF) {
-    i = IDM_LINEENDINGS_LF;
-  }
-  else {
+  else if (_eol_mode == SC_EOL_CR) {
     i = IDM_LINEENDINGS_CR;
   }
-  CheckMenuRadioItem(hmenu,IDM_LINEENDINGS_CRLF,IDM_LINEENDINGS_CR,i,MF_BYCOMMAND);
+  else {
+    i = IDM_LINEENDINGS_LF;
+  }
+  CheckMenuRadioItem(hmenu,IDM_LINEENDINGS_CRLF,IDM_LINEENDINGS_LF,i,MF_BYCOMMAND);
 
   EnableCmd(hmenu,IDM_FILE_RECENT,(MRU_Count(Globals.pFileMRU) > 0));
 
@@ -3312,9 +3313,9 @@ LRESULT MsgCommand(HWND hwnd, UINT umsg, WPARAM wParam, LPARAM lParam)
       {
         BeginWaitCursor(NULL);
         _IGNORE_NOTIFY_CHANGE_;
-        Globals.iEOLMode = (LOWORD(wParam)-IDM_LINEENDINGS_CRLF); // SC_EOL_CRLF(0), SC_EOL_CR(1), SC_EOL_LF(2)
-        SciCall_SetEOLMode(Globals.iEOLMode);
-        SciCall_ConvertEOLs(Globals.iEOLMode);
+        int const _eol_mode = (LOWORD(wParam)-IDM_LINEENDINGS_CRLF); // SC_EOL_CRLF(0), SC_EOL_CR(1), SC_EOL_LF(2)
+        SciCall_SetEOLMode(_eol_mode);
+        SciCall_ConvertEOLs(_eol_mode);
         EditFixPositions(Globals.hwndEdit);
         _OBSERVE_NOTIFY_CHANGE_;
         EndWaitCursor();
@@ -5940,7 +5941,8 @@ static void  _HandleAutoIndent(int const charAdded)
 {
   // TODO: handle indent after '{' and un-indent on '}' in C/C++ ?
   // in CRLF mode handle LF only...
-  if (((SC_EOL_CRLF == Globals.iEOLMode) && (charAdded != '\r')) || (SC_EOL_CRLF != Globals.iEOLMode))
+  int const _eol_mode = SciCall_GetEOLMode();
+  if (((SC_EOL_CRLF == _eol_mode) && (charAdded != '\r')) || (SC_EOL_CRLF != _eol_mode))
   {
     DocPos const iCurPos = SciCall_GetCurrentPos();
     DocLn const iCurLine = SciCall_LineFromPosition(iCurPos);
@@ -6464,14 +6466,15 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
               case STATUS_EOLMODE:
                 {
                   int i;
-                  if (Globals.iEOLMode == SC_EOL_CRLF)
+                  int const _eol_mode = SciCall_GetEOLMode();
+                  if (_eol_mode == SC_EOL_CRLF)
                     i = IDM_LINEENDINGS_CRLF;
-                  else if (Globals.iEOLMode == SC_EOL_LF)
-                    i = IDM_LINEENDINGS_LF;
-                  else
+                  else if (_eol_mode == SC_EOL_CR)
                     i = IDM_LINEENDINGS_CR;
-                  i++;
-                  if (i > IDM_LINEENDINGS_CR) { i = IDM_LINEENDINGS_CRLF; }
+                  else
+                    i = IDM_LINEENDINGS_LF;
+                  ++i;
+                  if (i > IDM_LINEENDINGS_LF) { i = IDM_LINEENDINGS_CRLF; }
                   PostMessage(hwnd, WM_COMMAND, MAKELONG(i, 1), 0);
                 }
                 return 1LL;
@@ -6842,7 +6845,7 @@ void LoadSettings()
     GET_BOOL_VALUE_FROM_INISECTION(LoadASCIIasUTF8, false);
     GET_BOOL_VALUE_FROM_INISECTION(LoadNFOasOEM, true);
     GET_BOOL_VALUE_FROM_INISECTION(NoEncodingTags, false);
-    GET_INT_VALUE_FROM_INISECTION(DefaultEOLMode, SC_EOL_CRLF, SC_EOL_CRLF, SC_EOL_LF);  Globals.iEOLMode = Settings.DefaultEOLMode;
+    GET_INT_VALUE_FROM_INISECTION(DefaultEOLMode, SC_EOL_CRLF, SC_EOL_CRLF, SC_EOL_LF);
     GET_BOOL_VALUE_FROM_INISECTION(WarnInconsistEOLs, true);
     GET_BOOL_VALUE_FROM_INISECTION(FixLineEndings, false);
     GET_BOOL_VALUE_FROM_INISECTION(FixTrailingBlanks, false);
@@ -8651,24 +8654,23 @@ static void  _UpdateStatusbarDelayed(bool bForceRedraw)
 
   static int s_iEOLMode = -1;
 
-  if (s_iStatusbarVisible[STATUS_EOLMODE])
+  if (s_iStatusbarVisible[STATUS_EOLMODE]) 
   {
-    if (s_iEOLMode != Globals.iEOLMode) {
-      if (Globals.iEOLMode == SC_EOL_CR)
-      {
-        StringCchPrintf(tchStatusBar[STATUS_EOLMODE], txtWidth, L"%sCR%s",
-          s_mxSBPrefix[STATUS_EOLMODE], s_mxSBPostfix[STATUS_EOLMODE]);
-      }
-      else if (Globals.iEOLMode == SC_EOL_LF)
-      {
+    int const _eol_mode = SciCall_GetEOLMode();
+    if (s_iEOLMode != _eol_mode) {
+      if (_eol_mode == SC_EOL_LF) {
         StringCchPrintf(tchStatusBar[STATUS_EOLMODE], txtWidth, L"%sLF%s",
-          s_mxSBPrefix[STATUS_EOLMODE], s_mxSBPostfix[STATUS_EOLMODE]);
+                        s_mxSBPrefix[STATUS_EOLMODE], s_mxSBPostfix[STATUS_EOLMODE]);
+      }
+      else if (_eol_mode == SC_EOL_CR) {
+        StringCchPrintf(tchStatusBar[STATUS_EOLMODE], txtWidth, L"%sCR%s",
+                        s_mxSBPrefix[STATUS_EOLMODE], s_mxSBPostfix[STATUS_EOLMODE]);
       }
       else {
         StringCchPrintf(tchStatusBar[STATUS_EOLMODE], txtWidth, L"%sCR+LF%s",
-          s_mxSBPrefix[STATUS_EOLMODE], s_mxSBPostfix[STATUS_EOLMODE]);
+                        s_mxSBPrefix[STATUS_EOLMODE], s_mxSBPostfix[STATUS_EOLMODE]);
       }
-      s_iEOLMode = Globals.iEOLMode;
+      s_iEOLMode = _eol_mode;
       bIsUpdateNeeded = true;
     }
   }
@@ -9187,7 +9189,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload, bool bSkipUnicodeDetect,
   bool fSuccess = false;
 
   EditFileIOStatus fioStatus = INIT_FILEIO_STATUS;
-  fioStatus.iEOLMode = Globals.iEOLMode;
+  fioStatus.iEOLMode = Settings.DefaultEOLMode;
 
   if (bNew || bReload) {
     if (EditToggleView(Globals.hwndEdit, false)) {
@@ -9211,8 +9213,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload, bool bSkipUnicodeDetect,
     FileVars_Init(NULL,0,&g_fvCurFile);
     EditSetNewText(Globals.hwndEdit, "", 0);
 
-    Globals.iEOLMode = Settings.DefaultEOLMode;
-    SciCall_SetEOLMode(Globals.iEOLMode);
+    SciCall_SetEOLMode(Settings.DefaultEOLMode);
     Encoding_Current(Settings.DefaultEncoding);
     Encoding_HasChanged(Settings.DefaultEncoding);
     
@@ -9287,8 +9288,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload, bool bSkipUnicodeDetect,
         FileVars_Init(NULL,0,&g_fvCurFile);
         EditSetNewText(Globals.hwndEdit,"",0);
         Style_SetDefaultLexer(Globals.hwndEdit);
-        Globals.iEOLMode = Settings.DefaultEOLMode;
-        SciCall_SetEOLMode(Globals.iEOLMode);
+        SciCall_SetEOLMode(Settings.DefaultEOLMode);
         if (Encoding_SrcCmdLn(CPI_GET) != CPI_NONE) {
           fioStatus.iEncoding = Encoding_SrcCmdLn(CPI_GET);
           Encoding_Current(fioStatus.iEncoding);
@@ -9319,10 +9319,6 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload, bool bSkipUnicodeDetect,
       fioStatus.iEncoding = Encoding_Current(CPI_GET);
 
     fSuccess = FileIO(true,szFileName,bSkipUnicodeDetect,bSkipANSICPDetection,&fioStatus,false);
-    if (fSuccess) {
-      Globals.iEOLMode = fioStatus.iEOLMode;
-      Encoding_Current(fioStatus.iEncoding); // load may change encoding
-    }
   }
   if (fSuccess) {
     StringCchCopy(Globals.CurrentFile,COUNTOF(Globals.CurrentFile),szFileName);
@@ -9335,9 +9331,10 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload, bool bSkipUnicodeDetect,
     if (!s_flagLexerSpecified) // flag will be cleared
       Style_SetLexerFromFile(Globals.hwndEdit,Globals.CurrentFile);
 
-    SciCall_SetEOLMode(Globals.iEOLMode);
-    fioStatus.iEncoding = Encoding_Current(CPI_GET);
+    SciCall_SetEOLMode(fioStatus.iEOLMode);
+    Encoding_Current(fioStatus.iEncoding); // load may change encoding
     Encoding_HasChanged(fioStatus.iEncoding);
+
     int idx = 0;
     DocPos iCaretPos = 0;
     LPCWSTR pszBookMarks = L"";
@@ -9407,7 +9404,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload, bool bSkipUnicodeDetect,
     {
       WCHAR szDefault[32];
       WCHAR szStatistic[80];
-      int const eolm = Globals.iEOLMode; //Settings.DefaultEOLMode;
+      int const eolm = SciCall_GetEOLMode(); //Settings.DefaultEOLMode;
       StringCchPrintf(szDefault, COUNTOF(szDefault), L"%s", 
         ((eolm == SC_EOL_CRLF) ? L"CRLF (\\r\\n)" : ((eolm == SC_EOL_CR) ? L"CR (\\r)" : L"LF (\\n)")));
       StringCchPrintf(szStatistic, COUNTOF(szStatistic), L">>> #CRLF = %i, #CR = %i,  #LF = %i <<<",
@@ -9495,7 +9492,7 @@ bool FileSave(bool bSaveAlways,bool bAsk,bool bSaveAs,bool bSaveCopy)
 
   EditFileIOStatus fioStatus = INIT_FILEIO_STATUS;
   fioStatus.iEncoding = Encoding_Current(CPI_GET);
-  fioStatus.iEOLMode = Globals.iEOLMode;
+  fioStatus.iEOLMode = SciCall_GetEOLMode();
 
   bool bIsEmptyNewFile = false;
   if (StringCchLenW(Globals.CurrentFile,COUNTOF(Globals.CurrentFile)) == 0) {
diff --git a/src/Styles.c b/src/Styles.c
index e34d99f0e..bc4a77ab5 100644
--- a/src/Styles.c
+++ b/src/Styles.c
@@ -601,10 +601,6 @@ void Style_SetLexer(HWND hwnd, PEDITLEXER pLexNew)
     SciCall_SetKeywords(i, pLexNew->pKeyWords->pszKeyWords[i]);
   }
 
-  // Idle Styling (very large text)
-  SendMessage(hwnd, SCI_SETIDLESTYLING, SC_IDLESTYLING_AFTERVISIBLE, 0);
-  //SendMessage(hwnd, SCI_SETIDLESTYLING, SC_IDLESTYLING_ALL, 0);  
-
   // --------------------------------------------------------------------------
 
   // Clear
diff --git a/src/TypeDefs.h b/src/TypeDefs.h
index bd5a90471..1e4c91d13 100644
--- a/src/TypeDefs.h
+++ b/src/TypeDefs.h
@@ -241,7 +241,6 @@ typedef struct _globals_t
   DPI_T     CurrentDPI;
   DPI_T     CurrentPPI;
   LANGID    iPrefLANGID;
-  int       iEOLMode;
   LPMRULIST pFileMRU;
   LPMRULIST pMRUfind;
   LPMRULIST pMRUreplace;
diff --git a/src/Version.h b/src/Version.h
index ddd4e9a6e..cb5c26d87 100644
Binary files a/src/Version.h and b/src/Version.h differ