--- a/src/com/beem/project/beem/BeemException.java	Sat Sep 26 20:19:41 2009 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/**
- * 
- */
-package com.beem.project.beem;
-
-import android.os.Parcel;
-import android.os.Parcelable;
-
-/**
- * @author darisk
- */
-public class BeemException extends Exception implements Parcelable {
-
-    /**
-	 * 
-	 */
-    private static final long                             serialVersionUID = -5794514989326146456L;
-    public static final Parcelable.Creator<BeemException> CREATOR          = new Creator<BeemException>() {
-
-	                                                                       @Override
-	                                                                       public BeemException createFromParcel(
-	                                                                               Parcel source) {
-		                                                                   // TODO
-		                                                                   // Auto-generated
-		                                                                   // method stub
-		                                                                   return new BeemException(source);
-	                                                                       }
-
-	                                                                       @Override
-	                                                                       public BeemException[] newArray(int size) {
-		                                                                   // TODO
-		                                                                   // Auto-generated
-		                                                                   // method stub
-		                                                                   return new BeemException[size];
-	                                                                       }
-	                                                                   };
-
-    public BeemException() {
-	super();
-	// TODO Auto-generated constructor stub
-    }
-
-    private BeemException(Parcel parcel) {
-	this(parcel.readString());
-    }
-
-    public BeemException(String detailMessage) {
-	super(detailMessage);
-	// TODO Auto-generated constructor stub
-    }
-
-    public BeemException(String detailMessage, Throwable throwable) {
-	super(detailMessage, throwable);
-	// TODO Auto-generated constructor stub
-    }
-
-    public BeemException(Throwable throwable) {
-	super(throwable);
-	// TODO Auto-generated constructor stub
-    }
-
-    @Override
-    public int describeContents() {
-	// TODO Auto-generated method stub
-	return 0;
-    }
-
-    @Override
-    public void writeToParcel(Parcel dest, int flags) {
-	// TODO Auto-generated method stub
-	dest.writeString(getLocalizedMessage());
-    }
-
-}

--- a/src/com/beem/project/beem/BeemService.java	Sat Sep 26 20:19:41 2009 +0200
+++ b/src/com/beem/project/beem/BeemService.java	Sun Sep 27 01:22:49 2009 +0200
@@ -81,7 +81,8 @@
 	    else
 		mConnectionConfiguration = new ConnectionConfiguration(mHost, mPort);
 	}
-	if (mSettings.getBoolean("settings_key_xmpp_tls_use", false)) {
+	if (mSettings.getBoolean("settings_key_xmpp_tls_use", false)
+	    || mSettings.getBoolean("settings_key_gmail", false)) {
 	    mConnectionConfiguration.setSecurityMode(SecurityMode.required);
 	}
 	mConnectionConfiguration.setDebuggerEnabled(false);
@@ -113,8 +114,6 @@
 
 	if (mSettings.getBoolean("settings_key_gmail", false)) {
 	    mHost = "talk.google.com";
-	    mService = null;
-	    mLogin = StringUtils.parseName(mLogin);
 	}
 
 	initConnectionConfig();