diff --git a/golded3/gectrl.cpp b/golded3/gectrl.cpp
index e44b395..65188d0 100644
--- a/golded3/gectrl.cpp
+++ b/golded3/gectrl.cpp
@@ -158,7 +158,7 @@ char* mime_header_encode(char* dest, const char* source, GMsg* msg) {
   if(*msg->charset)
   {
     int level = msg->charsetlevel;
-    if (((level == 1) || (level == 2)) && ChsTP)
+    if (ChsTP)
     {
       char chln, *d = temp_src;
 
diff --git a/golded3/geline.cpp b/golded3/geline.cpp
index f0be266..4aa78eb 100644
--- a/golded3/geline.cpp
+++ b/golded3/geline.cpp
@@ -1887,7 +1887,6 @@ char* XlatStr(char* dest, const char* src, int level, Chs* chrtbl, int qpencoded
       defaultchardo:
         dochar = *sptr++;
       chardo:
-        // Translate level 1 and 2
         #ifdef HAS_ICONV
         if( iconv_cd!=(iconv_t)(-1) ){
           unsigned srcleft=1;
@@ -1913,7 +1912,7 @@ char* XlatStr(char* dest, const char* src, int level, Chs* chrtbl, int qpencoded
         else
         #endif
 
-        if (((level == 1) || (level == 2)) && chrs)
+        if (chrs)
         {
           tptr = (char*)chrs[(byte)dochar];
           clen = *tptr++;
@@ -2128,8 +2127,7 @@ void MakeLineIndex(GMsg* msg, int margin, bool getvalue, bool header_recode) {
           // Insert previous quotestring
           for(n=0; n<qlen; n++)
           {
-            // Translate level 1 and 2
-            if (((level == 1) || (level == 2)) && ChsTP)
+            if (ChsTP)
             {
               tptr = (char*)ChsTP[(byte)(*qptr++)];
               chln = *tptr++;
@@ -2605,8 +2603,7 @@ void MakeLineIndex(GMsg* msg, int margin, bool getvalue, bool header_recode) {
             defaultchardo:
               dochar = *ptr++;
             chardo:
-              // Translate level 1 and 2
-              if (((level == 1) || (level == 2)) && ChsTP)
+              if (ChsTP)
               {
                 tptr = (char*)ChsTP[(byte)dochar];
                 chln = *tptr++;