diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..8da9835
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+.idea/*
+libs/*
+obj/*
+out/*
+gen/*
\ No newline at end of file
diff --git a/Synergy.apk b/Synergy.apk
new file mode 100644
index 0000000..92aa0f0
Binary files /dev/null and b/Synergy.apk differ
diff --git a/res/layout/main.xml b/res/layout/main.xml
index 3f4fa7d..368c929 100755
--- a/res/layout/main.xml
+++ b/res/layout/main.xml
@@ -1,102 +1,110 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-                android:layout_width="fill_parent" 
-                android:layout_height="wrap_content" android:padding="10px">
-
-	<TextView android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:text="Synergy Client name:"
-               android:id="@+id/clientNameTextView"/>
-
-    <EditText android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:background="@android:drawable/editbox_background"
-              android:text="android"
-              android:layout_below="@id/clientNameTextView"
-              android:id="@+id/clientNameEditText"/>
-	
-	<TextView android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:text="Server IP/Hostname:"
-              android:layout_below="@id/clientNameEditText"
-              android:id="@+id/serverHostTextView"/>
-
-    <EditText android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:background="@android:drawable/editbox_background"
-              android:text="igsarmewmactck"
-              android:layout_below="@id/serverHostTextView"
-              android:id="@+id/serverHostEditText"/>
-
-    <TextView android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:text="Server Port:"
-              android:layout_below="@id/serverHostEditText"
-              android:id="@+id/serverPortTextView"/>
+    android:layout_width="fill_parent"
+    android:layout_height="wrap_content" android:padding="10px">
+
+    <TextView android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Synergy Client name:"
+        android:id="@+id/clientNameTextView"/>
+
+    <EditText android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:drawable/editbox_background"
+        android:text="android"
+        android:layout_below="@id/clientNameTextView"
+        android:id="@+id/clientNameEditText"/>
+
+    <TextView android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Server IP/Hostname:"
+        android:layout_below="@id/clientNameEditText"
+        android:id="@+id/serverHostTextView"/>
+
+    <EditText android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:drawable/editbox_background"
+        android:text="igsarmewmactck"
+        android:layout_below="@id/serverHostTextView"
+        android:id="@+id/serverHostEditText"/>
+
+    <TextView android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Server Port:"
+        android:layout_below="@id/serverHostEditText"
+        android:id="@+id/serverPortTextView"/>
 
     <EditText android:id="@+id/serverPortEditText"
-              android:layout_width="fill_parent"
-              android:layout_height="wrap_content"
-              android:layout_below="@id/serverPortTextView"
-              android:background="@android:drawable/editbox_background"
-              android:inputType="number"
-              android:text="24800" />
-
-    <TextView android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:text="Input device name:"
-              android:layout_below="@+id/serverPortEditText"
-              android:id="@+id/inputDeviceTextView"/>
-
-    <EditText android:layout_width="fill_parent" 
-              android:layout_height="wrap_content" 
-              android:background="@android:drawable/editbox_background"
-              android:text="touchscreen"
-              android:layout_below="@+id/inputDeviceTextView"
-              android:id="@+id/inputDeviceEditText"/>
-
-    <Button android:layout_width="wrap_content" 
-            android:layout_height="wrap_content"
-            android:layout_below="@+id/inputDeviceEditText"
-            android:layout_alignParentRight="true"
-            android:text="Connect" 
-            android:id="@+id/connectButton"/>
-    
-<!--    <TabHost xmlns:android="http://schemas.android.com/apk/res/android"-->
-<!--    android:id="@android:id/tabhost"-->
-<!--    android:layout_width="fill_parent"-->
-<!--    android:layout_height="fill_parent"-->
-<!--    android:layout_below="@id/test">-->
-<!--    	<LinearLayout-->
-<!--        android:orientation="vertical"-->
-<!--        android:layout_width="fill_parent"-->
-<!--        android:layout_height="fill_parent"-->
-<!--        android:padding="5dp">-->
-<!--        <TabWidget-->
-<!--            android:id="@android:id/tabs"-->
-<!--            android:layout_width="fill_parent"-->
-<!--            android:layout_height="wrap_content" />-->
-<!--        <FrameLayout-->
-<!--            android:id="@android:id/tabcontent"-->
-<!--            android:layout_width="fill_parent"-->
-<!--            android:layout_height="fill_parent"-->
-<!--            android:padding="5dp" />-->
-<!--    </LinearLayout>-->
-<!--</TabHost>-->
-<!--    -->
-    <LinearLayout android:layout_width="fill_parent" 
-                android:layout_height="fill_parent"
-                android:layout_below="@id/connectButton">
-    	
-    	<EditText android:id="@+id/outputEditText"
-    			  android:layout_width="fill_parent" 
-            	  android:layout_height="fill_parent"
-            	  android:background="@android:drawable/editbox_background"/>
-                        
-    
-                
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_below="@id/serverPortTextView"
+        android:background="@android:drawable/editbox_background"
+        android:inputType="number"
+        android:text="24800" />
+
+    <TextView android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="Input device name:"
+        android:layout_below="@+id/serverPortEditText"
+        android:id="@+id/inputDeviceTextView"/>
+
+    <EditText android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:drawable/editbox_background"
+        android:text="touchscreen"
+        android:layout_below="@+id/inputDeviceTextView"
+        android:id="@+id/inputDeviceEditText"/>
+
+    <Button android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/inputDeviceEditText"
+        android:layout_alignParentRight="true"
+        android:text="Connect"
+        android:id="@+id/connectButton"/>
+
+    <!--    <TabHost xmlns:android="http://schemas.android.com/apk/res/android"-->
+    <!--    android:id="@android:id/tabhost"-->
+    <!--    android:layout_width="fill_parent"-->
+    <!--    android:layout_height="fill_parent"-->
+    <!--    android:layout_below="@id/test">-->
+    <!--    	<LinearLayout-->
+    <!--        android:orientation="vertical"-->
+    <!--        android:layout_width="fill_parent"-->
+    <!--        android:layout_height="fill_parent"-->
+    <!--        android:padding="5dp">-->
+    <!--        <TabWidget-->
+    <!--            android:id="@android:id/tabs"-->
+    <!--            android:layout_width="fill_parent"-->
+    <!--            android:layout_height="wrap_content" />-->
+    <!--        <FrameLayout-->
+    <!--            android:id="@android:id/tabcontent"-->
+    <!--            android:layout_width="fill_parent"-->
+    <!--            android:layout_height="fill_parent"-->
+    <!--            android:padding="5dp" />-->
+    <!--    </LinearLayout>-->
+    <!--</TabHost>-->
+    <!--    -->
+    <LinearLayout android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/connectButton">
+
+        <EditText android:id="@+id/outputEditText"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:background="@android:drawable/editbox_background"/>
+
+
+
     </LinearLayout>
-    
 
-    
+    <CheckBox
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Auto-Reconnect"
+        android:id="@+id/autoReconnectCheckbox"
+        android:layout_alignTop="@+id/connectButton"
+        android:layout_alignParentLeft="true"
+        android:checked="true" />
+
+
 </RelativeLayout>
diff --git a/src/org/synergy/Synergy.java b/src/org/synergy/Synergy.java
index 3ac5e00..66bc4cd 100755
--- a/src/org/synergy/Synergy.java
+++ b/src/org/synergy/Synergy.java
@@ -20,6 +20,7 @@
 package org.synergy;
 
 import org.synergy.base.Event;
+import org.synergy.base.EventJobInterface;
 import org.synergy.base.EventQueue;
 import org.synergy.base.EventType;
 import org.synergy.base.Log;
@@ -34,126 +35,189 @@
 import android.app.Activity;
 import android.content.SharedPreferences;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
 import android.view.Display;
 import android.view.View;
 import android.view.WindowManager;
 import android.widget.Button;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.EditText;
 
 public class Synergy extends Activity {
-	
+
 	private final static String PROP_clientName = "clientName";
 	private final static String PROP_serverHost = "serverHost";
 	private final static String PROP_deviceName = "deviceName";
-	
+
 	private Thread mainLoopThread = null;
-	
+	private Handler mainHandler = null;
+	private Client client;
+	private boolean autoReconnect;
 	static {
 		System.loadLibrary ("synergy-jni");
 	}
-	
+
 	private class MainLoopThread extends Thread {
-		
+
 		public void run () {
+			//runOnUiThread(new Runnable() {
+			//@Override
+			//public void run() {
 			try {
-		        Event event = new Event ();
-		        event = EventQueue.getInstance ().getEvent (event, -1.0);
-		        Log.note ("Event grabbed");
-		        while (event.getType () != EventType.QUIT && mainLoopThread == Thread.currentThread()) {
-		            EventQueue.getInstance ().dispatchEvent (event);
-		            // TODO event.deleteData ();
-		            event = EventQueue.getInstance ().getEvent (event, -1.0);
-		            Log.note ("Event grabbed");
-		        } 
+				Event event = new Event ();
+				event = EventQueue.getInstance ().getEvent (event, -1.0);
+				Log.note ("Events grabbed...");
+				while (event.getType () != EventType.QUIT && mainLoopThread == Thread.currentThread()) {
+					Log.note("Event grabbed - type=" + event.getType() + ";target=" + event.getTarget());
+					if (event.getType() == EventType.CLIENT_RECONNECT_DISABLED)
+					{
+						disableClientReconnect();
+					}
+					else if (event.getType() == EventType.CLIENT_RECONNECT_ENABLED)
+					{
+						enableClientReconnect();
+					}
+					else
+					{
+						EventQueue.getInstance ().dispatchEvent(event);
+					}
+					// TODO event.deleteData ();
+					event = EventQueue.getInstance ().getEvent (event, -1.0);
+				}
 				mainLoopThread = null;
 			} catch (Exception e) {
 				e.printStackTrace ();
 			} finally {
 				Injection.stop();
 			}
+			//}
+			//});
 		}
 	}
-	
-	
-    /** Called when the activity is first created. */
-    @Override
-    public void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.main);
-       
-        SharedPreferences preferences = getPreferences(MODE_PRIVATE);
-        String clientName = preferences.getString(PROP_clientName, null);
-        if (clientName != null) {
-        	((EditText) findViewById (R.id.clientNameEditText)).setText(clientName);
-        }
-    	String serverHost = preferences.getString(PROP_serverHost, null);
-        if (serverHost != null) {
-        	((EditText) findViewById (R.id.serverHostEditText)).setText(serverHost);
-        }
-        
-        final Button connectButton = (Button) findViewById (R.id.connectButton);    
-        connectButton.setOnClickListener (new View.OnClickListener() {
-			public void onClick (View arg) {
-				connect ();
+
+	private void enableClientReconnect() {
+		mainHandler.post(new Runnable() {
+			@Override
+			public void run() {
+				final CheckBox reconnectCheckbox = (CheckBox) findViewById(R.id.autoReconnectCheckbox);
+				autoReconnect = true;
+				reconnectCheckbox.setChecked(true);
+			}
+		});
+	}
+
+	private void disableClientReconnect() {
+		mainHandler.post(new Runnable() {
+			@Override
+			public void run() {
+				final CheckBox reconnectCheckbox = (CheckBox) findViewById(R.id.autoReconnectCheckbox);
+				autoReconnect = false;
+				reconnectCheckbox.setChecked(false);
+			}
+		});
+	}
+
+	/** Called when the activity is first created. */
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		setContentView(R.layout.main);
+		mainHandler = new Handler(Looper.getMainLooper());
+		autoReconnect = true;
+		SharedPreferences preferences = getPreferences(MODE_PRIVATE);
+		String clientName = preferences.getString(PROP_clientName, null);
+		if (clientName != null) {
+			((EditText) findViewById (R.id.clientNameEditText)).setText(clientName);
+		}
+		String serverHost = preferences.getString(PROP_serverHost, null);
+		if (serverHost != null) {
+			((EditText) findViewById (R.id.serverHostEditText)).setText(serverHost);
+		}
+
+		final Button connectButton = (Button) findViewById (R.id.connectButton);
+		connectButton.setOnClickListener(new View.OnClickListener() {
+			public void onClick(View arg) {
+				connect();
 			}
 		});
-        
-        Log.setLogLevel (Log.Level.INFO);
-        
-        Log.debug ("Client starting....");
 
-        try {
+		final CheckBox reconnectCheckbox = (CheckBox) findViewById(R.id.autoReconnectCheckbox);
+		reconnectCheckbox.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() {
+			@Override
+			public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+				autoReconnect = isChecked;
+				if (client != null) client.setAutoReconnect(isChecked);
+			}
+		});
+		Log.setLogLevel (Log.Level.DEBUG);
+
+		Log.debug ("Client starting....");
+
+	}
+
+	/** Called when the activity comes into the foreground. */
+	@Override
+	public void onResume() {
+		super.onResume();
+		Log.debug("onResume - "+client);
+		try {
 			Injection.setPermissionsForInputDevice();
+			if (client != null && client.getAutoReconnect())
+			{
+				client.connect();
+			}
 		} catch (Exception e) {
 			// TODO handle exception
 		}
-    }
-    
-    private void connect () {
-    	
-    	String clientName = ((EditText) findViewById (R.id.clientNameEditText)).getText().toString();
-    	String ipAddress = ((EditText) findViewById (R.id.serverHostEditText)).getText().toString();
-    	String portStr = ((EditText) findViewById(R.id.serverPortEditText)).getText().toString();
-    	int port = Integer.parseInt(portStr);
-    	String deviceName = ((EditText) findViewById(R.id.inputDeviceEditText)).getText().toString();
-    	
-    	SharedPreferences preferences = getPreferences(MODE_PRIVATE);
-    	SharedPreferences.Editor preferencesEditor = preferences.edit();
-    	preferencesEditor.putString(PROP_clientName, clientName);
-    	preferencesEditor.putString(PROP_serverHost, ipAddress);
-    	preferencesEditor.putString(PROP_deviceName, deviceName);
-    	preferencesEditor.commit();
-    	
-        try {
-        	SocketFactoryInterface socketFactory = new TCPSocketFactory();
-       	   	NetworkAddress serverAddress = new NetworkAddress (ipAddress, port);
-        	serverAddress.resolve ();
-
-        	Injection.startInjection(deviceName);
-
-        	BasicScreen basicScreen = new BasicScreen();
-        	
-        	WindowManager wm = getWindowManager();
-        	 
-        	Display display = wm.getDefaultDisplay ();
-        	basicScreen.setShape (display.getWidth (), display.getHeight ());
-        	
-        	
-        	//PlatformIndependentScreen screen = new PlatformIndependentScreen(basicScreen);
-            
-            Log.debug ("Hostname: " + clientName);
-            
-			Client client = new Client (getApplicationContext(), clientName, serverAddress, socketFactory, null, basicScreen);
-			client.connect ();
+	}
+
+	private void connect () {
+
+		String clientName = ((EditText) findViewById (R.id.clientNameEditText)).getText().toString();
+		String ipAddress = ((EditText) findViewById (R.id.serverHostEditText)).getText().toString();
+		String portStr = ((EditText) findViewById(R.id.serverPortEditText)).getText().toString();
+		int port = Integer.parseInt(portStr);
+		String deviceName = ((EditText) findViewById(R.id.inputDeviceEditText)).getText().toString();
+
+		SharedPreferences preferences = getPreferences(MODE_PRIVATE);
+		SharedPreferences.Editor preferencesEditor = preferences.edit();
+		preferencesEditor.putString(PROP_clientName, clientName);
+		preferencesEditor.putString(PROP_serverHost, ipAddress);
+		preferencesEditor.putString(PROP_deviceName, deviceName);
+		preferencesEditor.commit();
+
+		try {
+			SocketFactoryInterface socketFactory = new TCPSocketFactory();
+			NetworkAddress serverAddress = new NetworkAddress (ipAddress, port);
+			serverAddress.resolve ();
+
+			Injection.startInjection(deviceName);
+
+			BasicScreen basicScreen = new BasicScreen();
+
+			WindowManager wm = getWindowManager();
+
+			Display display = wm.getDefaultDisplay ();
+			basicScreen.setShape(display.getWidth(), display.getHeight());
+
+
+			//PlatformIndependentScreen screen = new PlatformIndependentScreen(basicScreen);
+
+			Log.debug("Hostname: " + clientName);
+
+			client = new Client (getApplicationContext(), clientName, serverAddress, socketFactory, null, basicScreen, autoReconnect);
+			client.connect();
 
 			if (mainLoopThread == null) {
 				mainLoopThread = new MainLoopThread();
 				mainLoopThread.start();
 			}
-			
-        } catch (Exception e) {
-        	e.printStackTrace();
-        	((EditText) findViewById (R.id.outputEditText)).setText("Connection Failed.");
-        }
-    }
+
+		} catch (Exception e) {
+			e.printStackTrace();
+			((EditText) findViewById (R.id.outputEditText)).setText("Connection Failed.");
+		}
+	}
 }
diff --git a/src/org/synergy/base/EventType.java b/src/org/synergy/base/EventType.java
index 1a474f4..ef8d355 100644
--- a/src/org/synergy/base/EventType.java
+++ b/src/org/synergy/base/EventType.java
@@ -58,6 +58,8 @@ public enum EventType {
     CLIENT_CONNECTED,
     CLIENT_CONNECT_FAILED,
     CLIENT_DISCONNECTED,
+    CLIENT_RECONNECT_ENABLED,
+    CLIENT_RECONNECT_DISABLED,
 
 
     SHAPE_CHANGED,
diff --git a/src/org/synergy/client/Client.java b/src/org/synergy/client/Client.java
index 0aa4701..50eb1f9 100755
--- a/src/org/synergy/client/Client.java
+++ b/src/org/synergy/client/Client.java
@@ -22,7 +22,8 @@
 import java.io.DataInputStream;
 import java.io.DataOutputStream;
 import java.io.IOException;
-
+import java.util.Timer;
+import java.util.TimerTask;
 import org.synergy.base.Event;
 import org.synergy.base.EventJobInterface;
 import org.synergy.base.EventQueue;
@@ -43,63 +44,69 @@
 import android.content.Context;
 import android.graphics.Point;
 import android.graphics.Rect;
+import android.os.Handler;
+import android.os.Looper;
 import android.widget.Toast;
 
 public class Client implements EventTarget {
-	
-	private final Context context;
-	private String name;
-	private NetworkAddress serverAddress;
-	private Stream stream;
-	private SocketFactoryInterface socketFactory;
-	private StreamFilterFactoryInterface streamFilterFactory;
-	private ScreenInterface screen;
-	
-	private int mouseX;
-	private int mouseY;
-	
-	private ServerProxy server;
-
-	public Client (final Context context, final String name, final NetworkAddress serverAddress,
-			SocketFactoryInterface socketFactory, StreamFilterFactoryInterface streamFilterFactory,
-			ScreenInterface screen) {
-		
-		this.context = context;
-		this.name = name;
-		this.serverAddress = serverAddress;
-		this.socketFactory = socketFactory;
-		this.streamFilterFactory = streamFilterFactory;
-		this.screen = screen;
-		
+
+
+    private final Context context;
+    //private final TimerTask autoReconnectTask;
+    private String name;
+    private NetworkAddress serverAddress;
+    private Stream stream;
+    private SocketFactoryInterface socketFactory;
+    private StreamFilterFactoryInterface streamFilterFactory;
+    private ScreenInterface screen;
+    private Handler handler;
+    private int mouseX;
+    private int mouseY;
+    private int reconnectAttemptsCount;
+    private boolean autoReconnect;
+    private ServerProxy server;
+
+    public Client (final Context context, final String name, final NetworkAddress serverAddress,
+                   SocketFactoryInterface socketFactory, StreamFilterFactoryInterface streamFilterFactory,
+                   ScreenInterface screen, boolean autoReconnect) {
+
+        this.context = context;
+        this.name = name;
+        this.serverAddress = serverAddress;
+        this.socketFactory = socketFactory;
+        this.streamFilterFactory = streamFilterFactory;
+        this.screen = screen;
+        this.autoReconnect = autoReconnect;
+        this.handler = new Handler(Looper.getMainLooper());
+        this.reconnectAttemptsCount = 0;
         assert (socketFactory != null);
         assert (screen != null);
-
         // TODO register suspend / resume event handlers
-	}
-	
-	public void finalize () throws Throwable {
-	    // TODO
-	}
-	
-	public void connect () {
+    }
+
+    public void finalize () throws Throwable {
+        // TODO
+    }
+
+    public void connect () {
         if (stream != null) {
             Log.info ("stream != null");
             return;
         }
 
-		try {
-			serverAddress.resolve ();
-			
-			if (serverAddress.getAddress () != null) {
-				Log.debug ("Connecting to: '" +
-						serverAddress.getHostname () + "': " +
-						serverAddress.getAddress () + ":" +
-						serverAddress.getPort ());
-			}
-			
+        try {
+            serverAddress.resolve ();
+
+            if (serverAddress.getAddress () != null) {
+                Log.debug ("Connecting to: '" +
+                        serverAddress.getHostname () + "': " +
+                        serverAddress.getAddress () + ":" +
+                        serverAddress.getPort ());
+            }
+
             // create the socket
-	        DataSocketInterface socket = socketFactory.create ();
-    
+            DataSocketInterface socket = socketFactory.create ();
+
             // filter socket messages, including a packetizing filter
             stream = socket;
             if (streamFilterFactory != null) {
@@ -107,52 +114,70 @@ public void connect () {
             }
 
             // connect
-            Log.debug ("connecting to server");
-
-            setupConnecting ();
-            setupTimer ();
-
-            socket.connect (serverAddress);
-            
-            final Toast toast = Toast.makeText(context, "Connected to " + serverAddress.getHostname()
-                    + ":" + serverAddress.getPort(), Toast.LENGTH_SHORT);
-            toast.show();
-		} catch (IOException e) {
-			final String errorMessage = "Failed to connect to " + serverAddress.getHostname()
-					+ ":" + serverAddress.getPort();
-			Log.error(errorMessage);
-			final Toast toast = Toast.makeText(context, errorMessage, Toast.LENGTH_SHORT);
-			toast.show();
-		}
-	}
-	
-	public void disconnect (String msg) {
-		cleanupTimer ();
-		cleanupScreen ();
-		cleanupConnecting ();
-		if (msg != null) {
-			sendConnectionFailedEvent (msg);
-		} else {
-			sendEvent (EventType.CLIENT_DISCONNECTED, null);
-		}
-	}
-		
+            Log.debug("connecting to server");
+
+            setupConnecting();
+            setupTimer();
+
+            socket.connect(serverAddress);
+            sendMessage("Connected to " + serverAddress.getHostname()
+                    + ":" + serverAddress.getPort());
+        } catch (IOException e) {
+            final String errorMessage = "Failed to connect to " + serverAddress.getHostname()
+                    + ":" + serverAddress.getPort();
+            Log.error(errorMessage);
+            sendMessage(errorMessage);
+            handleConnectionFailed();
+        }
+    }
+
+    public void setAutoReconnect(Boolean newVal) {
+        Log.debug ("setting auto-reconnect value: "+newVal);
+        autoReconnect = newVal;
+        if (autoReconnect)
+        {
+            EventQueue.getInstance ().addEvent (new Event (EventType.CLIENT_RECONNECT_ENABLED, this));
+        }
+        else
+        {
+            EventQueue.getInstance ().addEvent (new Event (EventType.CLIENT_RECONNECT_DISABLED, this));
+        }
+    }
+
+    public boolean getAutoReconnect() {
+        return autoReconnect;
+    }
+
+    public void disconnect (String msg) {
+        cleanupTimer();
+        cleanupScreen();
+        cleanupConnecting ();
+        Log.info ("Client disconnect..."+msg);
+        if (msg != null) {
+            sendConnectionFailedEvent (msg);
+        } else {
+            sendEvent(EventType.CLIENT_DISCONNECTED, null);
+        }
+    }
+
     private void setupConnecting () {
         assert (stream != null);
 
         EventQueue.getInstance().adoptHandler(EventType.SOCKET_CONNECTED, stream.getEventTarget(),
-        		new EventJobInterface () { 
-        			public void run (Event event) {
-        				handleConnected();
-        			}});
-        
-        EventJobInterface job = EventQueue.getInstance().getHandler(EventType.SOCKET_CONNECTED, stream.getEventTarget());
-        
+                new EventJobInterface() {
+                    public void run(Event event) {
+                        handleConnected();
+                    }
+                });
+
+        //EventJobInterface job = EventQueue.getInstance().getHandler(EventType.SOCKET_CONNECTED, stream.getEventTarget());
+
         EventQueue.getInstance().adoptHandler(EventType.SOCKET_CONNECT_FAILED, stream.getEventTarget(),
-        		new EventJobInterface () {
-        			public void run (Event event) {
-        				handleConnectionFailed();
-        			}});
+                new EventJobInterface() {
+                    public void run(Event event) {
+                        handleConnectionFailed();
+                    }
+                });
     }
 
     private void cleanupConnecting () {
@@ -168,26 +193,52 @@ private void setupTimer () {
 
 
     }
-    
+
     private void handleConnected () {
-    	Log.debug1 ("connected; wait for hello");
+        Log.debug1 ("connected; wait for hello");
 
         cleanupConnecting ();
         setupConnection ();
 
         // TODO Clipboard
     }
-    
+
     private void handleConnectionFailed () {
         // TODO
+        Log.debug("handleConnectionFailed");
+        handleDisconnected();
     }
-    
+
     private void handleDisconnected () {
-    	// TODO
+        // TODO
+        Log.debug("handleDisconnected");
+        if (autoReconnect)
+        {
+            if (stream != null)
+            {
+                //if (stream.isReady()) stream.close();
+                stream = null;
+            }
+            final long reconnectDelay = 3000L + (reconnectAttemptsCount * 2000L);
+            reconnectAttemptsCount += 1;
+            sendMessage("("+reconnectAttemptsCount+"/5) Reconnect in "+((int) (reconnectDelay/1000))+" secs...");
+            new Timer().schedule(new TimerTask() {
+                @Override
+                public void run() {
+                    Log.debug ("autoReconnectTask - attemps count: "+reconnectAttemptsCount);
+                    Log.debug("autoReconnectTask - delay time: "+reconnectDelay);
+                    if (reconnectAttemptsCount == 5)
+                    {
+                        setAutoReconnect(false);
+                    }
+                    connect();
+                }
+            }, reconnectDelay);
+        }
     }
 
     private void handleHello () {
-        Log.debug ("handling hello");
+        Log.debug("handling hello");
 
         try {
             // Read in the Hello Message
@@ -195,9 +246,9 @@ private void handleHello () {
             HelloMessage helloMessage = new HelloMessage (din);
 
             Log.debug1 ("Read hello message: " + helloMessage);
-            
+
             // TODO check versions
-            
+
             // say hello back
             DataOutputStream dout = new DataOutputStream (stream.getOutputStream ());
 
@@ -223,32 +274,37 @@ private void handleHello () {
     private void handleOutputError () {
     }
 
-    
-	private void setupConnection () {
-        assert (stream != null);
 
+    private void setupConnection () {
+        assert (stream != null);
         EventQueue.getInstance().adoptHandler(EventType.SOCKET_DISCONNECTED, stream.getEventTarget(),
-        		new EventJobInterface () { public void run (Event event) {
-        				handleDisconnected ();
-        			}});
+                new EventJobInterface () { public void run (Event event) {
+                    handleDisconnected();
+                }});
+        EventQueue.getInstance().adoptHandler(EventType.CLIENT_DISCONNECTED, this,
+                new EventJobInterface() {
+                    public void run(Event event) {
+                        handleDisconnected();
+                    }
+                });
 
         EventQueue.getInstance().adoptHandler(EventType.STREAM_INPUT_READY, stream.getEventTarget(),
-        		new EventJobInterface () { public void run (Event event) {
-        				handleHello ();
-        			}});
+                new EventJobInterface () { public void run (Event event) {
+                    handleHello();
+                }});
 
         EventQueue.getInstance().adoptHandler(EventType.STREAM_OUTPUT_ERROR, stream.getEventTarget(),
-        		new EventJobInterface () { public void run (Event event) {
-        				handleDisconnected ();
-        			}});
+                new EventJobInterface () { public void run (Event event) {
+                    handleDisconnected ();
+                }});
         EventQueue.getInstance().adoptHandler(EventType.STREAM_INPUT_SHUTDOWN, stream.getEventTarget(),
-        		new EventJobInterface () { public void run (Event event) {
-        				handleDisconnected ();
-        			}});
+                new EventJobInterface () { public void run (Event event) {
+                    handleDisconnected ();
+                }});
         EventQueue.getInstance().adoptHandler(EventType.STREAM_OUTPUT_SHUTDOWN, stream.getEventTarget(),
-        		new EventJobInterface () { public void run (Event event) {
-        				handleDisconnected ();
-        			}});
+                new EventJobInterface () { public void run (Event event) {
+                    handleDisconnected ();
+                }});
     }
 
     private void setupScreen () {
@@ -256,11 +312,11 @@ private void setupScreen () {
         assert (screen == null);
 
         server = new ServerProxy (this, stream);
-        
-        EventQueue.getInstance().adoptHandler(EventType.SHAPE_CHANGED, getEventTarget (),
-        		new EventJobInterface () { public void run (Event event) {
-        				handleShapeChanged ();
-        			}});
+
+        EventQueue.getInstance().adoptHandler(EventType.SHAPE_CHANGED, getEventTarget(),
+                new EventJobInterface () { public void run (Event event) {
+                    handleShapeChanged();
+                }});
         // TODO Clipboard
 //        EventQueue.getInstance().adoptHandler(Stream.getInputShutdownEvent(), stream.getEventTarget(),
 //        		new EventJobInterface () { public void run (Event event) {
@@ -271,9 +327,9 @@ private void setupScreen () {
     private void cleanupTimer () {
         // TODO
     }
-    
+
     private void cleanupScreen () {
-    	// TODO/
+        // TODO/
     }
 
     public Object getEventTarget () {
@@ -290,9 +346,9 @@ public Rect getShape () {
     }
 
     public Point getCursorPos () {
-        return screen.getCursorPos ();
+        return screen.getCursorPos();
     }
-	
+
 
     public void handshakeComplete () {
         screen.enable ();
@@ -300,13 +356,23 @@ public void handshakeComplete () {
     }
 
     private void sendEvent (EventType type, Object data) {
-        EventQueue.getInstance ().addEvent (new Event (type, data));
+        EventQueue.getInstance ().addEvent(new Event(type, this));
     }
 
     private void sendConnectionFailedEvent (String msg) {
-    	// TODO
+        // TODO
+        sendEvent(EventType.CLIENT_DISCONNECTED, msg);
+    }
+
+    private void sendMessage (final String msg) {
+        handler.post(new Runnable() {
+            @Override
+            public void run()
+            {
+                Toast.makeText(context, msg, Toast.LENGTH_SHORT).show();
+            }
+        });
     }
-    
 
     /*
     private Integer getConnectedEvent () {
@@ -327,19 +393,19 @@ private Integer getDisconnectedEvent () {
 
 
     public void enter (EnterMessage enterMessage) {
-    	mouseX = enterMessage.getX ();
-    	mouseY = enterMessage.getY ();
+        mouseX = enterMessage.getX ();
+        mouseY = enterMessage.getY ();
         screen.mouseMove (mouseX, mouseY);
         screen.enter ((int)enterMessage.getMask ());
     }
-    
+
     public void leave (LeaveMessage leaveMessage) {
-    	// Since I don't know how to hide the cursor, tuck it away out of sight
-    	screen.mouseMove (screen.getShape ().right, screen.getShape ().bottom);
+        // Since I don't know how to hide the cursor, tuck it away out of sight
+        screen.mouseMove (screen.getShape ().right, screen.getShape ().bottom);
     }
 
     public void mouseMove (int x, int y) {
-    	screen.mouseMove (x, y);    	
+        screen.mouseMove (x, y);
     }
 
     public void mouseDown (int buttonID) {
@@ -349,34 +415,34 @@ public void mouseDown (int buttonID) {
     public void mouseUp (int buttonID) {
         screen.mouseUp (buttonID);
     }
-    
+
     public void relMouseMove (int x, int y) {
-    	screen.mouseRelativeMove (x, y);
+        screen.mouseRelativeMove (x, y);
     }
-    
+
     public void mouseWheel (int x, int y) {
-    	screen.mouseWheel(x, y);
+        screen.mouseWheel(x, y);
     }
-    
+
     /**
      * @param keyEventID A VK_ defined in KeyEvent
      */
     public void keyDown (int keyEventID, int mask, int button) {
-       screen.keyDown (keyEventID, mask, button);
+        screen.keyDown (keyEventID, mask, button);
     }
-    
+
     /**
      * @param keyEventID A VK_ defined in KeyEvent
      */
     public void keyRepeat (int keyEventID, int mask, int button) {
-    	screen.keyDown (keyEventID, mask, button);
+        screen.keyDown (keyEventID, mask, button);
     }
-    
+
     /**
      * @param keyEventID A VK_ defined in KeyEvent
      */
-   public void keyUp (int keyEventID, int mask, int button) {
-   	screen.keyUp (keyEventID, mask, button);
-   }
+    public void keyUp (int keyEventID, int mask, int button) {
+        screen.keyUp (keyEventID, mask, button);
+    }
 
 }
\ No newline at end of file
diff --git a/src/org/synergy/client/ServerProxy.java b/src/org/synergy/client/ServerProxy.java
index 09157c7..422b011 100755
--- a/src/org/synergy/client/ServerProxy.java
+++ b/src/org/synergy/client/ServerProxy.java
@@ -48,8 +48,8 @@
 import org.synergy.io.msgs.SetOptionsMessage;
 
 public class ServerProxy {
-    private static final double KEEP_ALIVE_UNTIL_DEATH = 3.0;
-    private static final double KEEP_ALIVE_RATE = 3.0;
+	private static final double KEEP_ALIVE_UNTIL_DEATH = 3.0;
+	private static final double KEEP_ALIVE_RATE = 3.0;
 
 	/**
 	 * Enumeration and Interface for parsing function
@@ -101,8 +101,8 @@ public void run (Event event) {
 				});
 
 		// send heartbeat
-        setKeepAliveRate (KEEP_ALIVE_RATE);
-        
+		setKeepAliveRate (KEEP_ALIVE_RATE);
+
 		parser = new Parser () {
 			public Result parse () throws IOException {
 				return parseHandshakeMessage ();
@@ -115,162 +115,162 @@ protected enum EResult {
 		OKAY, UNKNOWN, DISCONNECT;
 	}
 
-    /**
-      * Handle messages before handshake is complete
-      */
+	/**
+	 * Handle messages before handshake is complete
+	 */
 	protected Result parseHandshakeMessage () throws IOException {
 		// Read the header
 		MessageHeader header = new MessageHeader (din);
 		//Log.debug ("Received Header: " + header);
 
 		switch (header.getType ()) {
-		case QINFO:
-			//queryInfo (new QueryInfoMessage ());
-			queryInfo ();
-			break;
-		case CINFOACK:
-			infoAcknowledgment ();
-			break;
-		case DSETOPTIONS:
-			SetOptionsMessage setOptionsMessage = new SetOptionsMessage (header, din);
-
-			setOptions (setOptionsMessage);
-
-			// handshake is complete
-			Log.debug ("Handshake is complete");
-			parser = new Parser () {
-				public Result parse () throws IOException {
-					return parseMessage ();
-				}
-			};
-
-			client.handshakeComplete ();
-			break;
-		case CRESETOPTIONS:
-			resetOptions (new ResetOptionsMessage (din));
-			break;
-		default:
-			return Result.UNKNOWN;
+			case QINFO:
+				//queryInfo (new QueryInfoMessage ());
+				queryInfo ();
+				break;
+			case CINFOACK:
+				infoAcknowledgment ();
+				break;
+			case DSETOPTIONS:
+				SetOptionsMessage setOptionsMessage = new SetOptionsMessage (header, din);
+
+				setOptions (setOptionsMessage);
+
+				// handshake is complete
+				Log.debug ("Handshake is complete");
+				parser = new Parser () {
+					public Result parse () throws IOException {
+						return parseMessage ();
+					}
+				};
+
+				client.handshakeComplete ();
+				break;
+			case CRESETOPTIONS:
+				resetOptions (new ResetOptionsMessage (din));
+				break;
+			default:
+				return Result.UNKNOWN;
 		}
-		
+
 		return Result.OKAY;
 	}
 
-    /**
-      * Handle messages after the handshake is complete
-      */
+	/**
+	 * Handle messages after the handshake is complete
+	 */
 	byte[] messageDataBuffer = new byte[256];
 	protected Result parseMessage () throws IOException {
 		// Read the header
 		MessageHeader header = new MessageHeader (din);
-		
+
 		// NOTE: as this is currently designed an improperly consumed message
 		// will break the handling of the next message,  The message data should
 		// be fully read into a buffer and that buffer passed into the message
 		// for handling...
-		
-        switch (header.getType ()) {
-        case DMOUSEMOVE:
-        	// Cut right to the chase with mouse movements since
-        	//  they are the most abundant
-            short ax = din.readShort ();
-    		short ay = din.readShort ();
-            client.mouseMove (ax, ay);	
-            break;
-
-        case DMOUSERELMOVE:
-            short rx = din.readShort ();
-    		short ry = din.readShort ();
-            client.relMouseMove(rx, ry);	
-            break;
-
-        case DMOUSEWHEEL:
-			mouseWheel (new MouseWheelMessage (din));
-            break;
-
-		case DKEYDOWN:
-		    keyDown (new KeyDownMessage(din));
-            break;
-
-		case DKEYUP:
-			keyUp (new KeyUpMessage(din));
-            break;
-		
-        case DKEYREPEAT:
-			keyRepeat (new KeyRepeatMessage (din));
-            break;
-
-        case DMOUSEDOWN:
-            mouseDown (new MouseDownMessage (din));
-            break;
-
-        case DMOUSEUP:
-            mouseUp (new MouseUpMessage (din));
-            break;
-
-		case CKEEPALIVE:
-			// echo keep alives and reset alarm
-            new KeepAliveMessage ().write (dout);
-			resetKeepAliveAlarm ();
-			break;
-
-		case CNOOP:
-			// accept and discard no-op
-			break;
-
-        case CENTER:
-			enter (new EnterMessage (header, din));
-			break;
-
-        case CLEAVE:
-			leave (new LeaveMessage (din));
-			break;
-
-		case CCLIPBOARD:
-			grabClipboard (new ClipboardMessage (din));
-			break;
-
-		case CSCREENSAVER:
-			byte screenSaverOnFlag = din.readByte();
-			screensaver (new ScreenSaverMessage (din, screenSaverOnFlag));
-			break;
-
-		case QINFO:
-			queryInfo ();
-			break;
-
-		case CINFOACK:
-			//infoAcknowledgment (new InfoAckMessage (din));
-			infoAcknowledgment ();
-			
-			break;
-
-        case DCLIPBOARD:
-			setClipboard (new ClipboardDataMessage (header, din));
-			break;
-
-		case CRESETOPTIONS:
-			resetOptions (new ResetOptionsMessage (din));
-			break;
-
-        case DSETOPTIONS:
-			SetOptionsMessage setOptionsMessage = new SetOptionsMessage (header, din);
-			setOptions (setOptionsMessage);
-			break;
-
-		case CCLOSE:
-			// server wants us to hangup
-			Log.debug1 ("recv close");
-			// client.disconnect (null);
-			return Result.DISCONNECT;
-
-        case EBAD:
-			Log.error ("server disconnected due to a protocol error");
-			// client.disconnect("server reported a protocol error");
-			return Result.DISCONNECT;
-
-        default: 
-			return Result.UNKNOWN;
+
+		switch (header.getType ()) {
+			case DMOUSEMOVE:
+				// Cut right to the chase with mouse movements since
+				//  they are the most abundant
+				short ax = din.readShort ();
+				short ay = din.readShort ();
+				client.mouseMove (ax, ay);
+				break;
+
+			case DMOUSERELMOVE:
+				short rx = din.readShort ();
+				short ry = din.readShort ();
+				client.relMouseMove(rx, ry);
+				break;
+
+			case DMOUSEWHEEL:
+				mouseWheel (new MouseWheelMessage (din));
+				break;
+
+			case DKEYDOWN:
+				keyDown (new KeyDownMessage(din));
+				break;
+
+			case DKEYUP:
+				keyUp (new KeyUpMessage(din));
+				break;
+
+			case DKEYREPEAT:
+				keyRepeat (new KeyRepeatMessage (din));
+				break;
+
+			case DMOUSEDOWN:
+				mouseDown (new MouseDownMessage (din));
+				break;
+
+			case DMOUSEUP:
+				mouseUp (new MouseUpMessage (din));
+				break;
+
+			case CKEEPALIVE:
+				// echo keep alives and reset alarm
+				new KeepAliveMessage ().write (dout);
+				resetKeepAliveAlarm ();
+				break;
+
+			case CNOOP:
+				// accept and discard no-op
+				break;
+
+			case CENTER:
+				enter (new EnterMessage (header, din));
+				break;
+
+			case CLEAVE:
+				leave (new LeaveMessage (din));
+				break;
+
+			case CCLIPBOARD:
+				grabClipboard (new ClipboardMessage (din));
+				break;
+
+			case CSCREENSAVER:
+				byte screenSaverOnFlag = din.readByte();
+				screensaver (new ScreenSaverMessage (din, screenSaverOnFlag));
+				break;
+
+			case QINFO:
+				queryInfo ();
+				break;
+
+			case CINFOACK:
+				//infoAcknowledgment (new InfoAckMessage (din));
+				infoAcknowledgment ();
+
+				break;
+
+			case DCLIPBOARD:
+				setClipboard (new ClipboardDataMessage (header, din));
+				break;
+
+			case CRESETOPTIONS:
+				resetOptions (new ResetOptionsMessage (din));
+				break;
+
+			case DSETOPTIONS:
+				SetOptionsMessage setOptionsMessage = new SetOptionsMessage (header, din);
+				setOptions (setOptionsMessage);
+				break;
+
+			case CCLOSE:
+				// server wants us to hangup
+				Log.debug1 ("recv close");
+				// client.disconnect (null);
+				return Result.DISCONNECT;
+
+			case EBAD:
+				Log.error ("server disconnected due to a protocol error");
+				// client.disconnect("server reported a protocol error");
+				return Result.DISCONNECT;
+
+			default:
+				return Result.UNKNOWN;
 		}
 
 		return Result.OKAY;
@@ -287,13 +287,14 @@ private void handleData () {
 
 			while (true) {
 				switch (parser.parse ()) {
-				case OKAY:
-					break;
-				case UNKNOWN:
-					Log.error ("invalid message from server");
-					return;
-				case DISCONNECT:
-					return;
+					case OKAY:
+						break;
+					case UNKNOWN:
+						Log.error ("invalid message from server");
+						return;
+					case DISCONNECT:
+						client.disconnect(null);
+						return;
 				}
 			}
 		} catch (IOException e) {
@@ -303,29 +304,29 @@ private void handleData () {
 	}
 
 	private void resetKeepAliveAlarm () {
-        if (keepAliveAlarmTimer != null) {
-            keepAliveAlarmTimer.cancel ();
-            keepAliveAlarmTimer = null;
-        }
-        
-        if (keepAliveAlarm > 0.0) {
-            keepAliveAlarmTimer = new EventQueueTimer (keepAliveAlarm, true, this, 
-                    new EventJobInterface () {
-                        public void run (Event event) {
-                            handleKeepAliveAlarm ();
-                        }});
-        }
+		if (keepAliveAlarmTimer != null) {
+			keepAliveAlarmTimer.cancel ();
+			keepAliveAlarmTimer = null;
+		}
+
+		if (keepAliveAlarm > 0.0) {
+			keepAliveAlarmTimer = new EventQueueTimer (keepAliveAlarm, true, this,
+					new EventJobInterface () {
+						public void run (Event event) {
+							handleKeepAliveAlarm ();
+						}});
+		}
 	}
 
 	private void setKeepAliveRate (double rate) {
-        keepAliveAlarm = rate * KEEP_ALIVE_UNTIL_DEATH;
-        resetKeepAliveAlarm ();
+		keepAliveAlarm = rate * KEEP_ALIVE_UNTIL_DEATH;
+		resetKeepAliveAlarm ();
 	}
 
-    private void handleKeepAliveAlarm () {
-        Log.note ("server is dead");
-        client.disconnect ("server is not responding");
-    }
+	private void handleKeepAliveAlarm () {
+		Log.note ("server is dead");
+		client.disconnect ("server is not responding");
+	}
 
 	private void queryInfo () {
 		ClientInfo info = new ClientInfo (client.getShape (), client.getCursorPos ());
@@ -335,14 +336,14 @@ private void queryInfo () {
 	private void sendInfo (ClientInfo info) {
 		try {
 			dout = new DataOutputStream (stream.getOutputStream ());
-            
+
 			new InfoMessage (info.getScreenPosition ().left,
-                            info.getScreenPosition ().top,
-                            info.getScreenPosition ().right,
-                            info.getScreenPosition ().bottom,
-                            info.getCursorPos ().x,
-                            info.getCursorPos ().y).write (dout);
-            
+					info.getScreenPosition ().top,
+					info.getScreenPosition ().right,
+					info.getScreenPosition ().bottom,
+					info.getCursorPos ().x,
+					info.getCursorPos ().y).write (dout);
+
 		} catch (Exception e) {
 			// TODO
 			e.printStackTrace ();
@@ -361,8 +362,8 @@ public void onInfoChanged () {
 	private void enter (EnterMessage enterMessage) {
 		Log.debug1 ("Screen entered: " + enterMessage);
 
-        seqNum = enterMessage.getSequenceNumber ();
-        client.enter (enterMessage);
+		seqNum = enterMessage.getSequenceNumber ();
+		client.enter (enterMessage);
 	}
 
 	private void leave (LeaveMessage leaveMessage) {
@@ -371,38 +372,38 @@ private void leave (LeaveMessage leaveMessage) {
 	}
 
 	private void keyUp (KeyUpMessage keyUpMessage) {
-        Log.debug1 (keyUpMessage.toString ());
-        
-        try {
-    		client.keyUp (keyUpMessage.getID(), keyUpMessage.getMask(), keyUpMessage.getButton());
-        } catch (Exception e) {
-        }
+		Log.debug1 (keyUpMessage.toString ());
+
+		try {
+			client.keyUp (keyUpMessage.getID(), keyUpMessage.getMask(), keyUpMessage.getButton());
+		} catch (Exception e) {
+		}
 	}
 
-    private void keyDown (KeyDownMessage keyDownMessage) {
-        Log.info (keyDownMessage.toString ());
-        
-        client.keyDown (keyDownMessage.getID(), keyDownMessage.getMask(), keyDownMessage.getButton());
-        
-    }
+	private void keyDown (KeyDownMessage keyDownMessage) {
+		Log.info (keyDownMessage.toString ());
+
+		client.keyDown (keyDownMessage.getID(), keyDownMessage.getMask(), keyDownMessage.getButton());
+
+	}
 
 	private void keyRepeat (KeyRepeatMessage keyRepeatMessage) {
-        Log.debug1 (keyRepeatMessage.toString ());
-        
-        try {
-            client.keyRepeat (keyRepeatMessage.getID (), keyRepeatMessage.getMask(), keyRepeatMessage.getButton());
-        } catch (Exception e) {
-        }
+		Log.debug1 (keyRepeatMessage.toString ());
+
+		try {
+			client.keyRepeat (keyRepeatMessage.getID (), keyRepeatMessage.getMask(), keyRepeatMessage.getButton());
+		} catch (Exception e) {
+		}
 	}
 
 	private void mouseDown (MouseDownMessage mouseDownMessage) {
-        Log.debug (mouseDownMessage.toString ());
-        client.mouseDown (mouseDownMessage.getButtonID ());
+		Log.debug (mouseDownMessage.toString ());
+		client.mouseDown (mouseDownMessage.getButtonID ());
 	}
 
 	private void mouseUp (MouseUpMessage mouseUpMessage) {
-        Log.debug (mouseUpMessage.toString ());
-        client.mouseUp (mouseUpMessage.getButtonID ());
+		Log.debug (mouseUpMessage.toString ());
+		client.mouseUp (mouseUpMessage.getButtonID ());
 	}
 
 	private void mouseWheel (MouseWheelMessage mouseWheelMessage) {