Index: src/locale/SR.java
===================================================================
--- src/locale/SR.java	(revision 1384)
+++ src/locale/SR.java	(working copy)
@@ -253,6 +253,7 @@
 
 
     public   static String MS_TOKEN = loadString( "Google token request" );
+    public   static String MS_SASL = loadString( "SASL login" );
     public   static String MS_FEATURES = loadString( "Features" );
     public   static String MS_SHOWPWD = loadString( "Show password" );
     public   static String MS_NO_VERSION_AVAILABLE = loadString( "No client version available" );
Index: src/Client/Roster.java
===================================================================
--- src/Client/Roster.java	(revision 1384)
+++ src/Client/Roster.java	(working copy)
@@ -42,6 +42,7 @@
 //#endif
 import locale.SR;
 import login.LoginListener;
+import login.NonSASLAuth;
 import login.SASLAuth;
 import midlet.Bombus;
 import vcard.VCard;
@@ -1427,11 +1428,15 @@
         //try {
         //setProgress(SR.MS_LOGINPGS, 42);
         
+        if (sd.account.isSASL()) {
             new SASLAuth(sd.account, SessionId, this, theStream)
   //#if SASL_XGOOGLETOKEN
             .setToken(token)
   //#endif
             ;
+        } else {
+            new NonSASLAuth(sd.account, SessionId, this, theStream);
+        }
     }
     
     /**
Index: src/Client/AccountForm.java
===================================================================
--- src/Client/AccountForm.java	(revision 1384)
+++ src/Client/AccountForm.java	(working copy)
@@ -98,6 +98,7 @@
 	register.append(SR.MS_SSL,null);
 	register.append(SR.MS_PLAIN_PWD,null);
 	register.append(SR.MS_NO_COMPRESSION,null);
+	register.append(SR.MS_SASL,null);
 	register.append(SR.MS_CONFERENCES_ONLY,null);
 //#if HTTPCONNECT
 //#         register.append("Proxy connect",null);
@@ -105,7 +106,7 @@
 //#         register.append("HTTP Polling",null);
 //#endif
 	register.append(SR.MS_REGISTER_ACCOUNT,null);
-	boolean b[] = {account.getUseSSL(), account.getPlainAuth(), !account.useCompression(), account.isMucOnly(), 
+	boolean b[] = {account.getUseSSL(), account.getPlainAuth(), !account.useCompression(), account.isSASL(), account.isMucOnly(),
 //#if HTTPPOLL || HTTPCONNECT        
 //#         account.isEnableProxy(), 
 //#endif        
@@ -182,7 +183,7 @@
 	    return;
 	}
 	if (c==cmdOk) {
-	    boolean b[] = new boolean[6];
+	    boolean b[] = new boolean[7];
 	    register.getSelectedFlags(b);
 	    String user = userbox.getString();
 	    int at = user.indexOf('@');
@@ -198,13 +199,14 @@
 	    account.setUseSSL(b[0]);
 	    account.setPlainAuth(b[1]);
             account.setUseCompression(!b[2]);
-	    account.setMucOnly(b[3]);
+	    account.setSasl(b[3]);
+	    account.setMucOnly(b[4]);
 
 //#if HTTPPOLL || HTTPCONNECT            
-//# 	    account.setEnableProxy(b[4]);
-//#             boolean  doRegister=b[5];
+//# 	    account.setEnableProxy(b[5]);
+//#             boolean  doRegister=b[6];
 //#else
-            boolean  doRegister=b[4];
+            boolean  doRegister=b[5];
 //#endif            
 	    //account.updateJidCache();
 	    
Index: src/Client/Account.java
===================================================================
--- src/Client/Account.java	(revision 1384)
+++ src/Client/Account.java	(working copy)
@@ -59,6 +59,7 @@
     public boolean active;
     private boolean useSSL;
     private boolean compression;
+    private boolean sasl=true;
     private boolean plainAuth;
     private boolean mucOnly;
     
@@ -135,6 +136,7 @@
                 a.compression=inputStream.readBoolean();
 
             if (version>=7) {
+                a.sasl=inputStream.readBoolean();
                 a.keepAliveType=inputStream.readInt();
                 a.keepAlivePeriod=inputStream.readInt();
             }
@@ -208,6 +210,7 @@
             outputStream.writeInt(proxyPort);
             
             outputStream.writeBoolean(compression);
+            outputStream.writeBoolean(sasl);
             
             outputStream.writeInt(keepAliveType);
             outputStream.writeInt(keepAlivePeriod);
@@ -320,6 +323,14 @@
 
     public void setUseCompression(boolean value) { this.compression = value;  }
 
+    public boolean isSASL() {
+        return sasl;
+    }
+
+    public void setSasl(boolean sasl) {
+        this.sasl = sasl;
+    }
+
     public boolean useGoogleToken() {
         if (useSSL) return false;
         /*if (hostAddr==null) return false;
Index: resources/text/lang/pl.txt
===================================================================
--- resources/text/lang/pl.txt	(revision 1384)
+++ resources/text/lang/pl.txt	(working copy)
@@ -202,7 +202,7 @@
 Grant Membership	Daj Członkowstwo
 Are You sure want to clear messagelist?	Czy napewno chcesz wyczyścić liste wiadomości?
 Google token request	Google logowanie
-SASL login	SASL strumień
+SASL login	Autentykacja SASL
 Features	Właściwości
 Show password	Pokaż hasło
 No client version available	Brak informacji na temat wersji klienta