diff --git a/src/main.c b/src/main.c
index 55ccc316c..3a056b69d 100644
--- a/src/main.c
+++ b/src/main.c
@@ -825,7 +825,7 @@ static menu_entry LeftMenu[] = {
     {' ', "", NULL_HOTKEY, 0},
     {' ', N_("&Filter..."), NULL_HOTKEY, filter_cmd},
     {' ', "",NULL_HOTKEY, 0},
-    {' ', N_("&Encoding..."), NULL_HOTKEY, encoding_cmd},
+    {' ', N_("&Encoding...    C-t"), 'C', encoding_cmd},
 #ifdef USE_NETCODE
     {' ', "", NULL_HOTKEY, 0},
 #ifdef WITH_MCFS
@@ -851,7 +851,7 @@ static menu_entry RightMenu[] = {
     {' ', "", NULL_HOTKEY, 0},
     {' ', N_("&Filter..."), NULL_HOTKEY, filter_cmd},
     {' ', "",NULL_HOTKEY, 0},
-    {' ', N_("&Encoding..."), NULL_HOTKEY, encoding_cmd},
+    {' ', N_("&Encoding...    C-t"), 'C', encoding_cmd},
 #ifdef USE_NETCODE
     {' ', "", NULL_HOTKEY, 0},
 #ifdef WITH_MCFS
diff --git a/src/screen.c b/src/screen.c
index f7f3f1a4f..3983ba8fa 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -2196,7 +2196,8 @@ static const panel_key_map panel_keymap [] = {
     { XCTRL('n'), move_down },		/* C-n like emacs */
     { XCTRL('s'), start_search },	/* C-s like emacs */
     { ALT('s'),   start_search },	/* M-s not like emacs */
-    { XCTRL('t'), mark_file },
+/*    { XCTRL('t'), mark_file },*/
+    { XCTRL('t'), encoding_cmd },
     { ALT('o'),   chdir_other_panel },
     { ALT('i'),   sync_other_panel },
     { ALT('l'),   chdir_to_readlink },
diff --git a/src/strutil.c b/src/strutil.c
index c3d598497..4b9501b9e 100644
--- a/src/strutil.c
+++ b/src/strutil.c
@@ -106,14 +106,16 @@ _str_convert (GIConv coder, char *string, int size, GString * buffer)
     gsize bytes_read, bytes_written;
     GError *error = NULL;
     errno = 0;
+
     if (string == NULL || buffer == NULL)
 	return ESTR_FAILURE;
 
+/*
     if (! used_class.is_valid_string (string))
     {
-    return ESTR_FAILURE;
+	return ESTR_FAILURE;
     }
-
+*/
     state = 0;
     if (size < 0)
     {
@@ -208,7 +210,8 @@ _str_convert (GIConv coder, char *string, int size, GString * buffer)
 	{
 	    if (tmp_buff != NULL)
 	    {
-		if (*tmp_buff){
+		if (*tmp_buff)
+		{
 		    g_string_append (buffer, tmp_buff);
 		    g_free (tmp_buff);
 		    string += bytes_read;