diff --git a/android/src/br/com/bb/pw3270/PW3270Activity.java b/android/src/br/com/bb/pw3270/PW3270Activity.java
index 64353aa..a8e34a9 100644
--- a/android/src/br/com/bb/pw3270/PW3270Activity.java
+++ b/android/src/br/com/bb/pw3270/PW3270Activity.java
@@ -75,17 +75,9 @@ public class PW3270Activity extends Activity
         
 		Log.d(TAG, "Initializing UI");
 
-//		if(host.dlgSysMessage == null)
-//		{
-			// Cria dialogo para as mensagems de sistema
-//			Log.d(TAG, "Creating dlgSysMessage");
-			host.dlgSysMessage = new ProgressDialog(this);
-			host.dlgSysMessage.setCancelable(false);
-			host.dlgSysMessage.setTitle(host.res.getString(R.string.wait));
-//		}
-		
-//		Log.d(TAG, "Creating terminal object");
-//		autoconnect = settings.getString("hostname","") != "" && settings.getBoolean("autoconnect",false);			
+		host.dlgSysMessage = new ProgressDialog(this);
+		host.dlgSysMessage.setCancelable(false);
+		host.dlgSysMessage.setTitle(host.res.getString(R.string.wait));
 
 		// Reference:
 		// http://developer.android.com/reference/android/webkit/WebView.html
diff --git a/android/src/br/com/bb/pw3270/SettingsActivity.java b/android/src/br/com/bb/pw3270/SettingsActivity.java
index 78eb8a6..0654d6b 100644
--- a/android/src/br/com/bb/pw3270/SettingsActivity.java
+++ b/android/src/br/com/bb/pw3270/SettingsActivity.java
@@ -44,14 +44,18 @@ public class SettingsActivity extends Activity
 		
 			public stringSetting(Preference p)
 			{
+				String text = p.getSharedPreferences().getString(p.getKey(),"");
+
+				if(text != "")
+					p.setSummary(text);
+				
 				p.setOnPreferenceChangeListener(this);
-				this.onPreferenceChange(p,null);
 			}
 			
-			public boolean onPreferenceChange(Preference p, Object arg1) 
+			public boolean onPreferenceChange(Preference p, Object value) 
 			{
-				p.setSummary(p.getSharedPreferences().getString(p.getKey(),""));
-				return false;
+				p.setSummary((String) value);
+				return true;
 			}			
 		}
 		
diff --git a/android/src/br/com/bb/pw3270/lib3270.java b/android/src/br/com/bb/pw3270/lib3270.java
index 88ada0c..22095f5 100644
--- a/android/src/br/com/bb/pw3270/lib3270.java
+++ b/android/src/br/com/bb/pw3270/lib3270.java
@@ -85,9 +85,10 @@ public class lib3270
 			switch (msg.what)
 			{
 			case 0: // Reconnect
-				if(!hSession.isConnected())
+				if(!hSession.isConnected() && settings.getString("hostname","") != "" && settings.getBoolean("reconnect",false))
 				{
-					Log.d(TAG,"------------------------------------Connecting");
+					Log.d(TAG,"Connection lost, reconnecting");
+					connect();
 				}
 				break;
 
--
libgit2 0.21.2