diff --git a/docs/notework.txt b/docs/notework.txt
index 2b3de5a..80eb6d1 100644
--- a/docs/notework.txt
+++ b/docs/notework.txt
@@ -10,6 +10,8 @@ ______________________________________________________________________
                Notes for GoldED+ 1.1.5, /snapshot/
 ______________________________________________________________________
 
+- Fixed charset level detection. Text will not be translate if level > 2.
+
 - Placed AKAMatchManually after all aka matching logic.
 
 - Fixed buffer overun for too wide menus.
diff --git a/golded3/gectrl.cpp b/golded3/gectrl.cpp
index 0b89d79..5c6d289 100644
--- a/golded3/gectrl.cpp
+++ b/golded3/gectrl.cpp
@@ -140,8 +140,11 @@ char* mime_header_encode(char* dest, const char* source, GMsg* msg) {
   const char* lp;
   char* temp_src = (char*)throw_malloc(4096);
 
-  if(*msg->charset) {
-    if((msg->charsetlevel&3) and ChsTP) {
+  if(*msg->charset)
+  {
+    int level = msg->charsetlevel;
+    if (((level == 1) || (level == 2)) && ChsTP)
+    {
       char chln, *d = temp_src;
 
       for(uint len = 0; *s; s++) {
diff --git a/golded3/geline.cpp b/golded3/geline.cpp
index f783fa5..1f60ee7 100644
--- a/golded3/geline.cpp
+++ b/golded3/geline.cpp
@@ -1856,7 +1856,9 @@ char* XlatStr(char* dest, const char* src, int level, Chs* chrtbl, int qpencoded
       defaultchardo:
         dochar = *sptr++;
       chardo:
-        if((level&3) and chrs) {   // Translate level 1 and 2
+        // Translate level 1 and 2
+        if (((level == 1) || (level == 2)) && chrs)
+        {
           tptr = (char*)chrs[(byte)dochar];
           clen = *tptr++;
           while(clen--)
@@ -2067,8 +2069,11 @@ void MakeLineIndex(GMsg* msg, int margin, bool getvalue, bool header_recode) {
           qptr = qbuf;
           reflow = false;
           // Insert previous quotestring
-          for(n=0; n<qlen; n++) {
-            if((level&3) and ChsTP) {   // Translate level 1 and 2
+          for(n=0; n<qlen; n++)
+          {
+            // Translate level 1 and 2
+            if (((level == 1) || (level == 2)) && ChsTP)
+            {
               tptr = (char*)ChsTP[(byte)(*qptr++)];
               chln = *tptr++;
               while(chln--) {
@@ -2510,7 +2515,9 @@ void MakeLineIndex(GMsg* msg, int margin, bool getvalue, bool header_recode) {
             defaultchardo:
               dochar = *ptr++;
             chardo:
-              if((level&3) and ChsTP) {   // Translate level 1 and 2
+              // Translate level 1 and 2
+              if (((level == 1) || (level == 2)) && ChsTP)
+              {
                 tptr = (char*)ChsTP[(byte)dochar];
                 chln = *tptr++;
                 while(chln--) {