--- a/res/layout/preferences.xml	Sat Feb 13 22:39:15 2010 +0100
+++ b/res/layout/preferences.xml	Sat Feb 13 23:26:09 2010 +0100
@@ -30,9 +30,6 @@
 		    android:summary="@string/SettingsPrioritySummary"
 		    android:numeric="signed"
 		    android:defaultValue="0" />
-		<CheckBoxPreference android:title="@string/SettingsCheckboxText"
-			android:defaultValue="false" android:summary="@string/SettingsGmail"
-			android:key="settings_key_gmail" />
 	</PreferenceCategory>
 
 	<PreferenceCategory android:title="@string/network_preferences">

--- a/src/com/beem/project/beem/BeemService.java	Sat Feb 13 22:39:15 2010 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Sat Feb 13 23:26:09 2010 +0100
@@ -148,16 +148,14 @@
 	    int pport = Integer.parseInt(mSettings.getString("settings_key_proxy_port", "1080"));
 	    ProxyInfo.ProxyType type = ProxyType.valueOf(stype);
 	    mProxyInfo = new ProxyInfo(type, phost, pport, puser, ppass);
-	    if (mService != null)
-		mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort, mService, mProxyInfo);
-	    else
-		mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort, mProxyInfo);
 	} else {
-	    if (mService != null)
-		mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort, mService);
-	    else
-		mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort);
+	    mProxyInfo = ProxyInfo.forNoProxy();
 	}
+	if (mSettings.getBoolean("settings_key_specific_server", false))
+	    mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort, mService, mProxyInfo);
+	else
+	    mConnectionConfiguration = new ConnectionConfiguration(mService, mProxyInfo);
+
 	if (mSettings.getBoolean("settings_key_xmpp_tls_use", false)
 	    || mSettings.getBoolean("settings_key_gmail", false)) {
 	    mConnectionConfiguration.setSecurityMode(SecurityMode.required);
@@ -210,8 +208,7 @@
 	    String tmpPort = mSettings.getString("settings_key_xmpp_port", "5222");
 	    mPort = ("".equals(tmpPort)) ? DEFAULT_XMPP_PORT : Integer.parseInt(tmpPort) ;
 	}
-	if (mSettings.getBoolean("settings_key_gmail", false)) {
-	    mHost = "talk.google.com";
+	if ("gmail.com".equals(mService) || "googlemail.com".equals(mService))  {
 	    mLogin = tmpJid;
 	}