diff --git a/src/Edit.c b/src/Edit.c
index 737280f31..5d05574e0 100644
--- a/src/Edit.c
+++ b/src/Edit.c
@@ -1087,24 +1087,25 @@ bool EditLoadFile(
   // --------------------------------------------------------------------------
   bool bIsReliable = false;
   float confidence = 0.0f;
-  float const reliability_threshold = 0.50f;
+  float const reliability_threshold = 0.51f;
 
   char origUCHARDET[256] = { '\0' };
-  reliability_threshold;
   int const iAnalyzedEncoding_UCD = Encoding_Analyze_UCHARDET(lpData, cbNbytes4Analysis, &confidence, origUCHARDET, 256);
   float const confidence_UCD = confidence;
   int const iAnalyzedEncoding_CED = Encoding_Analyze_CED(lpData, cbNbytes4Analysis, iPreferedEncoding, &bIsReliable);
 
   // ------------------------------------------------------
   // calculate reliability
-  confidence = confidence_UCD;
-  int iAnalyzedEncoding = iAnalyzedEncoding_UCD;
 
-  float const ced_confidence = bIsReliable ? reliability_threshold + 0.25f : 0.25f;
+  float const ced_confidence = bIsReliable ? 0.70f : 0.20f;
+
+  int iAnalyzedEncoding = iAnalyzedEncoding_UCD;
+  float const bonus = (iAnalyzedEncoding == iPreferedEncoding) ? (1.0f - confidence_UCD) / 2.0f : 0.0f;
+  confidence = confidence_UCD + bonus;
 
   if (iAnalyzedEncoding == iAnalyzedEncoding_CED) {
     if (!Encoding_IsNONE(iAnalyzedEncoding)) {
-      confidence = (confidence + ced_confidence + 0.25f) / 2.0f;
+      confidence = (confidence + ced_confidence) / 2.0f;
     }
   }
   else { // ambiguous results
diff --git a/src/Notepad3.c b/src/Notepad3.c
index 5f50b7928..5a6268bb0 100644
--- a/src/Notepad3.c
+++ b/src/Notepad3.c
@@ -10431,7 +10431,7 @@ void ShowZoomCallTip()
   SciCall_CallTipShow(iPos, chToolTip);
   SciCall_SetXOffset(iXOff);
   Globals.CallTipType = CT_ZOOM;
-  _DelayClearZoomCallTip(2000);
+  _DelayClearZoomCallTip(3600);
 }