diff --git a/src/Edit.c b/src/Edit.c
index 689d299c2..890c64ac3 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) {
@@ -1277,8 +1278,7 @@ bool EditSaveFile(
 
   // ensure consistent line endings
   if (Settings.FixLineEndings) {
-    SendMessage(hwnd,SCI_CONVERTEOLS, SciCall_GetEOLMode(),0);
-    EditFixPositions(hwnd);
+    EditEnsureConsistentLineEndings(hwnd);
   }
 
   // strip trailing blanks
@@ -4379,6 +4379,17 @@ void EditEnsureSelectionVisible(HWND hwnd)
 }
 
 
+//=============================================================================
+//
+//  EditEnsureConsistentLineEndings()
+//
+void EditEnsureConsistentLineEndings(HWND hwnd)
+{
+  SciCall_ConvertEOLs(SciCall_GetEOLMode());
+  EditFixPositions(hwnd);
+}
+
+
 //=============================================================================
 //
 //  EditScrollTo()
@@ -4434,23 +4445,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 21d3fdafc..6b961749c 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/Notepad3.c b/src/Notepad3.c
index f8a942e35..cbc14ff3b 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -1566,8 +1566,11 @@ static void  _InitializeSciEditCtrl(HWND hwndEditCtrl)
   SendMessage(hwndEditCtrl, SCI_SETADDITIONALCARETSBLINK, true, 0);
   SendMessage(hwndEditCtrl, SCI_SETADDITIONALCARETSVISIBLE, true, 0);
   SendMessage(hwndEditCtrl, SCI_SETVIRTUALSPACEOPTIONS, SCVS_NONE, 0);
+  // Idle Styling (very large text)
+  //~SendMessage(hwndEditCtrl, SCI_SETIDLESTYLING, SC_IDLESTYLING_ALL, 0);  
+  SendMessage(hwndEditCtrl, SCI_SETIDLESTYLING, SC_IDLESTYLING_AFTERVISIBLE, 0);
   SendMessage(hwndEditCtrl, SCI_SETLAYOUTCACHE, SC_CACHE_PAGE, 0);
-  SendMessage(hwndEditCtrl, SCI_SETCOMMANDEVENTS, false, 0); // SCI 4.1.3 : speedup folding
+  SendMessage(hwndEditCtrl, SCI_SETCOMMANDEVENTS, false, 0); // speedup folding
 
   // assign command keys
   SendMessage(hwndEditCtrl, SCI_ASSIGNCMDKEY, (SCK_NEXT + (SCMOD_CTRL << 16)), SCI_PARADOWN);
@@ -2677,10 +2680,11 @@ 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) {
+  else if (_eol_mode == SC_EOL_LF) {
     i = IDM_LINEENDINGS_LF;
   }
   else {
@@ -3312,10 +3316,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)
-        SendMessage(Globals.hwndEdit,SCI_SETEOLMODE,Globals.iEOLMode,0);
-        SendMessage(Globals.hwndEdit,SCI_CONVERTEOLS,Globals.iEOLMode,0);
-        EditFixPositions(Globals.hwndEdit);
+        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);
+        EditEnsureConsistentLineEndings(Globals.hwndEdit);
         _OBSERVE_NOTIFY_CHANGE_;
         EndWaitCursor();
         UpdateStatusbar(false);
@@ -5940,7 +5943,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);
@@ -6436,8 +6440,7 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
             switch (pnmm->dwItemSpec)
             {
               case STATUS_EOLMODE:
-                SendMessage(Globals.hwndEdit,SCI_CONVERTEOLS, SciCall_GetEOLMode(),0);
-                EditFixPositions(Globals.hwndEdit);
+                EditEnsureConsistentLineEndings(Globals.hwndEdit);
                 return 1LL;
 
               default:
@@ -6463,15 +6466,16 @@ LRESULT MsgNotify(HWND hwnd, WPARAM wParam, LPARAM lParam)
 
               case STATUS_EOLMODE:
                 {
+                  int const _eol_mode = SciCall_GetEOLMode();
                   int i;
-                  if (Globals.iEOLMode == SC_EOL_CRLF)
+                  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 +6846,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(FixLineEndings, false);
     GET_BOOL_VALUE_FROM_INISECTION(FixTrailingBlanks, false);
     GET_INT_VALUE_FROM_INISECTION(PrintHeader, 1, 0, 3);
@@ -8649,24 +8653,25 @@ 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;
     }
   }
@@ -9212,8 +9217,8 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload, bool bSkipUnicodeDetect,
     FileVars_Init(NULL,0,&g_fvCurFile);
     EditSetNewText(Globals.hwndEdit, "", 0);
 
-    Globals.iEOLMode = Settings.DefaultEOLMode;
-    SendMessage(Globals.hwndEdit,SCI_SETEOLMODE,Globals.iEOLMode,0);
+    int const _eol_mode = Settings.DefaultEOLMode;
+    SciCall_SetEOLMode(_eol_mode);
     Encoding_Current(Settings.DefaultEncoding);
     Encoding_HasChanged(Settings.DefaultEncoding);
     
@@ -9276,6 +9281,8 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload, bool bSkipUnicodeDetect,
   }
  
   // Ask to create a new file...
+  int _eol_mode = Settings.DefaultEOLMode;
+
   if (!bReload && !PathFileExists(szFileName))
   {
     if (s_flagQuietCreate || MsgBoxLng(MBYESNO,IDS_MUI_ASK_CREATE,szFileName) == IDYES) {
@@ -9288,8 +9295,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;
-        SendMessage(Globals.hwndEdit,SCI_SETEOLMODE,Globals.iEOLMode,0);
+        SciCall_SetEOLMode(Settings.DefaultEOLMode);
         if (Encoding_SrcCmdLn(CPI_GET) != CPI_NONE) {
           fileEncoding = Encoding_SrcCmdLn(CPI_GET);
           Encoding_Current(fileEncoding);
@@ -9319,7 +9325,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload, bool bSkipUnicodeDetect,
     else
       fileEncoding = Encoding_Current(CPI_GET);
 
-    fSuccess = FileIO(true,szFileName,bSkipUnicodeDetect,bSkipANSICPDetection,&fileEncoding,&Globals.iEOLMode,&bUnicodeErr,&bFileTooBig,&bUnknownExt,NULL,false);
+    fSuccess = FileIO(true,szFileName,bSkipUnicodeDetect,bSkipANSICPDetection,&fileEncoding,&_eol_mode,&bUnicodeErr,&bFileTooBig,&bUnknownExt,NULL,false);
     if (fSuccess)
       Encoding_Current(fileEncoding); // load may change encoding
   }
@@ -9334,7 +9340,7 @@ bool FileLoad(bool bDontSave, bool bNew, bool bReload, bool bSkipUnicodeDetect,
     if (!s_flagLexerSpecified) // flag will be cleared
       Style_SetLexerFromFile(Globals.hwndEdit,Globals.CurrentFile);
 
-    SendMessage(Globals.hwndEdit,SCI_SETEOLMODE,Globals.iEOLMode,0);
+    SciCall_SetEOLMode(_eol_mode);
     fileEncoding = Encoding_Current(CPI_GET);
     Encoding_HasChanged(fileEncoding);
     int idx = 0;
@@ -9554,7 +9560,8 @@ bool FileSave(bool bSaveAlways,bool bAsk,bool bSaveAs,bool bSaveCopy)
     if (SaveFileDlg(Globals.hwndMain,tchFile,COUNTOF(tchFile),tchInitialDir))
     {
       int fileEncoding = Encoding_Current(CPI_GET);
-      fSuccess = FileIO(false, tchFile, false, true, &fileEncoding, &Globals.iEOLMode, NULL, NULL, NULL, &bCancelDataLoss, bSaveCopy);
+      int _eol_mode = Settings.DefaultEOLMode;
+      fSuccess = FileIO(false, tchFile, false, true, &fileEncoding, &_eol_mode, NULL, NULL, NULL, &bCancelDataLoss, bSaveCopy);
       //~if (fSuccess) Encoding_Current(fileEncoding); // save should not change encoding
       if (fSuccess)
       {
@@ -9578,7 +9585,8 @@ bool FileSave(bool bSaveAlways,bool bAsk,bool bSaveAs,bool bSaveCopy)
   }
   else {
     int fileEncoding = Encoding_Current(CPI_GET);
-    fSuccess = FileIO(false, Globals.CurrentFile, false, true, &fileEncoding, &Globals.iEOLMode, NULL, NULL, NULL, &bCancelDataLoss, false);
+    int _eol_mode = Settings.DefaultEOLMode;
+    fSuccess = FileIO(false, Globals.CurrentFile, false, true, &fileEncoding, &_eol_mode, NULL, NULL, NULL, &bCancelDataLoss, false);
     //~if (fSuccess) Encoding_Current(fileEncoding); // save should not change encoding
   }
 
@@ -9621,8 +9629,9 @@ bool FileSave(bool bSaveAlways,bool bAsk,bool bSaveAs,bool bSaveCopy)
 
         if (GetTempPath(MAX_PATH,lpTempPathBuffer) &&
             GetTempFileName(lpTempPathBuffer,TEXT("NP3"),0,szTempFileName)) {
+          int _eol_mode = Settings.DefaultEOLMode;
           int fileEncoding = Encoding_Current(CPI_GET);
-          if (FileIO(false,szTempFileName,false,true,&fileEncoding,&Globals.iEOLMode,NULL,NULL,NULL,&bCancelDataLoss,true)) {
+          if (FileIO(false,szTempFileName,false,true,&fileEncoding,&_eol_mode,NULL,NULL,NULL,&bCancelDataLoss,true)) {
             //~Encoding_Current(fileEncoding); // save should not change encoding
             WCHAR szArguments[2048] = { L'\0' };
             LPWSTR lpCmdLine = GetCommandLine();
diff --git a/src/SciCall.h b/src/SciCall.h
index c4d9b40a9..d3f4874ba 100644
--- a/src/SciCall.h
+++ b/src/SciCall.h
@@ -227,6 +227,8 @@ DeclareSciCallR1(PositionBefore, POSITIONBEFORE, DocPos, DocPos, position)
 DeclareSciCallR1(PositionAfter, POSITIONAFTER, DocPos, DocPos, position)
 DeclareSciCallR1(GetCharAt, GETCHARAT, char, DocPos, position)
 DeclareSciCallR0(GetEOLMode, GETEOLMODE, int)
+DeclareSciCallV1(SetEOLMode, SETEOLMODE, int, eolmode)
+DeclareSciCallV1(ConvertEOLs, CONVERTEOLS, int, eolmode)
 
 DeclareSciCallV0(SetCharsDefault, SETCHARSDEFAULT)
 DeclareSciCallV01(SetWordChars, SETWORDCHARS, const char*, chrs)
diff --git a/src/Styles.c b/src/Styles.c
index 340d15514..98ea87a61 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 916a58db3..0deb5a25d 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