--- a/src/com/beem/project/beem/BeemService.java	Thu Feb 23 22:59:29 2012 +0100
+++ b/src/com/beem/project/beem/BeemService.java	Mon Mar 05 21:57:48 2012 +0100
@@ -213,6 +213,7 @@
 	mPort = DEFAULT_XMPP_PORT;
 	mService = StringUtils.parseServer(tmpJid);
 	mHost = mService;
+	initMemorizingTrustManager();
 
 	if (mSettings.getBoolean("settings_key_specific_server", false)) {
 	    mHost = mSettings.getString("settings_key_xmpp_server", "").trim();
@@ -346,10 +347,8 @@
 
     /**
      * Install the MemorizingTrustManager in the ConnectionConfiguration of Smack.
-     *
-     * @param config the configuration to modify
      */
-    private void initMemorizingTrustManager(ConnectionConfiguration config) {
+    private void initMemorizingTrustManager() {
 	try {
 	    sslContext = SSLContext.getInstance("TLS");
 	    sslContext.init(null, MemorizingTrustManager.getInstanceList(this),