diff --git a/build.gradle b/build.gradle
index 87644d9e59..0777854404 100644
--- a/build.gradle
+++ b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
     dependencies {
         classpath 'com.android.tools.build:gradle:2.3.1'
-        classpath "io.realm:realm-gradle-plugin:3.0.0"
+        classpath "io.realm:realm-gradle-plugin:3.1.1"
         classpath 'com.neenbedankt.gradle.plugins:android-apt:1.8'
         classpath 'com.frogermcs.androiddevmetrics:androiddevmetrics-plugin:0.4'
     }
diff --git a/xabber/build.gradle b/xabber/build.gradle
index 198238ea07..393123f997 100644
--- a/xabber/build.gradle
+++ b/xabber/build.gradle
@@ -10,8 +10,8 @@ android {
     defaultConfig {
         minSdkVersion 15
         targetSdkVersion 25
-        versionCode 342
-        versionName '1.0.170'
+        versionCode 343
+        versionName '1.0.171'
     }
 
     lintOptions {
diff --git a/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java b/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
index 1ea767f47d..329e13cc6c 100644
--- a/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
+++ b/xabber/src/main/java/com/xabber/android/data/account/AccountManager.java
@@ -170,6 +170,13 @@ public void onLoad() {
                 LogManager.exception(this, e);
             }
 
+            if (serverName == null || userName == null || resource == null) {
+                LogManager.e(LOG_TAG, "could not create account. username " + userName
+                        + ", server name " + serverName
+                        + ", resource " + resource);
+                continue;
+            }
+
             AccountItem accountItem = new AccountItem(
                     accountRealm.isCustom(),
                     accountRealm.getHost(),
diff --git a/xabber/src/main/java/com/xabber/android/data/connection/ConnectionBuilder.java b/xabber/src/main/java/com/xabber/android/data/connection/ConnectionBuilder.java
index aa05ac1797..49d30dc767 100644
--- a/xabber/src/main/java/com/xabber/android/data/connection/ConnectionBuilder.java
+++ b/xabber/src/main/java/com/xabber/android/data/connection/ConnectionBuilder.java
@@ -10,7 +10,7 @@
 
 import org.jivesoftware.smack.SASLAuthentication;
 import org.jivesoftware.smack.proxy.ProxyInfo;
-import org.jivesoftware.smack.sasl.provided.SASLPlainMechanism;
+import org.jivesoftware.smack.sasl.provided.SASLDigestMD5Mechanism;
 import org.jivesoftware.smack.tcp.XMPPTCPConnection;
 import org.jivesoftware.smack.tcp.XMPPTCPConnectionConfiguration;
 import org.jivesoftware.smack.util.TLSUtils;
@@ -19,7 +19,6 @@
 import java.net.UnknownHostException;
 import java.security.KeyManagementException;
 import java.security.NoSuchAlgorithmException;
-import java.util.Map;
 
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.X509TrustManager;
@@ -66,7 +65,6 @@ class ConnectionBuilder {
 
         setUpSasl();
 
-
         LogManager.i(LOG_TAG, "new XMPPTCPConnection " + connectionSettings.getServerName());
         return new XMPPTCPConnection(builder.build());
     }
@@ -143,20 +141,9 @@ private static ProxyInfo getProxyInfo(ConnectionSettings connectionSettings) {
         return proxyInfo;
     }
 
-    private static void setUpSasl() {
-        if (SettingsManager.connectionUsePlainTextAuth()) {
-            final Map<String, String> registeredSASLMechanisms = SASLAuthentication.getRegisterdSASLMechanisms();
-            for (String mechanism : registeredSASLMechanisms.values()) {
-                SASLAuthentication.blacklistSASLMechanism(mechanism);
-            }
-
-            SASLAuthentication.unBlacklistSASLMechanism(SASLPlainMechanism.NAME);
-
-        } else {
-            final Map<String, String> registeredSASLMechanisms = SASLAuthentication.getRegisterdSASLMechanisms();
-            for (String mechanism : registeredSASLMechanisms.values()) {
-                SASLAuthentication.unBlacklistSASLMechanism(mechanism);
-            }
-        }
+    private synchronized static void setUpSasl() {
+        // TODO: DIGEST-MD5 mechanism disabled due to implementation problems
+        // should be enabled back when fixed in Smack
+        SASLAuthentication.blacklistSASLMechanism(SASLDigestMD5Mechanism.NAME);
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java b/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java
index 224610f12c..d85395d311 100644
--- a/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java
+++ b/xabber/src/main/java/com/xabber/android/data/extension/muc/RoomChat.java
@@ -332,7 +332,7 @@ private boolean showStatusChange() {
      * @param resource
      */
     private boolean isSelf(Resourcepart resource) {
-        return nickname.equals(resource);
+        return nickname != null && resource != null && nickname.equals(resource);
     }
 
     /**
diff --git a/xabber/src/main/java/com/xabber/android/data/intent/BaseAccountIntentBuilder.java b/xabber/src/main/java/com/xabber/android/data/intent/BaseAccountIntentBuilder.java
index 192fc612a8..e8977f5c45 100644
--- a/xabber/src/main/java/com/xabber/android/data/intent/BaseAccountIntentBuilder.java
+++ b/xabber/src/main/java/com/xabber/android/data/intent/BaseAccountIntentBuilder.java
@@ -42,10 +42,12 @@ public T setAccount(AccountJid account) {
     @Override
     void preBuild() {
         super.preBuild();
-        if (account == null)
+        if (account == null) {
             return;
-        if (getSegmentCount() != 0)
-            throw new IllegalStateException();
+        }
+        if (getSegmentCount() != 0) {
+            throw new IllegalStateException("Wrong segment count: " + getSegmentCount());
+        }
         addSegment(account.toString());
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/data/intent/EntityIntentBuilder.java b/xabber/src/main/java/com/xabber/android/data/intent/EntityIntentBuilder.java
index 9b5e0ee843..5f982cef9e 100644
--- a/xabber/src/main/java/com/xabber/android/data/intent/EntityIntentBuilder.java
+++ b/xabber/src/main/java/com/xabber/android/data/intent/EntityIntentBuilder.java
@@ -45,10 +45,12 @@ public EntityIntentBuilder setUser(UserJid user) {
     @Override
     void preBuild() {
         super.preBuild();
-        if (user == null)
+        if (user == null) {
             return;
-        if (getSegmentCount() == 0)
-            throw new IllegalStateException();
+        }
+        if (getSegmentCount() == 0) {
+            throw new IllegalStateException("Wrong segment count: " + getSegmentCount());
+        }
         addSegment(user.toString());
     }
 
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/accountoptions/AccountOptionsAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/accountoptions/AccountOptionsAdapter.java
index 9492fd698c..79aeb3b59a 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/accountoptions/AccountOptionsAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/accountoptions/AccountOptionsAdapter.java
@@ -53,6 +53,8 @@ public int getItemCount() {
 
     @Override
     public void onAccountOptionClick(int adapterPosition) {
-        listener.onAccountOptionClick(options[adapterPosition]);
+        if (adapterPosition >= 0 && adapterPosition < options.length) {
+            listener.onAccountOptionClick(options[adapterPosition]);
+        }
     }
 }
diff --git a/xabber/src/main/java/com/xabber/android/ui/adapter/contactlist/ContactListAdapter.java b/xabber/src/main/java/com/xabber/android/ui/adapter/contactlist/ContactListAdapter.java
index f62f82f7c1..478c1704d2 100644
--- a/xabber/src/main/java/com/xabber/android/ui/adapter/contactlist/ContactListAdapter.java
+++ b/xabber/src/main/java/com/xabber/android/ui/adapter/contactlist/ContactListAdapter.java
@@ -717,7 +717,9 @@ private void bindGroup(GroupViewHolder viewHolder, GroupConfiguration configurat
 
     @Override
     public void onContactClick(int adapterPosition) {
-        listener.onContactClick((AbstractContact) baseEntities.get(adapterPosition));
+        if (adapterPosition >= 0 && adapterPosition < baseEntities.size()) {
+            listener.onContactClick((AbstractContact) baseEntities.get(adapterPosition));
+        }
     }
 
     @Override
diff --git a/xabber/src/main/java/com/xabber/android/ui/dialog/ChatHistoryClearDialog.java b/xabber/src/main/java/com/xabber/android/ui/dialog/ChatHistoryClearDialog.java
new file mode 100644
index 0000000000..eb3d030357
--- /dev/null
+++ b/xabber/src/main/java/com/xabber/android/ui/dialog/ChatHistoryClearDialog.java
@@ -0,0 +1,56 @@
+package com.xabber.android.ui.dialog;
+
+
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.DialogInterface;
+import android.os.Bundle;
+
+import com.xabber.android.R;
+import com.xabber.android.data.entity.AccountJid;
+import com.xabber.android.data.entity.UserJid;
+import com.xabber.android.data.message.MessageManager;
+import com.xabber.android.data.roster.RosterManager;
+
+public class ChatHistoryClearDialog extends DialogFragment implements DialogInterface.OnClickListener {
+
+    public static final String ARGUMENT_ACCOUNT = ChatHistoryClearDialog.class.getName() + "ARGUMENT_ACCOUNT";
+    public static final String ARGUMENT_USER = ChatHistoryClearDialog.class.getName() + "ARGUMENT_USER";
+
+    AccountJid account;
+    UserJid user;
+
+    public static ChatHistoryClearDialog newInstance(AccountJid account, UserJid user) {
+        ChatHistoryClearDialog fragment = new ChatHistoryClearDialog();
+
+        Bundle arguments = new Bundle();
+        arguments.putParcelable(ARGUMENT_ACCOUNT, account);
+        arguments.putParcelable(ARGUMENT_USER, user);
+        fragment.setArguments(arguments);
+        return fragment;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Bundle args = getArguments();
+        account = args.getParcelable(ARGUMENT_ACCOUNT);
+        user = args.getParcelable(ARGUMENT_USER);
+
+        String name = RosterManager.getInstance().getBestContact(account, user).getName();
+
+        return new AlertDialog.Builder(getActivity())
+                .setTitle(R.string.clear_history)
+                .setMessage(getString(R.string.clear_chat_history_dialog_message, name))
+                .setPositiveButton(R.string.clear_chat_history_dialog_button, this)
+                .setNegativeButton(android.R.string.cancel, this).create();
+    }
+
+    @Override
+    public void onClick(DialogInterface dialog, int which) {
+        if (which == Dialog.BUTTON_POSITIVE) {
+            MessageManager.getInstance().clearHistory(account, user);
+        }
+    }
+
+}
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/ChatFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/ChatFragment.java
index bcd4f09fd2..ff57e8d30f 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/ChatFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/ChatFragment.java
@@ -81,6 +81,7 @@
 import com.xabber.android.ui.color.ColorManager;
 import com.xabber.android.ui.dialog.BlockContactDialog;
 import com.xabber.android.ui.dialog.ChatExportDialogFragment;
+import com.xabber.android.ui.dialog.ChatHistoryClearDialog;
 import com.xabber.android.ui.helper.ContactTitleInflater;
 import com.xabber.android.ui.helper.PermissionsRequester;
 import com.xabber.android.ui.preferences.ChatContactSettings;
@@ -1086,7 +1087,7 @@ private void closeChat(AccountJid account, UserJid user) {
     }
 
     private void clearHistory(AccountJid account, UserJid user) {
-        MessageManager.getInstance().clearHistory(account, user);
+        ChatHistoryClearDialog.newInstance(account, user).show(getFragmentManager(), ChatHistoryClearDialog.class.getSimpleName());
     }
 
     private void leaveConference(AccountJid account, UserJid user) {
diff --git a/xabber/src/main/java/com/xabber/android/ui/fragment/ConferenceSelectFragment.java b/xabber/src/main/java/com/xabber/android/ui/fragment/ConferenceSelectFragment.java
index 1a8fc627fe..dcdfd968a3 100644
--- a/xabber/src/main/java/com/xabber/android/ui/fragment/ConferenceSelectFragment.java
+++ b/xabber/src/main/java/com/xabber/android/ui/fragment/ConferenceSelectFragment.java
@@ -42,6 +42,7 @@
 public class ConferenceSelectFragment extends ListFragment implements AdapterView.OnItemSelectedListener,
         View.OnClickListener, MUCManager.HostedRoomsListener, AdapterView.OnItemClickListener {
 
+    private static final String LOG_TAG = ConferenceSelectFragment.class.getSimpleName();
     private Spinner accountView;
     private EditText serverView;
     private EditText roomView;
@@ -148,6 +149,11 @@ public void onSaveInstanceState(Bundle outState) {
 
     @Override
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
+        if (account == null) {
+            LogManager.w(LOG_TAG, "onItemClick: Account is null!");
+            return;
+        }
+
         try {
             startActivity(ConferenceAddActivity.createIntent(getActivity(), account,
                     UserJid.from(hostedConferencesAdapter.getItem(position).getJid())));
diff --git a/xabber/src/main/res/values-de/account_editor.xml b/xabber/src/main/res/values-de/account_editor.xml
index a5f1a6df47..610f96621a 100644
--- a/xabber/src/main/res/values-de/account_editor.xml
+++ b/xabber/src/main/res/values-de/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">Kontotyp</string>
   <string name="account_type_hints_gtalk">Benutzername für Google Talk</string>
   <string name="account_type_helps_gtalk">Wenn du über kein Google-Konto verfügst, kannst du unter http://mail.google.com\n eins erstellen. Verwende bitte your_user_name@your_google_domain</string>
+  <string name="account_xmpp_register_warning">Du musst zunächst <a href="http://www.google.de/#q=XMPP+Account+erstellen">einen XMPP Account erstellen</a> um Xabber zu nutzen!</string>
   <string name="account_type_helps_xmpp">Wenn du mehr über XMPP (Jabber) erfahren möchtest, besuche https://xmpp.org</string>
   <string name="account_user_name">Benutzername</string>
   <string name="EMPTY_SERVER_NAME">Servername nicht angegeben</string>
@@ -55,7 +56,7 @@
   <string name="account_tls_mode">TLS/SSL-Verschlüsselung</string>
   <string name="account_tls_require">TLS benötigt</string>
   <string name="account_tls_require_summary">TLS-Verschlüsselung für Verbindung zum Server verlangen</string>
-  <string name="account_use_orbot">Chatten über das anonyme Netzwerk TOR und erzwingen einer TLS Verschlüsselung\nFür Google Talk nicht empfohlen</string>
+  <string name="account_use_orbot">Anonymer Chat über TOR und Erzwingen einer TLS Verschlüsselung wird für Google Talk nicht empfohlen</string>
   <string name="confirm_cancellation">Wollen Sie wirklich alle Änderungen verwerfen?</string>
   <string name="INCORRECT_USER_NAME">Überprüfen Sie den Benutzernamen. Details finden Sie unten im Hilfetext.</string>
   <string name="orbot_required_message">Für die Nutzung von TOR muss Orbot installiert sein und die Proxy-Verbindung darüber laufen. Möchten Sie die App von Google Play herunterladen?</string>
@@ -74,8 +75,8 @@
   <string name="account_color_name_cyan">Türkis</string>
   <string name="account_connection_settings">Verbindungseinstellungen</string>
   <string name="blocked_contacts">Blockierte Kontakte</string>
-  <string name="blocked_contacts_unknown">Unterstützung für Sperrung noch nicht beschlossen.</string>
-  <string name="blocked_contacts_not_supported">Sperrung wird vom Server nicht unterstützt.</string>
+  <string name="blocked_contacts_unknown">Serverseitige Unterstützung für Kontaktsperrung noch nicht ermittelt.</string>
+  <string name="blocked_contacts_not_supported">Keine serverseitige Unterstützung für Kontaktsperrung.</string>
   <string name="blocked_contacts_empty">Nicht blockierte Kontakte.</string>
   <plurals name="blocked_contacts_number">
     <item quantity="one">%d Kontakt blockiert.</item>
diff --git a/xabber/src/main/res/values-de/account_list.xml b/xabber/src/main/res/values-de/account_list.xml
index 8f3d07c34c..078f4a3daa 100644
--- a/xabber/src/main/res/values-de/account_list.xml
+++ b/xabber/src/main/res/values-de/account_list.xml
@@ -8,7 +8,7 @@
   <string name="account_editor">Konto bearbeiten</string>
   <string name="account_state_registration">Registrierung</string>
   <string name="account_state_authentication">Autorisierung</string>
-  <string name="account_state_connected">Online</string>
+  <string name="account_state_connected">Verfügbar</string>
   <string name="account_state_connecting">Verbinden</string>
   <string name="account_state_disconnecting">Verbindung wird getrennt</string>
   <string name="account_state_offline">Abgemeldet</string>
diff --git a/xabber/src/main/res/values-de/contact_editor.xml b/xabber/src/main/res/values-de/contact_editor.xml
index 51295735a1..f753fb8c2c 100644
--- a/xabber/src/main/res/values-de/contact_editor.xml
+++ b/xabber/src/main/res/values-de/contact_editor.xml
@@ -6,7 +6,7 @@
   <string name="contact_name">Alias (optional)</string>
   <string name="contact_subscribe_confirm">Wollen Sie Ihren Kontostatus %1$s mit dem Kontakt teilen?</string>
   <string name="contact_user">Benutzername des Kontakts</string>
-  <string name="ENTRY_IS_NOT_FOUND">Kontakt wurde nicht gefunden</string>
+  <string name="ENTRY_IS_NOT_FOUND">Kontakt nicht gefunden</string>
   <string name="group_is_empty">Gruppenname setzen</string>
   <string name="group_name">Gruppenname</string>
   <string name="choose_account">Konto auswählen</string>
diff --git a/xabber/src/main/res/values-de/contact_list.xml b/xabber/src/main/res/values-de/contact_list.xml
index b5f3aa3a3c..f04ced08a0 100644
--- a/xabber/src/main/res/values-de/contact_list.xml
+++ b/xabber/src/main/res/values-de/contact_list.xml
@@ -6,7 +6,7 @@
   <string name="application_action_disabled">Konten verwalten</string>
   <string name="application_action_empty">Konto hinzufügen</string>
   <string name="application_action_no_contacts">Kontakt hinzufügen</string>
-  <string name="application_action_no_online">Offline Kontakte zeigen</string>
+  <string name="application_action_no_online">Offline Kontakte anzeigen</string>
   <string name="application_action_offline">Verbinden</string>
   <string name="application_action_waiting">Wiederverbinden</string>
   <string name="application_state_connecting">Verbinde...</string>
diff --git a/xabber/src/main/res/values-de/contact_viewer.xml b/xabber/src/main/res/values-de/contact_viewer.xml
index f658fe09c8..2ff5316812 100644
--- a/xabber/src/main/res/values-de/contact_viewer.xml
+++ b/xabber/src/main/res/values-de/contact_viewer.xml
@@ -4,7 +4,7 @@
   <string name="contact_viewer">Kontaktinformationen</string>
   <string name="contact_viewer_client">Client</string>
   <string name="contact_viewer_this_device">Dieses Gerät</string>
-  <string name="vcard_nick_name">Nickname</string>
+  <string name="vcard_nick_name">Spitzname</string>
   <string name="vcard_formatted_name">Formatierter Name</string>
   <string name="vcard_prefix_name">Präfix</string>
   <string name="vcard_given_name">Vorname</string>
diff --git a/xabber/src/main/res/values-de/muc_editor.xml b/xabber/src/main/res/values-de/muc_editor.xml
index 91bf7e3237..eddc2da7d7 100644
--- a/xabber/src/main/res/values-de/muc_editor.xml
+++ b/xabber/src/main/res/values-de/muc_editor.xml
@@ -4,10 +4,10 @@
   <string name="EMPTY_NICK_NAME">Nickname nicht angegeben</string>
   <string name="EMPTY_ROOM_NAME">Konferenz nicht angegeben</string>
   <string name="muc_join">Konferenz beitreten</string>
-  <string name="muc_nick">Nick</string>
-  <string name="muc_nick_hint">Ihr Nickname in der Konferenz</string>
+  <string name="muc_nick">Spitzname</string>
+  <string name="muc_nick_hint">Ihr Spitzname in der Konferenz</string>
   <string name="muc_password">Passwort</string>
-  <string name="muc_password_hint">Kein Passwort benötigt</string>
+  <string name="muc_password_hint">Passwort wird nicht benötigt</string>
   <string name="muc_room">Konferenz</string>
   <string name="muc_server">Mehrbenutzer Chat</string>
   <string name="NICK_ALREADY_USED">Der Nickname wird bereits verwendet</string>
diff --git a/xabber/src/main/res/values-de/phrase_editor.xml b/xabber/src/main/res/values-de/phrase_editor.xml
index 12b49088e7..48a9a24fbd 100644
--- a/xabber/src/main/res/values-de/phrase_editor.xml
+++ b/xabber/src/main/res/values-de/phrase_editor.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="phrase_add">Satz hinzufügen</string>
-  <string name="phrase_delete">Satz löschen</string>
-  <string name="phrase_delete_confirm">Wollen Sie folgenden Begriff wirklich löschen: %s?</string>
+  <string name="phrase_add">Ausdruck hinzufügen</string>
+  <string name="phrase_delete">Ausdruck löschen</string>
+  <string name="phrase_delete_confirm">Wollen Sie folgenden Ausdruck wirklich löschen: %s?</string>
   <string name="phrase_empty">&lt; beliebiger Text &gt;</string>
   <string name="phrase_group">Teil der Kontaktgruppe</string>
   <string name="phrase_regexp">Regulärer Ausdruck</string>
diff --git a/xabber/src/main/res/values-de/preference_editor.xml b/xabber/src/main/res/values-de/preference_editor.xml
index e8426a2cd0..556d7a82c1 100644
--- a/xabber/src/main/res/values-de/preference_editor.xml
+++ b/xabber/src/main/res/values-de/preference_editor.xml
@@ -2,7 +2,7 @@
 <!--Generated by crowdin.com-->
 <resources>
   <string name="cache_clear">Cache löschen\nAlle lokalen Daten löschen. Dadurch kann etwas Speicherplatz frei werden.</string>
-  <string name="cache_clear_warning">Wollen Sie wirklich den Chatverlauf und andere lokale Daten entfernen? \nAccount und Listendaten sind davon nicht betroffen. Die Anwendung wird geschlossen.</string>
+  <string name="cache_clear_warning">Wollen Sie wirklich den Chatverlauf und andere lokale Daten entfernen? \nKonto und Kontaktliste sind davon nicht betroffen. Die Anwendung wird geschlossen.</string>
   <string name="chats_send_by_enter">Senden mit Enter\nDurch Drücken der Enter-Taste kann die Nachricht gesendet werden</string>
   <string name="connection_go_away">Status autom. auf \"Abwesend\" ändern\nStatus automatisch auf \"Abwesend\" setzen, wenn der Bildschirm gesperrt wird</string>
   <string name="contacts_order">Kontakteliste sortieren \nFestlegen der Reihenfolge, in welcher die Kontakte angezeigt werden</string>
diff --git a/xabber/src/main/res/values-fr/account_editor.xml b/xabber/src/main/res/values-fr/account_editor.xml
index 7465c0b823..3c8ed4b24d 100644
--- a/xabber/src/main/res/values-fr/account_editor.xml
+++ b/xabber/src/main/res/values-fr/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">Type de compte</string>
   <string name="account_type_hints_gtalk">Identifiant gmail.com ou domaine Google Apps</string>
   <string name="account_type_helps_gtalk">Pas de compte Google ? Vous pouvez en créer un sur http://mail.google.com\nVous pouvez aussi utiliser identifiant@votredomainegoogle</string>
+  <string name="account_xmpp_register_warning">Vous devez <a href="http://www.google.com/#q=register XMPP account">enregistrer un compte XMPP</a> avant de l\'ajouter à Xabber!</string>
   <string name="account_type_helps_xmpp">Vous pouvez en apprendre plus sur XMPP (Jabber) ici : https://xmpp.org</string>
   <string name="account_user_name">Identifiant</string>
   <string name="EMPTY_SERVER_NAME">Le nom du serveur est manquant</string>
diff --git a/xabber/src/main/res/values-hu/account_editor.xml b/xabber/src/main/res/values-hu/account_editor.xml
index 9c3837a6d5..0513b9e0ca 100644
--- a/xabber/src/main/res/values-hu/account_editor.xml
+++ b/xabber/src/main/res/values-hu/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">Fióktípus</string>
   <string name="account_type_hints_gtalk">gmail.com felhasználónév vagy Google Apps tartomány</string>
   <string name="account_type_helps_gtalk">Ha nincs Google fiókod, létrehozhatsz egyet itt: http://mail.google.com \n Vagy használhatod a felhasznaloneved@google_tartomanyod is</string>
+  <string name="account_xmpp_register_warning"><a href="http://www.google.com/#q=register XMPP account">Regisztrálj XMPP fiókot</a>, azután tudod hozzáadni a Xabberhez!</string>
   <string name="account_type_helps_xmpp">Tudj meg többet az XMPP-ről (Jabberről) itt: https://xmpp.org</string>
   <string name="account_user_name">Felhasználónév</string>
   <string name="EMPTY_SERVER_NAME">A szervernév nincs megadva</string>
diff --git a/xabber/src/main/res/values-in/account_editor.xml b/xabber/src/main/res/values-in/account_editor.xml
index 63d7d79b9e..da4819de4a 100644
--- a/xabber/src/main/res/values-in/account_editor.xml
+++ b/xabber/src/main/res/values-in/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">Jenis akun</string>
   <string name="account_type_hints_gtalk">nama pengguna untuk gmail.com atau domain Aplikasi Google</string>
   <string name="account_type_helps_gtalk">Jika anda belum memiliki akun Google, anda dapat membuatnya di http://mail.google.com\n Anda juga dapat menggunakan nama_pengguna_anda@domain_google_anda</string>
+  <string name="account_xmpp_register_warning">Anda harus <a href="http://www.google.com/#q=register XMPP account">mendaftar akun XMPP</a> sebelum menambahkannya dalam Xabber!</string>
   <string name="account_type_helps_xmpp">Jika anda ingin mempelajari XMPP (Jabber) lebih lanjut, kunjungi: https://xmpp.org</string>
   <string name="account_user_name">Nama pengguna</string>
   <string name="EMPTY_SERVER_NAME">Nama server belum ditentukan</string>
diff --git a/xabber/src/main/res/values-it/account_editor.xml b/xabber/src/main/res/values-it/account_editor.xml
index e79936ea29..363dea930c 100644
--- a/xabber/src/main/res/values-it/account_editor.xml
+++ b/xabber/src/main/res/values-it/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">Tipo account</string>
   <string name="account_type_hints_gtalk">username per gmail.com o per Google Apps</string>
   <string name="account_type_helps_gtalk">Se non possiedi un account Google puoi crearne uno visitando http://mail.google.com\nÈ anche possibile utilizzare  nome_utente@dominio_personale_google</string>
+  <string name="account_xmpp_register_warning">È necessario <a href="http://www.google.com/#q=register XMPP account">registrare un account XMPP</a> prima di aggiungerlo a Xabber!</string>
   <string name="account_type_helps_xmpp">Se vuoi saperne di più su XMPP (Jabber) visita https://xmpp.org</string>
   <string name="account_user_name">Nome utente</string>
   <string name="EMPTY_SERVER_NAME">Il nome del server non è stato specificato</string>
diff --git a/xabber/src/main/res/values-it/muc_editor.xml b/xabber/src/main/res/values-it/muc_editor.xml
index 77564e382f..a3fb20a64a 100644
--- a/xabber/src/main/res/values-it/muc_editor.xml
+++ b/xabber/src/main/res/values-it/muc_editor.xml
@@ -23,9 +23,9 @@
   <string name="muc_save">Salva conferenza</string>
   <string name="muc_choose_conference">Scegli conferenza</string>
   <string name="muc_next">Successivo</string>
-  <string name="muc_get_hosted_conferences">Elenca conferenze ospitate</string>
+  <string name="muc_get_hosted_conferences">Ottieni conversazioni di gruppo allogate</string>
   <string name="muc_error_getting_conferences">Errore nell\'ottenere la lista delle conferenze</string>
   <string name="muc_type_conference_name">Inserire nome conferenza</string>
   <string name="contact_is_blocked">Il contatto è bloccato!</string>
-  <string name="conference_invitation">Invito ad una conferenza</string>
+  <string name="conference_invitation">Invito ad una conversazione di gruppo</string>
 </resources>
diff --git a/xabber/src/main/res/values-ja/account_editor.xml b/xabber/src/main/res/values-ja/account_editor.xml
index e95a3b8669..1768d76afe 100644
--- a/xabber/src/main/res/values-ja/account_editor.xml
+++ b/xabber/src/main/res/values-ja/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">アカウントの種類</string>
   <string name="account_type_hints_gtalk">gmail.com または Google Apps ドメイン用のユーザー名</string>
   <string name="account_type_helps_gtalk">Google アカウントを持っていない場合、http://mail.google.com で作成してください\nyour_user_name@your_google_domain を使用することもできます</string>
+  <string name="account_xmpp_register_warning">Xabber に追加する前に <a href="http://www.google.com/#q=register XMPP account">XMPP アカウントを登録</a> する必要があります!</string>
   <string name="account_type_helps_xmpp">XMPP (Jabber) についての詳細は: https://xmpp.org</string>
   <string name="account_user_name">ユーザー名</string>
   <string name="EMPTY_SERVER_NAME">サーバー名が指定されていません</string>
diff --git a/xabber/src/main/res/values-nb/account_editor.xml b/xabber/src/main/res/values-nb/account_editor.xml
index 946088f955..8b97b2f30d 100644
--- a/xabber/src/main/res/values-nb/account_editor.xml
+++ b/xabber/src/main/res/values-nb/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">Kontotype</string>
   <string name="account_type_hints_gtalk">brukernavn for gmail.com eller Google Apps-domene</string>
   <string name="account_type_helps_gtalk">Hvis du ikke har en Google-konto kan du lage en ny på http://mail.google.com\nDu kan også bruke ditt_brukernavn@ditt_google_domene</string>
+  <string name="account_xmpp_register_warning">Du må <a href="http://www.google.com/#q=registrere en XMPP-konto"></a> før du legger den til i Xabber!</string>
   <string name="account_type_helps_xmpp">Hvis du vil lære mer om XMPP (Jabber) se her: https://xmpp.org</string>
   <string name="account_user_name">Brukernavn</string>
   <string name="EMPTY_SERVER_NAME">Tjenernavn er ikke angitt</string>
@@ -83,9 +84,11 @@
   </plurals>
   <string name="account_chat_history">Sludrehistorikk</string>
   <string name="account_history_options_summary">Lagringsvalg for sludrehistorikk</string>
+  <string name="account_chat_history_unknown">Støtte for sludrehistorikk fra tjenerlager er ikke bestemt enda</string>
   <string name="account_chat_history_not_supported">Tjeneren støtter ikke lagring av sludrehistorikk.</string>
   <string name="account_mam_default_behavior_title">Behandling av meldingsarkiv</string>
   <string name="account_mam_default_behavior_always">Lagre alle meldinger på tjeneren</string>
+  <string name="account_mam_default_behavior_roster">Lagre kontaktliste på tjeneren</string>
   <string name="account_mam_default_behavior_never">Ikke lagre noen meldinger på tjeneren</string>
   <string name="account_mam_sync_title">Last inn meldingshistorikk</string>
   <string name="account_mam_sync_all">Last inn historikk for alle kontakter</string>
diff --git a/xabber/src/main/res/values-nb/contact_editor.xml b/xabber/src/main/res/values-nb/contact_editor.xml
index 5b037b8a9f..311a711aac 100644
--- a/xabber/src/main/res/values-nb/contact_editor.xml
+++ b/xabber/src/main/res/values-nb/contact_editor.xml
@@ -19,6 +19,8 @@
   <string name="error_during_image_processing">Feil ved behandling av bilde</string>
   <string name="account_settings">Kontoinnstillinger</string>
   <string name="account_user_info">Kontoinformasjon</string>
+  <string name="account_server_info">Tjenerinfo</string>
+  <string name="account_server_info_description">Liste over tjenerfunksjoner</string>
   <string name="conference_private_chat_invitation">%1$s fra %2$s ønsker å starte en private samtale med deg</string>
   <string name="accept_muc_private_chat">Godta</string>
   <string name="block_muc_private_chat">Blokker</string>
diff --git a/xabber/src/main/res/values-nb/contact_list.xml b/xabber/src/main/res/values-nb/contact_list.xml
index 31fcf6d39d..f1052da36a 100644
--- a/xabber/src/main/res/values-nb/contact_list.xml
+++ b/xabber/src/main/res/values-nb/contact_list.xml
@@ -75,6 +75,9 @@
   <string name="dark_theme_suggest_dialog_join_dark_side">Gå over til den mørke siden</string>
   <string name="dark_theme_suggest_dialog_stay_on_light_side">Bli værende på lysets side</string>
   <string name="battery_optimization_disable_dialog_title">Batterioptimisering</string>
+  <string name="battery_optimization_disable_dialog_message">Enheten din har iverksatt hissig batterioptimisering som kan lede til at merknader fra Xabber blir forsinket eller faktisk forsvinne.\n\nDu vil nå bli spurt om å skru av dette.</string>
+  <string name="save_log_to_file">Lagre til fil</string>
+  <string name="clear_log">Slett gamle loggfiler</string>
   <string name="open_log_file">Åpne</string>
   <string name="send_log_file">Send</string>
   <string name="intro_welcome">Velkommen til Xabber</string>
diff --git a/xabber/src/main/res/values-nb/contact_viewer.xml b/xabber/src/main/res/values-nb/contact_viewer.xml
index 292a672ccd..dbae80c15c 100644
--- a/xabber/src/main/res/values-nb/contact_viewer.xml
+++ b/xabber/src/main/res/values-nb/contact_viewer.xml
@@ -3,6 +3,7 @@
 <resources>
   <string name="contact_viewer">Kontaktinformasjon</string>
   <string name="contact_viewer_client">Klient</string>
+  <string name="contact_viewer_this_device">Denne enheten</string>
   <string name="vcard_nick_name">Kallenavn</string>
   <string name="vcard_formatted_name">Fullt navn</string>
   <string name="vcard_prefix_name">Prefiks</string>
@@ -51,6 +52,7 @@
   <string name="edit_contact_groups">Rediger grupper</string>
   <string name="remove_contact">Slett kontakt</string>
   <string name="edit_account_user_info">Rediger brukerinformasjon</string>
+  <string name="edit_vcard">Rediger</string>
   <string name="account_user_info_save_success">Brukerinformasjon for konto er lagret</string>
   <string name="account_user_info_save_fail">Kunne ikke lagre brukerinformasjon for konto</string>
   <string name="saving">Lagrer&#8230;</string>
@@ -63,4 +65,6 @@
   <string name="conference_description">Beskrivelse</string>
   <string name="conference_subject">Emne</string>
   <string name="message_info_occupants_number">Deltakere: %d</string>
+  <string name="contact_info_connected_clients_header">Tilkoblede enheter</string>
+  <string name="contact_info_visiting_card_header">vCard</string>
 </resources>
diff --git a/xabber/src/main/res/values-nb/preference_editor.xml b/xabber/src/main/res/values-nb/preference_editor.xml
index 33e006c9c9..7abbe3d882 100644
--- a/xabber/src/main/res/values-nb/preference_editor.xml
+++ b/xabber/src/main/res/values-nb/preference_editor.xml
@@ -17,7 +17,11 @@
   <string name="contacts_show_panel">Vis kontopanel\nVis handlingsknapper med avatarer nederst til høyre i kontaktlisten</string>
   <string name="contacts_stay_active_chats">Dupliser aktive samtaler\nAktive samtaler vises både øverst i kontaktlisten og i grupper</string>
   <string name="debug_log">Feilsøkingslogg\nSkriv beskjeder til feilsøkingsloggen (du starte programmet på nytt for å ta endringene i bruk)</string>
+  <string name="debug_file_log_title">Skriv fillogg\nSkriv feilrettingslogg til lokal fil (du kan dele den).</string>
+  <string name="debug_log_files_title">Loggfiler\nListe over skrevne loggfiler.</string>
+  <string name="debug_log_files_activity_title">Loggfiler</string>
   <string name="debug_connection_errors_title">Vis tilkoblingsfeil\nVis oppsprettsvinduer med tilkoblingsunntak</string>
+  <string name="debug_crash_reports_title">Send kræsjrapporter\nSend anonyme kræsjrapporter for å hjelpe utviklingen av Xabber. (Start programmet på nytt for at disse endringene skal tre i effekt).</string>
   <string name="events_lightning">Lysvarsel\nBlink LED-lyset ved varsler</string>
   <string name="events_persistent">Ikon på oppgavelinjen\nVis vedvarende melding. Dette alternativet hindrer at Android fjerner programmet fra minnet</string>
   <string name="events_sound">Varslingslyd\nVelg varslingslyd</string>
@@ -82,4 +86,5 @@
   <string name="connection_use_plain_text_auth">Klartekstbekreftelse\nBruk klartekstbekreftelse for alle kontoer. Ikke anbefalt.</string>
   <string name="events_phrases">Nøkkelsetninger\nOpprett egendefinert varsel for mottatte meldinger som inneholder gitte setninger</string>
   <string name="security_clear_certificate_warning">Ønsker du virkelig å fjerne alle ignorerte sertifikater?</string>
+  <string name="account_error_settings">Innstillinger</string>
 </resources>
diff --git a/xabber/src/main/res/values-ru/chat_viewer.xml b/xabber/src/main/res/values-ru/chat_viewer.xml
index 507ce79066..aeeddfa220 100644
--- a/xabber/src/main/res/values-ru/chat_viewer.xml
+++ b/xabber/src/main/res/values-ru/chat_viewer.xml
@@ -10,6 +10,8 @@
   <string name="chat_input_hint">Введите сообщение</string>
   <string name="chat_send">Отправить</string>
   <string name="clear_history">Очистить историю сообщений</string>
+  <string name="clear_chat_history_dialog_button">Очистить</string>
+  <string name="clear_chat_history_dialog_message">Очистить всю историю сообщений с %s?</string>
   <string name="contact_is_offline">Сообщения доставлены на сервер получателя и могут быть прочитаны им после подключения к сети</string>
   <string name="ENTRY_IS_NOT_AVAILABLE">Контакт не доступен</string>
   <string name="FILE_NOT_FOUND">Файл не найден</string>
diff --git a/xabber/src/main/res/values-sr/account_editor.xml b/xabber/src/main/res/values-sr/account_editor.xml
index e284ca137c..3b6662c6cd 100644
--- a/xabber/src/main/res/values-sr/account_editor.xml
+++ b/xabber/src/main/res/values-sr/account_editor.xml
@@ -30,7 +30,7 @@
   <string name="account_enabled_summary">Кликните да укључите налог</string>
   <string name="account_invalid_port">Порт мора бити број (подразумевано: 5222)</string>
   <string name="account_invalid_port_range">Порт мора бити између 1 и 65535 (подразумевани: 5222)</string>
-  <string name="account_invalid_priority">Приоритет мора бити број између -128 и 128 (подразумевано: 10)</string>
+  <string name="account_invalid_priority">Приоритет мора бити број између -128 и 127 (подразумевано: 10)</string>
   <string name="account_oauth">Овлашћење</string>
   <string name="account_oauth_invalidated">Без овлашћења</string>
   <string name="account_oauth_summary">ОАут поставке</string>
@@ -62,6 +62,7 @@
   <string name="orbot_required_title">Инсталирати Орбот?</string>
   <string name="install_orbot">Инсталирај Орбот</string>
   <string name="ACCOUNT_REGISTER_FAILED">Неуспех регистровања налога на серверу.</string>
+  <string name="SERVER_INFO_ERROR">Не могу да добавим податке о серверу.</string>
   <string name="account_color">Боја налога</string>
   <string name="account_color_name_green">Зелена</string>
   <string name="account_color_name_orange">Наранџаста</string>
@@ -71,4 +72,17 @@
   <string name="account_color_name_teal">Плавозелена</string>
   <string name="account_color_name_blue_grey">Плавосива</string>
   <string name="account_color_name_cyan">Цијан</string>
+  <string name="account_connection_settings">Поставке везе</string>
+  <string name="blocked_contacts">Блокирани контакти</string>
+  <string name="blocked_contacts_unknown">Подршка за блокирање је још увек неодређена.</string>
+  <string name="blocked_contacts_not_supported">Блокирање сервер не подржава.</string>
+  <string name="blocked_contacts_empty">Нема блокираних особа.</string>
+  <plurals name="blocked_contacts_number">
+    <item quantity="one">%d блокирана особа.</item>
+    <item quantity="few">%d блокиране особе.</item>
+    <item quantity="other">%d блокираних особа.</item>
+  </plurals>
+  <string name="account_chat_history">Историјат ћаскања</string>
+  <string name="account_history_options_summary">Опције смештања историјата порука</string>
+  <string name="account_clear_history_on_exit_title">Очисти историјат при изласку</string>
 </resources>
diff --git a/xabber/src/main/res/values-sr/contact_list.xml b/xabber/src/main/res/values-sr/contact_list.xml
index e5ef65aa5f..a10d4b0c6a 100644
--- a/xabber/src/main/res/values-sr/contact_list.xml
+++ b/xabber/src/main/res/values-sr/contact_list.xml
@@ -73,5 +73,5 @@
   <string name="dark_theme_suggest_dialog_title">Изаберите своју судбину</string>
   <string name="dark_theme_suggest_dialog_message">Нова тамна тема је доступна за Ксабер. Можете ли се одупрети искушењу да је пробате?</string>
   <string name="dark_theme_suggest_dialog_join_dark_side">Придружи се Тамној страни</string>
-  <string name="dark_theme_suggest_dialog_stay_on_light_side">"Остани на Светлој страни"</string>
+  <string name="dark_theme_suggest_dialog_stay_on_light_side">Остани на Светлој страни</string>
 </resources>
diff --git a/xabber/src/main/res/values-sr/fingerprint_viewer.xml b/xabber/src/main/res/values-sr/fingerprint_viewer.xml
index d61f9cf443..ea8d6bf2f4 100644
--- a/xabber/src/main/res/values-sr/fingerprint_viewer.xml
+++ b/xabber/src/main/res/values-sr/fingerprint_viewer.xml
@@ -5,7 +5,7 @@
   <string name="otr_is_verified">Овај контакт је поуздан</string>
   <string name="otr_local_fingerprint">Ваш отисак:</string>
   <string name="otr_remote_fingerprint">Отисак вашег саговорника:</string>
-  <string name="otr_scan_fingerprint">Скенирајте QR код са отиском саговорника</string>
-  <string name="otr_show_fingerprint">Прикажи QR код мог отиска</string>
+  <string name="otr_scan_fingerprint">Скенирајте Куер код са отиском саговорника</string>
+  <string name="otr_show_fingerprint">Прикажи Куер код мог отиска</string>
   <string name="otr_copy_fingerprint">Копирај мој отисак у клипборд</string>
 </resources>
diff --git a/xabber/src/main/res/values-sr/notification_bar.xml b/xabber/src/main/res/values-sr/notification_bar.xml
index 721cd9ac12..9005116073 100644
--- a/xabber/src/main/res/values-sr/notification_bar.xml
+++ b/xabber/src/main/res/values-sr/notification_bar.xml
@@ -3,28 +3,35 @@
 <resources>
   <string name="account_quantity_1">налог</string>
   <string name="account_quantity_2">налога</string>
+  <!-- Used for plural form in russian.-->
   <string name="account_quantity_5">налога</string>
   <string name="account_quantity_offline_1">налог</string>
   <string name="account_quantity_offline_2">налога</string>
+  <!-- Used for plural form in russian. -->
   <string name="account_quantity_offline_5">налога</string>
   <string name="AUTHENTICATION_FAILED">Грешка аутентификације</string>
   <string name="chat_contact_quantity_1">контакт</string>
   <string name="chat_contact_quantity_2">контакта</string>
+  <!-- Used for plural form in russian. -->
   <string name="chat_contact_quantity_5">контаката</string>
   <string name="chat_message_quantity_1">порука</string>
   <string name="chat_message_quantity_2">поруке</string>
+  <!-- Used for plural form in russian. -->
   <string name="chat_message_quantity_5">порука</string>
   <string name="chat_status">%1$d %2$s од %3$d %4$s</string>
   <string name="chat_messages_from_contact">%1$d %2$s од %3$s</string>
   <string name="chat_contact_and_message">%1$s: %2$s</string>
   <string name="connection_state_connected_1">%1$d од %2$d %3$s повезан</string>
   <string name="connection_state_connected_2">%1$d од %2$d %3$s повезана</string>
+  <!-- Used for plural form in russian. -->
   <string name="connection_state_connected_5">%1$d од %2$d %3$s повезано</string>
   <string name="connection_state_connecting_1">повезивање %1$d од %2$d %3$s</string>
   <string name="connection_state_connecting_2">повезивање %1$d од %2$d %3$s</string>
+  <!-- Used for plural form in russian. -->
   <string name="connection_state_connecting_5">повезивање %1$d од %2$d %3$s</string>
   <string name="connection_state_waiting_1">%1$d од %2$d %3$s чека на повезивање</string>
   <string name="connection_state_waiting_2">%1$d од %2$d %3$s чекају на повезивање</string>
+  <!-- Used for plural form in russian. -->
   <string name="connection_state_waiting_5">%1$d од %2$d %3$s чекају на повезивање</string>
   <string name="connection_state_offline">%1$d %2$s ван везе</string>
   <string name="archive_available_request_message">Желите ли да складиштите историјат порука на серверу?\nОво омогућује Ксаберу да учита историјат порука са свих уређаја који користе овај налог.\nОва функција ће повући нешто више података са интернета и лагано смањити брзину везе.\nУПОЗОРЕЊЕ: Читав ваш локални историјат ће бити уклоњен.</string>
diff --git a/xabber/src/main/res/values-sr/preference_editor.xml b/xabber/src/main/res/values-sr/preference_editor.xml
index 9a6598d87c..38c3914671 100644
--- a/xabber/src/main/res/values-sr/preference_editor.xml
+++ b/xabber/src/main/res/values-sr/preference_editor.xml
@@ -17,6 +17,7 @@
   <string name="contacts_show_panel">Прикажи панел налога\nПриказ дугмади радњи са аватарима у доњем десном углу листе</string>
   <string name="contacts_stay_active_chats">Дупликати активног ћаскања\nАктивна ћаскања се приказују и изнад листе и у групама</string>
   <string name="debug_log">Дневник грешака\nУпис порука у дневник за отклањање грешака (потребан рестарт)</string>
+  <string name="debug_connection_errors_title">Приказ грешака везе\nИскачуће поруке при грешкама повезивања</string>
   <string name="events_lightning">Светлосна индикација\nЛЕД трепће при обавештењима</string>
   <string name="events_persistent">Икона траке задатака\nПриказује стално обавештење. Ова опција спречава Андроид да избаци програм из меморије</string>
   <string name="events_sound">Звучно упозорење\nИзаберите звук обавештења</string>
@@ -81,5 +82,4 @@
   <string name="connection_use_plain_text_auth">Аутентификација обичним текстом\nАутентификација обичним текстом за све налоге. Није препоручљиво.</string>
   <string name="events_phrases">Кључне речи\nНаправите посебна обавештења кад примљене поруке садрже наведене речи</string>
   <string name="security_clear_certificate_warning">Желите ли заиста да уклоните све игнорисане сертификате?</string>
-  <string name="debug_connection_errors_title">Приказ грешака везе\nИскачуће поруке при грешкама повезивања</string>
 </resources>
diff --git a/xabber/src/main/res/values-sv/account_editor.xml b/xabber/src/main/res/values-sv/account_editor.xml
index 846dd9a220..295dc09efd 100644
--- a/xabber/src/main/res/values-sv/account_editor.xml
+++ b/xabber/src/main/res/values-sv/account_editor.xml
@@ -14,6 +14,7 @@
   <string name="account_type_hints_gtalk">användarnamn för gmail.com eller Google Appsdomänen</string>
   <string name="account_type_helps_gtalk">Om du ännu inte har ett Googlekonto kan du skapa ett på: http://mail.google.com\n
 Du kan även välja att använda ditt_konto_namn@din_google_domän</string>
+  <string name="account_xmpp_register_warning">Du måste <a href="http://www.google.com/#q=register XMPP account"> registrera ett XMPP-konto</a> innan du lägger till det i Xabber!</string>
   <string name="account_type_helps_xmpp">Om du vill veta mer om XMPP (Jabber) gå till: https://xmpp.org</string>
   <string name="account_user_name">Användarnamn</string>
   <string name="EMPTY_SERVER_NAME">Servernamn har inte angetts</string>
diff --git a/xabber/src/main/res/values-zh-rCN/account_editor.xml b/xabber/src/main/res/values-zh-rCN/account_editor.xml
index 4e1453389e..d926eea99e 100644
--- a/xabber/src/main/res/values-zh-rCN/account_editor.xml
+++ b/xabber/src/main/res/values-zh-rCN/account_editor.xml
@@ -13,6 +13,7 @@
   <string name="account_type">账户类型</string>
   <string name="account_type_hints_gtalk">gmail.com或Google Apps域上的用户名</string>
   <string name="account_type_helps_gtalk">如果没有Google账户，你可以在 http://mail.google.com 创建一个\n你也可以使用your_user_name@your_google_domain</string>
+  <string name="account_xmpp_register_warning">在添加到 Xabber 之前，你必须 <a href="http://www.google.com/#q=register XMPP account"> 注册 XMPP 帐户</a>！</string>
   <string name="account_type_helps_xmpp">如果你想了解更多关于XMPP（Jabber）的信息，请参阅： https://xmpp.org</string>
   <string name="account_user_name">用户名</string>
   <string name="EMPTY_SERVER_NAME">域未指定</string>
@@ -62,6 +63,7 @@
   <string name="orbot_required_title">安装Orbot？</string>
   <string name="install_orbot">安装Orbot</string>
   <string name="ACCOUNT_REGISTER_FAILED">未能在服务器上注册账户。</string>
+  <string name="SERVER_INFO_ERROR">无法获取服务器信息。</string>
   <string name="account_color">账户颜色</string>
   <string name="account_color_name_green">绿色</string>
   <string name="account_color_name_orange">橙色</string>
@@ -71,4 +73,26 @@
   <string name="account_color_name_teal">深青色</string>
   <string name="account_color_name_blue_grey">蓝灰色</string>
   <string name="account_color_name_cyan">青色</string>
+  <string name="account_connection_settings">连接设置</string>
+  <string name="blocked_contacts">屏蔽的联系人</string>
+  <string name="blocked_contacts_unknown">不能确定是否支持屏蔽联系人。</string>
+  <string name="blocked_contacts_not_supported">服务器不支持屏蔽。</string>
+  <string name="blocked_contacts_empty">无屏蔽的联系人。</string>
+  <plurals name="blocked_contacts_number">
+    <item quantity="other">已屏蔽 %d 个联系人。</item>
+  </plurals>
+  <string name="account_chat_history">聊天历史</string>
+  <string name="account_history_options_summary">聊天消息的存储选项</string>
+  <string name="account_chat_history_unknown">尚未确定是否支持聊天历史记录保存在服务器上</string>
+  <string name="account_chat_history_not_supported">服务器不支持存储聊天记录。</string>
+  <string name="account_mam_default_behavior_title">消息存档管理</string>
+  <string name="account_mam_default_behavior_always">在服务器上存储所有消息</string>
+  <string name="account_mam_default_behavior_roster">将名册联系人消息存储在服务器上</string>
+  <string name="account_mam_default_behavior_never">不在服务器上存储任何消息</string>
+  <string name="account_mam_sync_title">加载消息历史记录</string>
+  <string name="account_mam_sync_all">加载所有联系人的历史记录</string>
+  <string name="account_mam_sync_current">只加载打开的聊天会话的历史记录</string>
+  <string name="account_mam_sync_none">不加载任何人的历史记录</string>
+  <string name="account_clear_history_on_exit_title">退出时清除历史记录</string>
+  <string name="account_clear_history_on_exit_summary">在退出 Xabber 之前从设备中删除所有聊天消息。</string>
 </resources>
diff --git a/xabber/src/main/res/values-zh-rCN/contact_editor.xml b/xabber/src/main/res/values-zh-rCN/contact_editor.xml
index dc149912a7..ce7b317625 100644
--- a/xabber/src/main/res/values-zh-rCN/contact_editor.xml
+++ b/xabber/src/main/res/values-zh-rCN/contact_editor.xml
@@ -19,6 +19,8 @@
   <string name="error_during_image_processing">在图像处理过程中的错误</string>
   <string name="account_settings">帐户设置</string>
   <string name="account_user_info">帐户信息</string>
+  <string name="account_server_info">服务器信息</string>
+  <string name="account_server_info_description">服务器功能列表</string>
   <string name="conference_private_chat_invitation">来自 %2$s 的 %1$s 想要与你开始私人聊天</string>
   <string name="accept_muc_private_chat">接受</string>
   <string name="block_muc_private_chat">阻止</string>
diff --git a/xabber/src/main/res/values-zh-rCN/contact_list.xml b/xabber/src/main/res/values-zh-rCN/contact_list.xml
index 572c657721..02f0278c75 100644
--- a/xabber/src/main/res/values-zh-rCN/contact_list.xml
+++ b/xabber/src/main/res/values-zh-rCN/contact_list.xml
@@ -74,4 +74,17 @@
   <string name="dark_theme_suggest_dialog_message">Xabber 有新黑暗主题可用。你能抗拒使用它的诱惑吗？</string>
   <string name="dark_theme_suggest_dialog_join_dark_side">加入黑暗的一面</string>
   <string name="dark_theme_suggest_dialog_stay_on_light_side">留在光明的一面</string>
+  <string name="battery_optimization_disable_dialog_title">电池优化</string>
+  <string name="battery_optimization_disable_dialog_message">您的设备针对 Xabber 做了一些重度的电池优化，这可能导致通知的延迟或者甚至丢失消息。\n\n你现在将被要求禁用那些优化。</string>
+  <string name="save_log_to_file">保存到文件</string>
+  <string name="clear_log">删除旧的日志文件</string>
+  <string name="open_log_file">打开</string>
+  <string name="send_log_file">发送</string>
+  <string name="intro_welcome">欢迎使用 Xabber</string>
+  <string name="intro_xabber_description">安卓开源 XMPP 客户端</string>
+  <string name="intro_have_account">我有 XMPP 帐户</string>
+  <string name="intro_register_account">注册 XMPP 帐户</string>
+  <string name="intro_create_xabber_account">创建 Xabber 帐户</string>
+  <string name="intro_faq">如果你没有 XMPP 帐户，请 <a href="https://www.xabber.com/faq/"> 阅读我们的常见问题</a> 如何获得一个。</string>
+  <string name="intro_web_search_register_xmpp">注册 XMPP 帐户</string>
 </resources>
diff --git a/xabber/src/main/res/values-zh-rCN/contact_viewer.xml b/xabber/src/main/res/values-zh-rCN/contact_viewer.xml
index 1ab31034db..324a4bc82f 100644
--- a/xabber/src/main/res/values-zh-rCN/contact_viewer.xml
+++ b/xabber/src/main/res/values-zh-rCN/contact_viewer.xml
@@ -3,6 +3,7 @@
 <resources>
   <string name="contact_viewer">联系人信息</string>
   <string name="contact_viewer_client">客户端</string>
+  <string name="contact_viewer_this_device">此设备</string>
   <string name="vcard_nick_name">昵称</string>
   <string name="vcard_formatted_name">姓名</string>
   <string name="vcard_prefix_name">前缀</string>
@@ -51,6 +52,7 @@
   <string name="edit_contact_groups">编辑分组</string>
   <string name="remove_contact">删除联系人</string>
   <string name="edit_account_user_info">编辑用户信息</string>
+  <string name="edit_vcard">编辑</string>
   <string name="account_user_info_save_success">已成功保存的帐户用户信息</string>
   <string name="account_user_info_save_fail">不能保存帐户用户信息</string>
   <string name="saving">正在保存&#8230;</string>
@@ -63,4 +65,6 @@
   <string name="conference_description">描述</string>
   <string name="conference_subject">主题</string>
   <string name="message_info_occupants_number">参与者: %d</string>
+  <string name="contact_info_connected_clients_header">已连接的设备</string>
+  <string name="contact_info_visiting_card_header">电子名片</string>
 </resources>
diff --git a/xabber/src/main/res/values-zh-rCN/preference_editor.xml b/xabber/src/main/res/values-zh-rCN/preference_editor.xml
index 7f1a9cd225..7ca3330054 100644
--- a/xabber/src/main/res/values-zh-rCN/preference_editor.xml
+++ b/xabber/src/main/res/values-zh-rCN/preference_editor.xml
@@ -17,7 +17,11 @@
   <string name="contacts_show_panel">显示账户面板\n在联系人列表的右下角显示带有头像的动作按钮</string>
   <string name="contacts_stay_active_chats">重复显示进行中的聊天\n同时在联系人列表顶部和分组中显示进行中聊天</string>
   <string name="debug_log">调试日志\n将消息写入调试日志（请重启程序来应用设置）</string>
+  <string name="debug_file_log_title">写文件日志\n写调试日志到本地文件(你可以共享它)。</string>
+  <string name="debug_log_files_title">日志文件\n写入的日志文件列表。</string>
+  <string name="debug_log_files_activity_title">日志文件</string>
   <string name="debug_connection_errors_title">显示连接错误\n显示连接异常弹出消息</string>
+  <string name="debug_crash_reports_title">发送崩溃报告\n发送匿名崩溃报告以帮助 Xabber 开发(请重启程序以应用更改)。</string>
   <string name="events_lightning">灯光提示\n通知时闪烁LED</string>
   <string name="events_persistent">任务栏图标\n显示持久性通知，此选项可防止Android从内存中卸载该程序</string>
   <string name="events_sound">声音提示\n选择提示音</string>
@@ -78,8 +82,9 @@
   <string name="chats_attention_sound">注意声音\n选择铃声</string>
   <string name="connection_load_vcard">加载vCard\n加载和更新联系人的个人信息和头像，禁用以减少流量</string>
   <string name="connection_load_images">加载图像\n自动从文件URL加载图像。禁用以降低带宽使用率。</string>
-  <string name="connection_use_carbons">复写模式\n可能不稳定！将为此客户端上的相同账户共享会话，禁用以减少流量使用。</string>
+  <string name="connection_use_carbons">复写模式\n将为此客户端上的相同账户共享会话，禁用以减少流量使用。</string>
   <string name="connection_use_plain_text_auth">纯文本身份验证\n对所有账户使用纯文本认证。 不建议。</string>
   <string name="events_phrases">关键短语\n通知某些包含预设短语的消息并选择声音</string>
   <string name="security_clear_certificate_warning">你确实要删除所有忽略的证书吗？</string>
+  <string name="account_error_settings">设置</string>
 </resources>
diff --git a/xabber/src/main/res/values/account_editor.xml b/xabber/src/main/res/values/account_editor.xml
index 36f6053713..d12bbc0001 100644
--- a/xabber/src/main/res/values/account_editor.xml
+++ b/xabber/src/main/res/values/account_editor.xml
@@ -12,7 +12,7 @@
     <string name="account_type">Account type</string>
     <string name="account_type_hints_gtalk">username for gmail.com or Google Apps domain</string>
     <string name="account_type_helps_gtalk">If you don\'t have Google account you may create one at http://mail.google.com\nAlso you can use your_user_name@your_google_domain</string>
-    <string name="account_xmpp_register_warning">You must <a href="http://www.google.com/#q=register XMPP account">register XMPP account</a> before adding it to Xabber!</string>
+    <string name="account_xmpp_register_warning">You must <a href="http://www.google.com/#q=register an XMPP account">register an XMPP account</a> before adding it to Xabber!</string>
     <string name="account_type_helps_xmpp">If you want to learn more about XMPP (Jabber) here: https://xmpp.org</string>
     <string name="account_user_name">Username</string>
     <string name="EMPTY_SERVER_NAME">Server name is not specified</string>
diff --git a/xabber/src/main/res/values/chat_viewer.xml b/xabber/src/main/res/values/chat_viewer.xml
index a31f59cbf7..6336a42bf0 100644
--- a/xabber/src/main/res/values/chat_viewer.xml
+++ b/xabber/src/main/res/values/chat_viewer.xml
@@ -9,6 +9,8 @@
     <string name="chat_input_hint">Type your message here</string>
     <string name="chat_send">Send</string>
     <string name="clear_history">Clear history</string>
+    <string name="clear_chat_history_dialog_button">Clear</string>
+    <string name="clear_chat_history_dialog_message">Do you really want to clear all chat history with %s?</string>
     <string name="contact_is_offline">The recipient is offline. Messages you send will be delivered when they come back online.</string>
     <string name="ENTRY_IS_NOT_AVAILABLE">Contact is not available</string>
     <string name="FILE_NOT_FOUND">File not found</string>
diff --git a/xabber/src/main/res/xml/preference_connection.xml b/xabber/src/main/res/xml/preference_connection.xml
index 024e6969f5..674cabd333 100644
--- a/xabber/src/main/res/xml/preference_connection.xml
+++ b/xabber/src/main/res/xml/preference_connection.xml
@@ -44,11 +44,6 @@
         android:key="@string/connection_use_carbons_key"
         android:defaultValue="@bool/connection_use_carbons_default"
         />
-    <CheckBoxPreference
-        android:title="@string/connection_use_plain_text_auth"
-        android:key="@string/connection_use_plain_text_auth_key"
-        android:defaultValue="@bool/connection_use_plain_text_auth_default"
-        />
 
     <PreferenceCategory
         android:title="@string/connection_priority"