--- a/src/com/five_ten_sg/connectbot/service/TerminalBridge.java	Tue Jun 03 16:05:21 2014 -0700
+++ b/src/com/five_ten_sg/connectbot/service/TerminalBridge.java	Tue Jun 10 12:00:07 2014 -0700
@@ -318,20 +318,18 @@
      */
     protected void startConnection() {
         transport   = TransportFactory.getTransport(host.getProtocol());
-        keyListener = transport.getTerminalKeyListener(manager, this, buffer, host.getEncoding());
+        transport.setLinks(manager, this, host, buffer, emulation);
+
+        keyListener = transport.getTerminalKeyListener();
 
         String monitor_init = host.getMonitor();
         if ((monitor_init != null) && (monitor_init.length() > 0)) {
             monitor = new TerminalMonitor(manager, buffer, keyListener, parent, monitor_init);
         }
 
-        transport.setBridge(this);
-        transport.setManager(manager);
-        transport.setHost(host);
         transport.setCompression(host.getCompression());
         transport.setHttpproxy(host.getHttpproxy());
         transport.setUseAuthAgent(host.getUseAuthAgent());
-        transport.setEmulation(emulation);
 
         if (transport.canForwardPorts()) {
             for (PortForwardBean portForward : manager.hostdb.getPortForwardsForHost(host))
@@ -431,8 +429,6 @@
         buffer.reset();
         // We no longer need our local output.
         localOutput.clear();
-        // previously tried vt100 and xterm for emulation modes
-        // "screen" works the best for color and escape codes
         buffer.setAnswerBack(emulation);
 
         if (HostDatabase.DELKEY_BACKSPACE.equals(host.getDelKey()))