--- a/res/layout/edit_settings.xml	Fri Jun 26 22:05:13 2009 +0200
+++ b/res/layout/edit_settings.xml	Fri Jun 26 22:25:08 2009 +0200
@@ -108,6 +108,7 @@
     				android:layout_height="wrap_content"
     				android:text="@string/settings_xmpp_use_tls"
     				android:layout_below="@id/settings_xmpp_table_sp"
+    				android:focusable="true"
     				style="@style/CheckBoxLabel" />
 				<Button android:id="@+id/settings_xmpp_button_save"
 					android:layout_width="wrap_content"

--- a/src/com/beem/project/beem/BeemService.java	Fri Jun 26 22:05:13 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Fri Jun 26 22:25:08 2009 +0200
@@ -4,6 +4,7 @@
 import org.jivesoftware.smack.PacketListener;
 import org.jivesoftware.smack.Roster;
 import org.jivesoftware.smack.XMPPConnection;
+import org.jivesoftware.smack.ConnectionConfiguration.SecurityMode;
 import org.jivesoftware.smack.Roster.SubscriptionMode;
 import org.jivesoftware.smack.filter.PacketFilter;
 import org.jivesoftware.smack.packet.Packet;
@@ -97,6 +98,9 @@
 	    else
 		mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort);
 	}
+	if (mSettings.getBoolean(getString(R.string.settings_key_xmpp_tls_use), false) == true) {
+	    mConnectionConfiguration.setSecurityMode(SecurityMode.required);
+	}
 	mConnectionConfiguration.setDebuggerEnabled(false);
 	mConnectionConfiguration.setSendPresence(true);
     }