--- a/src/com/five_ten_sg/connectbot/service/TerminalKeyListener.java	Wed Jun 11 10:03:40 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/service/TerminalKeyListener.java	Wed Jun 11 10:11:29 2014 -0700
@@ -17,6 +17,7 @@
 package com.five_ten_sg.connectbot.service;
 
 import java.io.IOException;
+import java.nio.charset.Charset;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
@@ -83,6 +84,7 @@
     private final TerminalManager manager;
     private final TerminalBridge bridge;
     private final vt320 buffer;
+    private       String encoding;
 
     private String keymode = null;
     private boolean hardKeyboard = false;
@@ -98,7 +100,6 @@
     private boolean selectingForCopy = false;
     private final SelectionArea selectionArea;
 
-    private String encoding;
 
     private final SharedPreferences prefs;
 
@@ -902,8 +903,8 @@
         this.encoding = encoding;
     }
 
-    public String getCharset() {
-        return encoding;
+    public Charset getCharset() {
+        return Charset.forName(encoding);
     }
 
     private void ctrlKeySpecial() {

--- a/src/org/tn5250j/framework/tn5250/KeyStrokenizer.java	Wed Jun 11 10:03:40 2014 -0700
+++ b/src/org/tn5250j/framework/tn5250/KeyStrokenizer.java	Wed Jun 11 10:11:29 2014 -0700
@@ -27,10 +27,10 @@
 
 public class KeyStrokenizer {
     private static final String TAG = "KeyStrokenizer";
-   private StringBuffer keyStrokes;
-   private StringBuffer sb;
-   private int index;
-   private int length;
+    private StringBuffer keyStrokes;
+    private StringBuffer sb;
+    private int index;
+    private int length;