diff --git a/CHANGES.rst b/CHANGES.rst
index cede3344bc..0524c43df0 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,39 @@
+Changes in Riot 0.8.1 (2018-02-15)
+===================================================
+ 
+Improvements:
+ * Update matrix-sdk.aar lib (v0.9.0).
+ 
+Bug Fix:
+ * URL Preview: We should have it for m.notice too (PR 1975).
+
+Changes in Riot 0.8.00-beta (2018-02-02)
+===================================================
+
+Features:
+
+  * Add a new tab to list the user's communities (vector-im/riot-meta/#114).
+  * Add new screens to display the community details, edition is not supported yet (vector-im/riot-meta/#115, vector-im/riot-meta/#116, vector-im/riot-meta/#117).
+  * Room Settings: handle the related communities in order to show flair for them.
+  * User Settings: Let the user enable his community flair in rooms configured to show it.
+  * Add the url preview feature (PR #1929).
+  
+Improvements:
+
+  * Support the 4 states for the room notification level (all messages (noisy), all messages, mention only, mute).
+  * Add the avatar to the pills displayed in room history (PR #1917).
+  * Set the push server URLs as a resource string (PR #1908).
+  * Improve duplicate events detection (#1907).
+  * Vibrate when long pressing on an user name / avatar to copy his/her name in the edit text.
+  * Improve the notifications management.
+ 
+Bugfixes:
+ 
+  * #1903: Weird room layout.
+  * #1896: Copy source code of a message.
+  * #1821, #1850: Improve the text sharing.
+  * #1920: Phone vibrates when mentioning someone.
+
 Changes in Riot 0.7.09 (2018-01-16)
 ===================================================
   
diff --git a/README.md b/README.md
index d3e79fc8e1..e74739b31e 100755
--- a/README.md
+++ b/README.md
@@ -95,6 +95,21 @@ Customise your flavour
 
 You will need to manage your own provider because "im.vector" is already used (look at VectorContentProvider to manage it).
 
+Customise your application settings with a custom google play link
+===================================================================
+
+It is possible to set some default values to Riot with some extra parameters to the google play link.
+
+- Use the https://developers.google.com/analytics/devguides/collection/android/v4/campaigns URL generator (at the bottom)
+
+Set "Campaign Source"
+Set "Campaign Content" with the extra parameters (e.g. is=http://my__is.org&hs=http://my_hs.org)
+Generate the customised link
+
+- Supported extra parameters
+is : identidy server URL
+hs : home server URL
+
 FAQ
 ===
 
diff --git a/build.gradle b/build.gradle
index 76d6c77598..aedecf69a6 100755
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,8 @@ buildscript {
 
 // global properties used in sub modules
 ext {
-    versionCodeProp = 70900
-    versionNameProp = "0.7.09"
+    versionCodeProp = 80001
+    versionNameProp = "0.8.1"
     versionBuild = System.getenv("BUILD_NUMBER") as Integer ?: 0
     buildNumberProp = "${versionBuild}"
 }
diff --git a/set_debug_env.sh b/set_debug_env.sh
new file mode 100644
index 0000000000..9f0bc7690e
--- /dev/null
+++ b/set_debug_env.sh
@@ -0,0 +1,17 @@
+echo remove the SDK lib
+rm -f vector/libs/matrix-sdk.aar
+rm -rf vector/build
+
+echo remove sdk folder
+rm -rf ../matrix-android-sdk
+
+echo clone the git folder
+git clone -b develop https://github.com/matrix-org/matrix-android-sdk ../matrix-android-sdk
+
+echo replace step 1
+sed -i '' -e 's/\/\/include/include/' settings.gradle || true
+sed -i '' -e 's/\/\/project/project/' settings.gradle || true
+
+echo replace step 2
+sed -i '' -e "s/compile(name: 'matrix/\/\/compile(name: 'matrix/" vector/build.gradle || true
+sed -i '' -e "s/\/\/compile project(':matrix-/compile project(':matrix-/" vector/build.gradle || true
diff --git a/vector/build.gradle b/vector/build.gradle
index 6db30bcfcf..174a98944b 100755
--- a/vector/build.gradle
+++ b/vector/build.gradle
@@ -102,6 +102,7 @@ android {
         disable 'InvalidPackage'
         disable 'MissingTranslation'
         disable 'RestrictedApi'
+        disable 'ImpliedQuantity'
     }
 
     repositories {
@@ -189,6 +190,7 @@ dependencies {
     compile(name: 'react-native', ext: 'aar')
     compile(name: 'react-native-locale-detector', ext: 'aar')
 
+
     // another tracking than GA
     compile 'org.piwik.sdk:piwik-sdk:2.0.0'
 
diff --git a/vector/libs/matrix-sdk.aar b/vector/libs/matrix-sdk.aar
index a9f3eec62d..7a334f055b 100644
Binary files a/vector/libs/matrix-sdk.aar and b/vector/libs/matrix-sdk.aar differ
diff --git a/vector/src/app/java/im/vector/gcm/MatrixGcmListenerService.java b/vector/src/app/java/im/vector/gcm/MatrixGcmListenerService.java
index 1cccb2d9c0..58501220dd 100755
--- a/vector/src/app/java/im/vector/gcm/MatrixGcmListenerService.java
+++ b/vector/src/app/java/im/vector/gcm/MatrixGcmListenerService.java
@@ -33,7 +33,6 @@
 import im.vector.VectorApp;
 import im.vector.activity.CommonActivityUtils;
 import im.vector.services.EventStreamService;
-import im.vector.util.PreferencesManager;
 
 /**
  * Class implementing GcmListenerService.
@@ -65,7 +64,10 @@ private Event parseEvent(Map<String, String> data) {
             event.sender = data.get("sender");
             event.roomId = data.get("room_id");
             event.setType(data.get("type"));
-            event.updateContent((new JsonParser()).parse(data.get("content")).getAsJsonObject());
+
+            if (data.containsKey("content")) {
+                event.updateContent((new JsonParser()).parse(data.get("content")).getAsJsonObject());
+            }
 
             return event;
         } catch (Exception e) {
@@ -112,27 +114,13 @@ private void onMessageReceivedInternal(final Map<String, String> data) {
                 Log.d(LOG_TAG, "## onMessageReceivedInternal() : the notifications are disabled");
                 return;
             }
-
-            boolean useBatteryOptim = !PreferencesManager.canStartBackgroundService(getApplicationContext()) && EventStreamService.isStopped();
-
-            if ((!gcmManager.isBackgroundSyncAllowed() || useBatteryOptim)
-                    && VectorApp.isAppInBackground()) {
-
+            if (!gcmManager.isBackgroundSyncAllowed() && VectorApp.isAppInBackground()) {
                 EventStreamService eventStreamService = EventStreamService.getInstance();
                 Event event = parseEvent(data);
 
-                if (!gcmManager.isBackgroundSyncAllowed()) {
-                    Log.d(LOG_TAG, "## onMessageReceivedInternal() : the background sync is disabled with eventStreamService " + eventStreamService);
-                } else {
-                    Log.d(LOG_TAG, "## onMessageReceivedInternal() : use the battery optimisation with eventStreamService " + eventStreamService);
-                }
-
-                if (null != eventStreamService) {
-                    eventStreamService.onNotifiedEventWithBackgroundSyncDisabled(event, data.get("room_name"), data.get("sender_display_name"), unreadCount);
-                } else {
-                    EventStreamService.onStaticNotifiedEvent(getApplicationContext(), event, data.get("room_name"), data.get("sender_display_name"), unreadCount);
-                }
+                Log.d(LOG_TAG, "## onMessageReceivedInternal() : the background sync is disabled with eventStreamService " + eventStreamService);
 
+                EventStreamService.onStaticNotifiedEvent(getApplicationContext(), event, data.get("room_name"), data.get("sender_display_name"), unreadCount);
                 return;
             }
 
diff --git a/vector/src/main/AndroidManifest.xml b/vector/src/main/AndroidManifest.xml
index 76d8f965b0..c900e5082b 100755
--- a/vector/src/main/AndroidManifest.xml
+++ b/vector/src/main/AndroidManifest.xml
@@ -318,6 +318,15 @@
             android:label="@string/title_activity_bug_report"
             android:windowSoftInputMode="stateHidden|adjustResize" />
 
+        <activity
+            android:name="im.vector.activity.VectorGroupDetailsActivity"
+            android:configChanges="orientation|screenSize"
+            android:label="@string/title_activity_group_details"
+            android:launchMode="singleTop"
+            android:theme="@style/GroupAppTheme"
+            android:windowSoftInputMode="adjustResize">
+        </activity>
+
         <activity android:name=".activity.VectorUniversalLinkActivity">
 
             <intent-filter>
diff --git a/vector/src/main/java/im/vector/KeyRequestHandler.java b/vector/src/main/java/im/vector/KeyRequestHandler.java
index 191e50be3e..a112d6853c 100644
--- a/vector/src/main/java/im/vector/KeyRequestHandler.java
+++ b/vector/src/main/java/im/vector/KeyRequestHandler.java
@@ -319,7 +319,7 @@ private void displayKeyShareDialog(final MXSession session, final MXDeviceInfo d
 
         // set dialog message
         alertDialogBuilder
-                .setCancelable(true)
+                .setCancelable(false)
                 .setNegativeButton(R.string.ignore_request, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
diff --git a/vector/src/main/java/im/vector/LoginHandler.java b/vector/src/main/java/im/vector/LoginHandler.java
index d48e2ce571..b95b06a4aa 100644
--- a/vector/src/main/java/im/vector/LoginHandler.java
+++ b/vector/src/main/java/im/vector/LoginHandler.java
@@ -27,10 +27,10 @@
 import org.matrix.androidsdk.rest.client.LoginRestClient;
 import org.matrix.androidsdk.rest.client.ThirdPidRestClient;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.ThreePid;
 import org.matrix.androidsdk.rest.model.login.Credentials;
 import org.matrix.androidsdk.rest.model.login.LoginFlow;
 import org.matrix.androidsdk.rest.model.login.RegistrationParams;
+import org.matrix.androidsdk.rest.model.pid.ThreePid;
 import org.matrix.androidsdk.ssl.CertUtil;
 import org.matrix.androidsdk.ssl.Fingerprint;
 import org.matrix.androidsdk.ssl.UnrecognizedCertificateException;
@@ -157,7 +157,7 @@ private void callLogin(final Context ctx, final HomeServerConnectionConfig hsCon
         if (!TextUtils.isEmpty(username)) {
             if (android.util.Patterns.EMAIL_ADDRESS.matcher(username).matches()) {
                 // Login with 3pid
-                client.loginWith3Pid(ThreePid.MEDIUM_EMAIL, username.toLowerCase(), password, deviceName, callback);
+                client.loginWith3Pid(ThreePid.MEDIUM_EMAIL, username.toLowerCase(VectorApp.getApplicationLocale()), password, deviceName, callback);
             } else {
                 // Login with user
                 client.loginWithUser(username, password, deviceName, callback);
diff --git a/vector/src/main/java/im/vector/Matrix.java b/vector/src/main/java/im/vector/Matrix.java
index c5649c0d99..083bf525f0 100755
--- a/vector/src/main/java/im/vector/Matrix.java
+++ b/vector/src/main/java/im/vector/Matrix.java
@@ -28,6 +28,7 @@
 import org.matrix.androidsdk.crypto.MXCrypto;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
+import org.matrix.androidsdk.rest.model.MatrixError;
 import org.matrix.androidsdk.ssl.Fingerprint;
 import org.matrix.androidsdk.ssl.UnrecognizedCertificateException;
 import org.matrix.androidsdk.util.BingRulesManager;
@@ -49,7 +50,6 @@
 
 import im.vector.activity.CommonActivityUtils;
 import im.vector.activity.SplashActivity;
-import im.vector.activity.VectorHomeActivity;
 import im.vector.gcm.GcmRegistrationManager;
 import im.vector.services.EventStreamService;
 import im.vector.store.LoginStorage;
@@ -592,11 +592,16 @@ private MXSession createSession(final Context context, HomeServerConnectionConfi
         final MXSession session = new MXSession(hsConfig, new MXDataHandler(store, credentials), mAppContext);
 
         session.getDataHandler().setRequestNetworkErrorListener(new MXDataHandler.RequestNetworkErrorListener() {
+
             @Override
-            public void onTokenCorrupted() {
-                if (null != VectorApp.getCurrentActivity()) {
-                    Log.e(LOG_TAG, "## createSession() : onTokenCorrupted");
-                    CommonActivityUtils.logout(VectorApp.getCurrentActivity());
+            public void onConfigurationError(String matrixErrorCode) {
+                Log.e(LOG_TAG, "## createSession() : onConfigurationError " + matrixErrorCode);
+
+                if (TextUtils.equals(matrixErrorCode, MatrixError.UNKNOWN_TOKEN)) {
+                    if (null != VectorApp.getCurrentActivity()) {
+                        Log.e(LOG_TAG, "## createSession() : onTokenCorrupted");
+                        CommonActivityUtils.logout(VectorApp.getCurrentActivity());
+                    }
                 }
             }
 
diff --git a/vector/src/main/java/im/vector/PublicRoomsManager.java b/vector/src/main/java/im/vector/PublicRoomsManager.java
index fa549ff249..d2e27bdaf6 100755
--- a/vector/src/main/java/im/vector/PublicRoomsManager.java
+++ b/vector/src/main/java/im/vector/PublicRoomsManager.java
@@ -25,8 +25,8 @@
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.PublicRoom;
-import org.matrix.androidsdk.rest.model.PublicRoomsResponse;
+import org.matrix.androidsdk.rest.model.publicroom.PublicRoom;
+import org.matrix.androidsdk.rest.model.publicroom.PublicRoomsResponse;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/vector/src/main/java/im/vector/RegistrationManager.java b/vector/src/main/java/im/vector/RegistrationManager.java
index d03f63ec36..3cea84c4a1 100644
--- a/vector/src/main/java/im/vector/RegistrationManager.java
+++ b/vector/src/main/java/im/vector/RegistrationManager.java
@@ -28,7 +28,7 @@
 import org.matrix.androidsdk.rest.client.ProfileRestClient;
 import org.matrix.androidsdk.rest.client.ThirdPidRestClient;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.ThreePid;
+import org.matrix.androidsdk.rest.model.pid.ThreePid;
 import org.matrix.androidsdk.rest.model.login.Credentials;
 import org.matrix.androidsdk.rest.model.login.LoginFlow;
 import org.matrix.androidsdk.rest.model.login.RegistrationFlowResponse;
diff --git a/vector/src/main/java/im/vector/UnrecognizedCertHandler.java b/vector/src/main/java/im/vector/UnrecognizedCertHandler.java
index 61f637af42..eaf1638c9a 100644
--- a/vector/src/main/java/im/vector/UnrecognizedCertHandler.java
+++ b/vector/src/main/java/im/vector/UnrecognizedCertHandler.java
@@ -73,7 +73,7 @@ public static void show(final HomeServerConnectionConfig hsConfig, final Fingerp
 
         TextView sslFingerprintTitle = layout.findViewById(R.id.ssl_fingerprint_title);
         sslFingerprintTitle.setText(
-                String.format(activity.getString(R.string.ssl_fingerprint_hash), unrecognizedFingerprint.getType().toString())
+                String.format(VectorApp.getApplicationLocale(), activity.getString(R.string.ssl_fingerprint_hash), unrecognizedFingerprint.getType().toString())
         );
 
         TextView sslFingerprint = layout.findViewById(R.id.ssl_fingerprint);
diff --git a/vector/src/main/java/im/vector/VectorApp.java b/vector/src/main/java/im/vector/VectorApp.java
index 5b91d531ce..c50ef500c6 100755
--- a/vector/src/main/java/im/vector/VectorApp.java
+++ b/vector/src/main/java/im/vector/VectorApp.java
@@ -52,8 +52,6 @@
 import org.piwik.sdk.extra.TrackHelper;
 
 import java.io.File;
-import java.io.PrintWriter;
-import java.io.StringWriter;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -79,7 +77,6 @@
 import im.vector.contacts.PIDsRetriever;
 import im.vector.gcm.GcmRegistrationManager;
 import im.vector.services.EventStreamService;
-import im.vector.util.BugReporter;
 import im.vector.util.CallsManager;
 import im.vector.util.PhoneNumberUtils;
 import im.vector.util.PreferencesManager;
@@ -104,7 +101,7 @@ public class VectorApp extends MultiDexApplication {
     /**
      * Rage shake detection to send a bug report.
      */
-    private static final RageShake mRageShake = new RageShake();
+    private RageShake mRageShake;
 
     /**
      * Delay to detect if the application is in background.
@@ -221,8 +218,6 @@ public void onCreate() {
         } catch (Exception e) {
         }
 
-
-
         mLogsDirectoryFile = new File(getCacheDir().getAbsolutePath() + "/logs");
 
         org.matrix.androidsdk.util.Log.setLogDirectory(mLogsDirectoryFile);
@@ -239,7 +234,7 @@ public void onCreate() {
         Log.d(LOG_TAG, "----------------------------------------------------------------");
         Log.d(LOG_TAG, "----------------------------------------------------------------\n\n\n\n");
 
-        mRageShake.start(this);
+        mRageShake = new RageShake(this);
 
         // init the REST client
         MXSession.initUserAgent(getApplicationContext());
@@ -414,6 +409,8 @@ private void suspendApp() {
 
         MyPresenceManager.advertiseAllUnavailable();
 
+        mRageShake.stop();
+
         onAppPause();
     }
 
@@ -544,6 +541,7 @@ private void stopActivityTransitionTimer() {
         }
 
         MyPresenceManager.advertiseAllOnline();
+        mRageShake.start();
 
         mIsCallingInBackground = false;
         mIsInBackground = false;
diff --git a/vector/src/main/java/im/vector/activity/AccountCreationCaptchaActivity.java b/vector/src/main/java/im/vector/activity/AccountCreationCaptchaActivity.java
index 294219b94c..0241ed2e68 100755
--- a/vector/src/main/java/im/vector/activity/AccountCreationCaptchaActivity.java
+++ b/vector/src/main/java/im/vector/activity/AccountCreationCaptchaActivity.java
@@ -16,24 +16,32 @@
 
 package im.vector.activity;
 
+import android.annotation.SuppressLint;
 import android.app.AlertDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.graphics.Bitmap;
 import android.net.http.SslError;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 
 import org.matrix.androidsdk.util.Log;
 
 import android.view.KeyEvent;
+import android.view.View;
 import android.webkit.SslErrorHandler;
+import android.webkit.WebResourceRequest;
+import android.webkit.WebResourceResponse;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
+import android.widget.Toast;
 
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 
 import im.vector.R;
+import im.vector.util.VectorUtils;
 
 import java.net.URLDecoder;
 import java.util.Formatter;
@@ -87,7 +95,8 @@ protected void onCreate(Bundle savedInstanceState) {
         final WebView webView = findViewById(R.id.account_creation_webview);
         webView.getSettings().setJavaScriptEnabled(true);
 
-        Intent intent = getIntent();
+        final View loadingView = findViewById(R.id.account_creation_webview_loading);
+        final Intent intent = getIntent();
 
         String homeServerUrl = "https://matrix.org/";
 
@@ -111,9 +120,14 @@ protected void onCreate(Bundle savedInstanceState) {
 
         webView.setWebViewClient(new WebViewClient() {
             @Override
-            public void onReceivedSslError(WebView view, SslErrorHandler handler,
-                                           SslError error) {
-                final SslErrorHandler fHander = handler;
+            public void onPageFinished(WebView view, String url) {
+                super.onPageFinished(view, url);
+                loadingView.setVisibility(view.GONE);
+            }
+
+            @Override
+            public void onReceivedSslError(final WebView view, final SslErrorHandler handler, final SslError error) {
+                Log.e(LOG_TAG, "## onReceivedSslError() : " + error.getCertificate());
 
                 AlertDialog.Builder builder = new AlertDialog.Builder(AccountCreationCaptchaActivity.this);
 
@@ -122,14 +136,16 @@ public void onReceivedSslError(WebView view, SslErrorHandler handler,
                 builder.setPositiveButton(R.string.ssl_trust, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        fHander.proceed();
+                        Log.d(LOG_TAG, "## onReceivedSslError() : the user trusted");
+                        handler.proceed();
                     }
                 });
 
                 builder.setNegativeButton(R.string.ssl_do_not_trust, new DialogInterface.OnClickListener() {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
-                        fHander.cancel();
+                        Log.d(LOG_TAG, "## onReceivedSslError() : the user did not trust");
+                        handler.cancel();
                     }
                 });
 
@@ -137,7 +153,8 @@ public void onClick(DialogInterface dialog, int which) {
                     @Override
                     public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
                         if (event.getAction() == KeyEvent.ACTION_UP && keyCode == KeyEvent.KEYCODE_BACK) {
-                            fHander.cancel();
+                            handler.cancel();
+                            Log.d(LOG_TAG, "## onReceivedSslError() : the user dismisses the trust dialog.");
                             dialog.dismiss();
                             return true;
                         }
@@ -149,10 +166,11 @@ public boolean onKey(DialogInterface dialog, int keyCode, KeyEvent event) {
                 dialog.show();
             }
 
-            @Override
-            public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
-                super.onReceivedError(view, errorCode, description, failingUrl);
-
+            // common error message
+            private void onError(String errorMessage) {
+                Log.e(LOG_TAG, "## onError() : errorMessage");
+                Toast.makeText(AccountCreationCaptchaActivity.this, errorMessage, Toast.LENGTH_LONG).show();
+                
                 // on error case, close this activity
                 AccountCreationCaptchaActivity.this.runOnUiThread(new Runnable() {
                     @Override
@@ -162,6 +180,24 @@ public void run() {
                 });
             }
 
+            @Override
+            @SuppressLint("NewApi")
+            public void onReceivedHttpError(WebView view, WebResourceRequest request, WebResourceResponse errorResponse) {
+                super.onReceivedHttpError(view, request, errorResponse);
+
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    onError(errorResponse.getReasonPhrase());
+                } else {
+                    onError(errorResponse.toString());
+                }
+            }
+
+            @Override
+            public void onReceivedError(WebView view, int errorCode, String description, String failingUrl) {
+                super.onReceivedError(view, errorCode, description, failingUrl);
+                onError(description);
+            }
+
             @Override
             public boolean shouldOverrideUrlLoading(android.webkit.WebView view, java.lang.String url) {
                 if ((null != url) && url.startsWith("js:")) {
diff --git a/vector/src/main/java/im/vector/activity/CommonActivityUtils.java b/vector/src/main/java/im/vector/activity/CommonActivityUtils.java
index a5ea5ec9b3..068bca5425 100755
--- a/vector/src/main/java/im/vector/activity/CommonActivityUtils.java
+++ b/vector/src/main/java/im/vector/activity/CommonActivityUtils.java
@@ -43,7 +43,7 @@
 import android.os.Parcelable;
 import android.preference.PreferenceManager;
 import android.support.annotation.AttrRes;
-import android.support.design.widget.Snackbar;
+import android.support.annotation.ColorInt;
 import android.support.v4.app.ActivityCompat;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentActivity;
@@ -481,15 +481,18 @@ private static boolean isUserLogout(Context aContext) {
     private static void sendEventStreamAction(Context context, EventStreamService.StreamAction action) {
         Context appContext = context.getApplicationContext();
 
-        Log.d(LOG_TAG, "sendEventStreamAction " + action);
-
         if (!isUserLogout(appContext)) {
-            // Fix https://github.com/vector-im/vector-android/issues/230
-            // Only start the service if a session is in progress, otherwise
-            // starting the service is useless
-            Intent killStreamService = new Intent(appContext, EventStreamService.class);
-            killStreamService.putExtra(EventStreamService.EXTRA_STREAM_ACTION, action.ordinal());
-            appContext.startService(killStreamService);
+            Intent eventStreamService = new Intent(appContext, EventStreamService.class);
+
+            if ((action == EventStreamService.StreamAction.CATCHUP) && (EventStreamService.isStopped())) {
+                Log.d(LOG_TAG, "sendEventStreamAction : auto restart");
+                eventStreamService.putExtra(EventStreamService.EXTRA_AUTO_RESTART_ACTION, EventStreamService.EXTRA_AUTO_RESTART_ACTION);
+            } else {
+                Log.d(LOG_TAG, "sendEventStreamAction " + action);
+                eventStreamService.putExtra(EventStreamService.EXTRA_STREAM_ACTION, action.ordinal());
+            }
+
+            appContext.startService(eventStreamService);
         } else {
             Log.d(LOG_TAG, "## sendEventStreamAction(): \"" + action + "\" action not sent - user logged out");
         }
@@ -594,6 +597,10 @@ public static void startEventStreamService(Context context) {
                     context.startService(intent);
                 }
             }
+
+            if (null != EventStreamService.getInstance()) {
+                EventStreamService.getInstance().refreshStatusNotification();
+            }
         }
     }
 
@@ -1579,16 +1586,14 @@ public static void saveMediaIntoDownloads(final Context context, final File srcF
         saveFileInto(srcFile, Environment.DIRECTORY_DOWNLOADS, filename, new ApiCallback<String>() {
             @Override
             public void onSuccess(String fullFilePath) {
-                if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) {
-                    if (null != fullFilePath) {
-                        DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
-
-                        try {
-                            File file = new File(fullFilePath);
-                            downloadManager.addCompletedDownload(file.getName(), file.getName(), true, mimeType, file.getAbsolutePath(), file.length(), true);
-                        } catch (Exception e) {
-                            Log.e(LOG_TAG, "## saveMediaIntoDownloads(): Exception Msg=" + e.getMessage());
-                        }
+                if (null != fullFilePath) {
+                    DownloadManager downloadManager = (DownloadManager) context.getSystemService(Context.DOWNLOAD_SERVICE);
+
+                    try {
+                        File file = new File(fullFilePath);
+                        downloadManager.addCompletedDownload(file.getName(), file.getName(), true, mimeType, file.getAbsolutePath(), file.length(), true);
+                    } catch (Exception e) {
+                        Log.e(LOG_TAG, "## saveMediaIntoDownloads(): Exception Msg=" + e.getMessage());
                     }
                 }
 
@@ -2055,18 +2060,28 @@ public static void tintMenuIcons(Menu menu, int color) {
     }
 
     /**
-     * Tint the drawable with the menu icon color
+     * Tint the drawable with a theme attribute
      *
-     * @param context  the context
-     * @param drawable the drawable to tint
+     * @param context   the context
+     * @param drawable  the drawable to tint
+     * @param attribute the theme color
      * @return the tinted drawable
      */
     public static Drawable tintDrawable(Context context, Drawable drawable, @AttrRes int attribute) {
-        int color = ThemeUtils.getColor(context, attribute);
+        return tintDrawableWithColor(drawable, ThemeUtils.getColor(context, attribute));
+    }
+
+    /**
+     * Tint the drawable with a color integer
+     *
+     * @param drawable the drawable to tint
+     * @param color    the color
+     * @return the tinted drawable
+     */
+    public static Drawable tintDrawableWithColor(Drawable drawable, @ColorInt int color) {
         Drawable tinted = DrawableCompat.wrap(drawable);
         drawable.mutate();
         DrawableCompat.setTint(tinted, color);
-
         return tinted;
     }
 }
diff --git a/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.java b/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.java
index b20c3f560c..8b620dda5a 100755
--- a/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.java
+++ b/vector/src/main/java/im/vector/activity/IntegrationManagerActivity.java
@@ -22,7 +22,6 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.View;
 import android.webkit.ConsoleMessage;
 import android.webkit.JavascriptInterface;
@@ -43,6 +42,7 @@
 import org.matrix.androidsdk.rest.model.PowerLevels;
 import org.matrix.androidsdk.rest.model.RoomMember;
 import org.matrix.androidsdk.util.JsonUtils;
+import org.matrix.androidsdk.util.Log;
 
 import java.io.InputStream;
 import java.io.InputStreamReader;
diff --git a/vector/src/main/java/im/vector/activity/LockScreenActivity.java b/vector/src/main/java/im/vector/activity/LockScreenActivity.java
index 6f5622157f..896419f74b 100755
--- a/vector/src/main/java/im/vector/activity/LockScreenActivity.java
+++ b/vector/src/main/java/im/vector/activity/LockScreenActivity.java
@@ -42,7 +42,7 @@
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.Event;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.message.Message;
 
 import im.vector.Matrix;
 import im.vector.R;
diff --git a/vector/src/main/java/im/vector/activity/LoginActivity.java b/vector/src/main/java/im/vector/activity/LoginActivity.java
index faaf5d37d5..c122beba9f 100644
--- a/vector/src/main/java/im/vector/activity/LoginActivity.java
+++ b/vector/src/main/java/im/vector/activity/LoginActivity.java
@@ -57,7 +57,7 @@
 import org.matrix.androidsdk.rest.client.LoginRestClient;
 import org.matrix.androidsdk.rest.client.ProfileRestClient;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.ThreePid;
+import org.matrix.androidsdk.rest.model.pid.ThreePid;
 import org.matrix.androidsdk.rest.model.login.Credentials;
 import org.matrix.androidsdk.rest.model.login.LoginFlow;
 import org.matrix.androidsdk.rest.model.login.RegistrationFlowResponse;
@@ -1470,6 +1470,7 @@ private void hideMainLayoutAndToast(String text) {
     private void showMainLayout() {
         mMainLayout.setVisibility(View.VISIBLE);
         mProgressTextView.setVisibility(View.GONE);
+        mButtonsView.setVisibility(View.VISIBLE);
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/activity/MXCActionBarActivity.java b/vector/src/main/java/im/vector/activity/MXCActionBarActivity.java
index 731d150ac6..e596c587f0 100755
--- a/vector/src/main/java/im/vector/activity/MXCActionBarActivity.java
+++ b/vector/src/main/java/im/vector/activity/MXCActionBarActivity.java
@@ -30,8 +30,6 @@
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.data.Room;
 
-import java.util.ArrayList;
-
 import im.vector.Matrix;
 import im.vector.MyPresenceManager;
 import im.vector.R;
diff --git a/vector/src/main/java/im/vector/activity/PhoneNumberAdditionActivity.java b/vector/src/main/java/im/vector/activity/PhoneNumberAdditionActivity.java
index 36a11eea01..4a5f1ad484 100644
--- a/vector/src/main/java/im/vector/activity/PhoneNumberAdditionActivity.java
+++ b/vector/src/main/java/im/vector/activity/PhoneNumberAdditionActivity.java
@@ -40,7 +40,7 @@
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.ThreePid;
+import org.matrix.androidsdk.rest.model.pid.ThreePid;
 import org.matrix.androidsdk.util.Log;
 
 import im.vector.Matrix;
diff --git a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java
index 82234f59ba..9d2eb360eb 100644
--- a/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java
+++ b/vector/src/main/java/im/vector/activity/PhoneNumberVerificationActivity.java
@@ -36,7 +36,7 @@
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.ThreePid;
+import org.matrix.androidsdk.rest.model.pid.ThreePid;
 import org.matrix.androidsdk.util.Log;
 
 import im.vector.Matrix;
diff --git a/vector/src/main/java/im/vector/activity/RoomDirectoryPickerActivity.java b/vector/src/main/java/im/vector/activity/RoomDirectoryPickerActivity.java
index d8c192e9cc..2284ad47fa 100644
--- a/vector/src/main/java/im/vector/activity/RoomDirectoryPickerActivity.java
+++ b/vector/src/main/java/im/vector/activity/RoomDirectoryPickerActivity.java
@@ -38,8 +38,8 @@
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.ThirdPartyProtocol;
-import org.matrix.androidsdk.rest.model.ThirdPartyProtocolInstance;
+import org.matrix.androidsdk.rest.model.pid.ThirdPartyProtocol;
+import org.matrix.androidsdk.rest.model.pid.ThirdPartyProtocolInstance;
 
 import java.util.ArrayList;
 import java.util.Arrays;
diff --git a/vector/src/main/java/im/vector/activity/SplashActivity.java b/vector/src/main/java/im/vector/activity/SplashActivity.java
index 592911898d..7d61796051 100755
--- a/vector/src/main/java/im/vector/activity/SplashActivity.java
+++ b/vector/src/main/java/im/vector/activity/SplashActivity.java
@@ -36,7 +36,6 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.Map;
 
 /**
  * SplashActivity displays a splash while loading and inittializing the client.
diff --git a/vector/src/main/java/im/vector/activity/VectorBaseSearchActivity.java b/vector/src/main/java/im/vector/activity/VectorBaseSearchActivity.java
index 0bafd2a12d..47c98b027f 100644
--- a/vector/src/main/java/im/vector/activity/VectorBaseSearchActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorBaseSearchActivity.java
@@ -27,7 +27,6 @@
 import android.support.v7.app.ActionBar;
 import android.text.TextUtils;
 import android.text.TextWatcher;
-import android.util.Log;
 import android.view.KeyEvent;
 import android.view.Menu;
 import android.view.MenuItem;
@@ -37,6 +36,8 @@
 import android.widget.EditText;
 import android.widget.TextView;
 
+import org.matrix.androidsdk.util.Log;
+
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Timer;
diff --git a/vector/src/main/java/im/vector/activity/VectorCallViewActivity.java b/vector/src/main/java/im/vector/activity/VectorCallViewActivity.java
index c29c870155..2a67b73751 100755
--- a/vector/src/main/java/im/vector/activity/VectorCallViewActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorCallViewActivity.java
@@ -63,7 +63,6 @@
 import im.vector.Matrix;
 import im.vector.R;
 import im.vector.VectorApp;
-import im.vector.services.EventStreamService;
 import im.vector.util.CallsManager;
 import im.vector.util.VectorUtils;
 import im.vector.view.VectorPendingCallView;
@@ -466,11 +465,6 @@ public void onClick(View v) {
                 }
             }
         } else {
-            Log.d(LOG_TAG, "## onCreate(): Hide the call notifications");
-            if (null != EventStreamService.getInstance()) {
-                EventStreamService.getInstance().hideCallNotifications();
-            }
-
             // create the callview asap
             this.runOnUiThread(new Runnable() {
                 @Override
@@ -677,7 +671,6 @@ protected void onResume() {
 
         mHeaderPendingCallView.checkPendingCall();
 
-        EventStreamService.getInstance().displayCallInProgressNotification(mCall.getSession(), mCall.getRoom(), mCall.getCallId());
         // compute video UI layout position after rotation & apply new position
         computeVideoUiLayout();
         if ((null != mCall) && mCall.isVideo() && mCall.getCallState().equals(IMXCall.CALL_STATE_CONNECTED)) {
@@ -1121,7 +1114,7 @@ private void manageSubViews() {
                 if (mCall.isIncoming()) {
                     mCall.answer();
                     mIncomingCallTabbar.setVisibility(View.GONE);
-                }
+                 }
                 break;
             default:
                 // nothing to do..
@@ -1248,7 +1241,7 @@ public void onSensorChanged(SensorEvent event) {
         if (null != event) {
             float distanceCentimeters = event.values[0];
 
-            Log.d(LOG_TAG, "## onSensorChanged(): " + String.format("distance=%.3f", distanceCentimeters));
+            Log.d(LOG_TAG, "## onSensorChanged(): " + String.format(VectorApp.getApplicationLocale(), "distance=%.3f", distanceCentimeters));
 
             if (CallsManager.getSharedInstance().isSpeakerphoneOn()) {
                 Log.d(LOG_TAG, "## onSensorChanged(): Skipped due speaker ON");
diff --git a/vector/src/main/java/im/vector/activity/VectorGroupDetailsActivity.java b/vector/src/main/java/im/vector/activity/VectorGroupDetailsActivity.java
new file mode 100755
index 0000000000..8c551b4d6f
--- /dev/null
+++ b/vector/src/main/java/im/vector/activity/VectorGroupDetailsActivity.java
@@ -0,0 +1,338 @@
+/*
+ * Copyright 2014 OpenMarket Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.activity;
+
+import android.content.Context;
+import android.content.Intent;
+import android.os.Bundle;
+import android.support.design.widget.TabLayout;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBar;
+import android.text.TextUtils;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+import android.widget.ProgressBar;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.groups.GroupsManager;
+import org.matrix.androidsdk.listeners.MXEventListener;
+import org.matrix.androidsdk.rest.callback.ApiCallback;
+import org.matrix.androidsdk.rest.model.MatrixError;
+import org.matrix.androidsdk.rest.model.group.Group;
+import org.matrix.androidsdk.util.Log;
+
+import java.util.List;
+
+import im.vector.Matrix;
+import im.vector.R;
+import im.vector.adapters.GroupDetailsFragmentPagerAdapter;
+import im.vector.fragments.GroupDetailsBaseFragment;
+import im.vector.util.ThemeUtils;
+import im.vector.view.RiotViewPager;
+
+/**
+ *
+ */
+public class VectorGroupDetailsActivity extends MXCActionBarActivity {
+    private static final String LOG_TAG = VectorRoomDetailsActivity.class.getSimpleName();
+
+    // the group ID
+    public static final String EXTRA_GROUP_ID = "EXTRA_GROUP_ID";
+    public static final String EXTRA_TAB_INDEX = "VectorUnifiedSearchActivity.EXTRA_TAB_INDEX";
+
+    // private classes
+    private MXSession mSession;
+    private GroupsManager mGroupsManager;
+    private Group mGroup;
+
+    // UI views
+    private View mLoadingView;
+    private ProgressBar mGroupSyncInProgress;
+
+    private RiotViewPager mPager;
+    private GroupDetailsFragmentPagerAdapter mPagerAdapter;
+
+    private MXEventListener mGroupEventsListener = new MXEventListener() {
+        private void refresh(String groupId) {
+            if ((null != mGroup) && TextUtils.equals(mGroup.getGroupId(), groupId)) {
+                refreshGroupInfo();
+            }
+        }
+
+        @Override
+        public void onLeaveGroup(String groupId) {
+            if ((null != mRoom) && TextUtils.equals(groupId, mGroup.getGroupId())) {
+                VectorGroupDetailsActivity.this.finish();
+            }
+        }
+
+        @Override
+        public void onNewGroupInvitation(String groupId) {
+            refresh(groupId);
+        }
+
+        @Override
+        public void onJoinGroup(String groupId) {
+            refresh(groupId);
+        }
+
+
+        @Override
+        public void onGroupProfileUpdate(String groupId) {
+            if ((null != mGroup) && TextUtils.equals(mGroup.getGroupId(), groupId)) {
+                if (null != mPagerAdapter.getHomeFragment()) {
+                    mPagerAdapter.getHomeFragment().refreshViews();
+                }
+            }
+        }
+
+        @Override
+        public void onGroupRoomsListUpdate(String groupId) {
+            if ((null != mGroup) && TextUtils.equals(mGroup.getGroupId(), groupId)) {
+                if (null != mPagerAdapter.getRoomsFragment()) {
+                    mPagerAdapter.getRoomsFragment().refreshViews();
+                }
+
+                if (null != mPagerAdapter.getHomeFragment()) {
+                    mPagerAdapter.getHomeFragment().refreshViews();
+                }
+            }
+        }
+
+        @Override
+        public void onGroupUsersListUpdate(String groupId) {
+            if ((null != mGroup) && TextUtils.equals(mGroup.getGroupId(), groupId)) {
+                if (null != mPagerAdapter.getPeopleFragment()) {
+                    mPagerAdapter.getPeopleFragment().refreshViews();
+                }
+
+                if (null != mPagerAdapter.getHomeFragment()) {
+                    mPagerAdapter.getHomeFragment().refreshViews();
+                }
+            }
+        }
+
+        @Override
+        public void onGroupInvitedUsersListUpdate(String groupId) {
+            onGroupUsersListUpdate(groupId);
+        }
+    };
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+
+        if (CommonActivityUtils.shouldRestartApp(this)) {
+            Log.e(LOG_TAG, "Restart the application.");
+            CommonActivityUtils.restartApp(this);
+            return;
+        }
+
+        if (CommonActivityUtils.isGoingToSplash(this)) {
+            Log.d(LOG_TAG, "onCreate : Going to splash screen");
+            return;
+        }
+
+        Intent intent = getIntent();
+
+        if (!intent.hasExtra(EXTRA_GROUP_ID)) {
+            Log.e(LOG_TAG, "No group id");
+            finish();
+            return;
+        }
+
+        // get current session
+        mSession = Matrix.getInstance(getApplicationContext()).getSession(intent.getStringExtra(EXTRA_MATRIX_ID));
+
+        if ((null == mSession) || !mSession.isAlive()) {
+            finish();
+            return;
+        }
+
+        mGroupsManager = mSession.getGroupsManager();
+
+        String groupId = intent.getStringExtra(EXTRA_GROUP_ID);
+
+        if (!MXSession.isGroupId(groupId)) {
+            Log.e(LOG_TAG, "invalid group id " + groupId);
+            finish();
+            return;
+        }
+
+        mGroup = mGroupsManager.getGroup(groupId);
+
+        if (null == mGroup) {
+            Log.d(LOG_TAG, "## onCreate() : displaying " + groupId + " in preview mode");
+            mGroup = new Group(groupId);
+        } else {
+            Log.d(LOG_TAG, "## onCreate() : displaying " + groupId);
+        }
+
+        setContentView(R.layout.activity_vector_group_details);
+
+        // UI widgets binding & init fields
+        mLoadingView = findViewById(R.id.group_loading_layout);
+
+        // tab creation and restore tabs UI context
+        ActionBar actionBar = getSupportActionBar();
+
+        if (null != actionBar) {
+            actionBar.setDisplayShowHomeEnabled(true);
+            actionBar.setDisplayHomeAsUpEnabled(true);
+        }
+
+        mGroupSyncInProgress = findViewById(R.id.group_sync_in_progress);
+
+        mPager = findViewById(R.id.groups_pager);
+        mPagerAdapter = new GroupDetailsFragmentPagerAdapter(getSupportFragmentManager(), this);
+        mPager.setAdapter(mPagerAdapter);
+
+        TabLayout layout = findViewById(R.id.group_tabs);
+        ThemeUtils.setTabLayoutTheme(this, layout);
+
+        if (intent.hasExtra(EXTRA_TAB_INDEX)) {
+            mPager.setCurrentItem(getIntent().getIntExtra(EXTRA_TAB_INDEX, 0));
+        } else {
+            mPager.setCurrentItem((null != savedInstanceState) ? savedInstanceState.getInt(EXTRA_TAB_INDEX, 0) : 0);
+        }
+        layout.setupWithViewPager(mPager);
+
+        mPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
+                // dismiss the keyboard when swiping
+                final View view = getCurrentFocus();
+                if (view != null) {
+                    final InputMethodManager inputMethodManager = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
+                    inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+                }
+            }
+
+            @Override
+            public void onPageSelected(int position) {
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int state) {
+
+            }
+        });
+    }
+
+    /**
+     * @return the used group
+     */
+    public Group getGroup() {
+        return mGroup;
+    }
+
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, final Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+
+        List<android.support.v4.app.Fragment> allFragments = getSupportFragmentManager().getFragments();
+
+        // dispatch the result to each fragments
+        for (android.support.v4.app.Fragment fragment : allFragments) {
+            fragment.onActivityResult(requestCode, resultCode, data);
+        }
+    }
+
+    @Override
+    protected void onSaveInstanceState(Bundle outState) {
+        super.onSaveInstanceState(outState);
+        outState.putInt(EXTRA_TAB_INDEX, mPager.getCurrentItem());
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        switch (item.getItemId()) {
+            case android.R.id.home:
+                finish();
+                return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    protected void onPause() {
+        super.onPause();
+        mSession.getDataHandler().removeListener(mGroupEventsListener);
+    }
+
+    @Override
+    protected void onResume() {
+        super.onResume();
+        refreshGroupInfo();
+        mSession.getDataHandler().addListener(mGroupEventsListener);
+    }
+
+    /**
+     * SHow the waiting view
+     */
+    public void showWaitingView() {
+        if (null != mLoadingView) {
+            mLoadingView.setVisibility(View.VISIBLE);
+        }
+    }
+
+    /**
+     * Hide the waiting view
+     */
+    public void stopWaitingView() {
+        if (null != mLoadingView) {
+            mLoadingView.setVisibility(View.GONE);
+        }
+    }
+
+    /**
+     * Refresh the group information
+     */
+    private void refreshGroupInfo() {
+        if (null != mGroup) {
+            mGroupSyncInProgress.setVisibility(View.VISIBLE);
+            mGroupsManager.refreshGroupData(mGroup, new ApiCallback<Void>() {
+                private void onDone() {
+                    if (null != mGroupSyncInProgress) {
+                        mGroupSyncInProgress.setVisibility(View.GONE);
+                    }
+                }
+
+                @Override
+                public void onSuccess(Void info) {
+                    onDone();
+                }
+
+                @Override
+                public void onNetworkError(Exception e) {
+                    onDone();
+                }
+
+                @Override
+                public void onMatrixError(MatrixError e) {
+                    onDone();
+                }
+
+                @Override
+                public void onUnexpectedError(Exception e) {
+                    onDone();
+                }
+            });
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/activity/VectorHomeActivity.java b/vector/src/main/java/im/vector/activity/VectorHomeActivity.java
index a94ada3bde..5a2f5fb392 100644
--- a/vector/src/main/java/im/vector/activity/VectorHomeActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorHomeActivity.java
@@ -33,7 +33,6 @@
 import android.os.Handler;
 import android.os.Looper;
 import android.preference.PreferenceManager;
-import android.provider.Settings;
 import android.support.annotation.NonNull;
 import android.support.design.internal.BottomNavigationItemView;
 import android.support.design.internal.BottomNavigationMenuView;
@@ -110,6 +109,7 @@
 import im.vector.VectorApp;
 import im.vector.fragments.AbsHomeFragment;
 import im.vector.fragments.FavouritesFragment;
+import im.vector.fragments.GroupsFragment;
 import im.vector.fragments.HomeFragment;
 import im.vector.fragments.PeopleFragment;
 import im.vector.fragments.RoomsFragment;
@@ -117,7 +117,6 @@
 import im.vector.services.EventStreamService;
 import im.vector.util.BugReporter;
 import im.vector.util.CallsManager;
-import im.vector.util.PreferencesManager;
 import im.vector.util.RoomUtils;
 import im.vector.util.ThemeUtils;
 import im.vector.util.VectorUtils;
@@ -141,6 +140,9 @@ public class VectorHomeActivity extends RiotAppCompatActivity implements SearchV
     // jump to a member details sheet
     public static final String EXTRA_MEMBER_ID = "VectorHomeActivity.EXTRA_MEMBER_ID";
 
+    // jump to a group details sheet
+    public static final String EXTRA_GROUP_ID = "VectorHomeActivity.EXTRA_GROUP_ID";
+
     // there are two ways to open an external link
     // 1- EXTRA_UNIVERSAL_LINK_URI : the link is opened as soon there is an event check processed (application is launched when clicking on the URI link)
     // 2- EXTRA_JUMP_TO_UNIVERSAL_LINK : do not wait that an event chunk is processed.
@@ -166,6 +168,7 @@ public class VectorHomeActivity extends RiotAppCompatActivity implements SearchV
     private static final String TAG_FRAGMENT_FAVOURITES = "TAG_FRAGMENT_FAVOURITES";
     private static final String TAG_FRAGMENT_PEOPLE = "TAG_FRAGMENT_PEOPLE";
     private static final String TAG_FRAGMENT_ROOMS = "TAG_FRAGMENT_ROOMS";
+    private static final String TAG_FRAGMENT_GROUPS = "TAG_FRAGMENT_GROUPS";
 
     // Key used to restore the proper fragment after orientation change
     private static final String CURRENT_MENU_ID = "CURRENT_MENU_ID";
@@ -177,6 +180,8 @@ public class VectorHomeActivity extends RiotAppCompatActivity implements SearchV
 
     private String mMemberIdToOpen = null;
 
+    private String mGroupIdToOpen = null;
+
     @BindView(R.id.listView_spinner_views)
     View mWaitingView;
 
@@ -311,6 +316,7 @@ protected void onCreate(Bundle savedInstanceState) {
             intent.removeExtra(EXTRA_JUMP_TO_UNIVERSAL_LINK);
             intent.removeExtra(EXTRA_JUMP_TO_ROOM_PARAMS);
             intent.removeExtra(EXTRA_MEMBER_ID);
+            intent.removeExtra(EXTRA_GROUP_ID);
             intent.removeExtra(VectorUniversalLinkReceiver.EXTRA_UNIVERSAL_LINK_URI);
         } else {
 
@@ -339,6 +345,9 @@ protected void onCreate(Bundle savedInstanceState) {
             mMemberIdToOpen = intent.getStringExtra(EXTRA_MEMBER_ID);
             intent.removeExtra(EXTRA_MEMBER_ID);
 
+            mGroupIdToOpen = intent.getStringExtra(EXTRA_GROUP_ID);
+            intent.removeExtra(EXTRA_GROUP_ID);
+
             // the home activity has been launched with an universal link
             if (intent.hasExtra(VectorUniversalLinkReceiver.EXTRA_UNIVERSAL_LINK_URI)) {
                 Log.d(LOG_TAG, "Has an universal link");
@@ -450,6 +459,19 @@ public void run() {
         initViews();
     }
 
+    /**
+     * Display the TAB if it is required
+     */
+    private void showFloatingActionButton() {
+        if (null != mFloatingActionButton) {
+            if ((mCurrentMenuId == R.id.bottom_action_favourites) || (mCurrentMenuId == R.id.bottom_action_groups)) {
+                mFloatingActionButton.setVisibility(View.GONE);
+            } else {
+                mFloatingActionButton.show();
+            }
+        }
+    }
+
     @Override
     protected void onResume() {
         super.onResume();
@@ -487,13 +509,7 @@ public void run() {
             addEventsListener();
         }
 
-        if (null != mFloatingActionButton) {
-            if (mCurrentMenuId == R.id.bottom_action_favourites) {
-                mFloatingActionButton.setVisibility(View.GONE);
-            } else {
-                mFloatingActionButton.show();
-            }
-        }
+        showFloatingActionButton();
 
         this.runOnUiThread(new Runnable() {
             @Override
@@ -539,6 +555,14 @@ public void onClick(DialogInterface dialog, int which) {
             mMemberIdToOpen = null;
         }
 
+        if (null != mGroupIdToOpen) {
+            Intent groupIntent = new Intent(VectorHomeActivity.this, VectorGroupDetailsActivity.class);
+            groupIntent.putExtra(VectorGroupDetailsActivity.EXTRA_GROUP_ID, mGroupIdToOpen);
+            groupIntent.putExtra(VectorGroupDetailsActivity.EXTRA_MATRIX_ID, mSession.getCredentials().userId);
+            startActivity(groupIntent);
+            mGroupIdToOpen = null;
+        }
+
         // https://github.com/vector-im/vector-android/issues/323
         // the tool bar color is not restored on some devices.
         TypedValue vectorActionBarColor = new TypedValue();
@@ -690,6 +714,8 @@ protected void onNewIntent(Intent intent) {
         mMemberIdToOpen = intent.getStringExtra(EXTRA_MEMBER_ID);
         intent.removeExtra(EXTRA_MEMBER_ID);
 
+        mGroupIdToOpen = intent.getStringExtra(EXTRA_GROUP_ID);
+        intent.removeExtra(EXTRA_GROUP_ID);
 
         // start waiting view
         if (intent.getBooleanExtra(EXTRA_WAITING_VIEW_STATUS, VectorHomeActivity.WAITING_VIEW_STOP)) {
@@ -785,6 +811,15 @@ private void updateSelectedFragment(final MenuItem item) {
                 mCurrentFragmentTag = TAG_FRAGMENT_ROOMS;
                 mSearchView.setQueryHint(getString(R.string.home_filter_placeholder_rooms));
                 break;
+            case R.id.bottom_action_groups:
+                Log.d(LOG_TAG, "onNavigationItemSelected GROUPS");
+                fragment = mFragmentManager.findFragmentByTag(TAG_FRAGMENT_GROUPS);
+                if (fragment == null) {
+                    fragment = GroupsFragment.newInstance();
+                }
+                mCurrentFragmentTag = TAG_FRAGMENT_GROUPS;
+                mSearchView.setQueryHint(getString(R.string.home_filter_placeholder_groups));
+                break;
         }
 
         synchronized (this) {
@@ -792,17 +827,15 @@ private void updateSelectedFragment(final MenuItem item) {
                 mFloatingActionButtonTimer.cancel();
                 mFloatingActionButtonTimer = null;
             }
-            mFloatingActionButton.show();
         }
 
         // clear waiting view
         stopWaitingView();
 
-        // don't display the fab for the favorites tab
-        mFloatingActionButton.setVisibility((item.getItemId() != R.id.bottom_action_favourites) ? View.VISIBLE : View.GONE);
-
         mCurrentMenuId = item.getItemId();
 
+        showFloatingActionButton();
+
         if (fragment != null) {
             resetFilter();
             try {
@@ -896,7 +929,11 @@ public void run() {
             mFloatingActionButton.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
-                    onFloatingButtonClick();
+                    Fragment fragment = getSelectedFragment();
+
+                    if (!(fragment instanceof AbsHomeFragment) || !((AbsHomeFragment) fragment).onFabClick()) {
+                        onFloatingButtonClick();
+                    }
                 }
             });
         }
@@ -1008,6 +1045,10 @@ private Fragment getSelectedFragment() {
             case R.id.bottom_action_rooms:
                 fragment = mFragmentManager.findFragmentByTag(TAG_FRAGMENT_ROOMS);
                 break;
+            case R.id.bottom_action_groups:
+                fragment = mFragmentManager.findFragmentByTag(TAG_FRAGMENT_GROUPS);
+                break;
+
         }
 
         return fragment;
@@ -1129,12 +1170,6 @@ public void onClick(DialogInterface d, int n) {
                             }
                         }
                     })
-                    .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int which) {
-                            invitePeopleToNewRoom();
-                        }
-                    })
                     .setNegativeButton(R.string.cancel, null)
                     .show();
         }
@@ -1173,9 +1208,7 @@ public void run() {
                                 VectorHomeActivity.this.runOnUiThread(new Runnable() {
                                     @Override
                                     public void run() {
-                                        if (null != mFloatingActionButton) {
-                                            mFloatingActionButton.show();
-                                        }
+                                        showFloatingActionButton();
                                     }
                                 });
                             }
@@ -1191,9 +1224,7 @@ public void run() {
                         VectorHomeActivity.this.runOnUiThread(new Runnable() {
                             @Override
                             public void run() {
-                                if (null != mFloatingActionButton) {
-                                    mFloatingActionButton.show();
-                                }
+                                showFloatingActionButton();
                             }
                         });
 
@@ -1448,50 +1479,84 @@ public void onPreviewRoom(MXSession session, String roomId) {
         CommonActivityUtils.previewRoom(this, roomPreviewData);
     }
 
-    public void onRejectInvitation(final MXSession session, final String roomId) {
-        Room room = session.getDataHandler().getRoom(roomId);
-
-        if (null != room) {
-            showWaitingView();
+    /**
+     * Create the room forget / leave callback
+     *
+     * @param roomId the room id
+     * @param onSuccessCallback the success callback
+     * @return the asynchronous callback
+     */
+    private ApiCallback<Void> getForgetLeaveCallback(final String roomId, final SimpleApiCallback<Void> onSuccessCallback) {
+        return new ApiCallback<Void>() {
+            @Override
+            public void onSuccess(Void info) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        // clear any pending notification for this room
+                        EventStreamService.cancelNotificationsForRoomId(mSession.getMyUserId(), roomId);
+                        stopWaitingView();
 
-            room.leave(new ApiCallback<Void>() {
-                @Override
-                public void onSuccess(Void info) {
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            // clear any pending notification for this room
-                            EventStreamService.cancelNotificationsForRoomId(mSession.getMyUserId(), roomId);
-                            stopWaitingView();
+                        if (null != onSuccessCallback) {
+                            onSuccessCallback.onSuccess(null);
                         }
-                    });
-                }
+                    }
+                });
+            }
 
-                private void onError(final String message) {
-                    runOnUiThread(new Runnable() {
-                        @Override
-                        public void run() {
-                            stopWaitingView();
-                            Toast.makeText(VectorHomeActivity.this, message, Toast.LENGTH_LONG).show();
-                        }
-                    });
-                }
+            private void onError(final String message) {
+                runOnUiThread(new Runnable() {
+                    @Override
+                    public void run() {
+                        stopWaitingView();
+                        Toast.makeText(VectorHomeActivity.this, message, Toast.LENGTH_LONG).show();
+                    }
+                });
+            }
 
-                @Override
-                public void onNetworkError(Exception e) {
-                    onError(e.getLocalizedMessage());
-                }
+            @Override
+            public void onNetworkError(Exception e) {
+                onError(e.getLocalizedMessage());
+            }
 
-                @Override
-                public void onMatrixError(MatrixError e) {
-                    onError(e.getLocalizedMessage());
-                }
+            @Override
+            public void onMatrixError(MatrixError e) {
+                onError(e.getLocalizedMessage());
+            }
 
-                @Override
-                public void onUnexpectedError(Exception e) {
-                    onError(e.getLocalizedMessage());
-                }
-            });
+            @Override
+            public void onUnexpectedError(Exception e) {
+                onError(e.getLocalizedMessage());
+            }
+        };
+    }
+
+    /**
+     * Trigger the room forget
+     * @param roomId the room id
+     * @param onSuccessCallback the success asynchronous callback
+     */
+    public void onForgetRoom(final String roomId, final SimpleApiCallback<Void> onSuccessCallback) {
+        Room room = mSession.getDataHandler().getRoom(roomId);
+
+        if (null != room) {
+            showWaitingView();
+            room.forget(getForgetLeaveCallback(roomId, onSuccessCallback));
+        }
+    }
+
+    /**
+     * Trigger the room leave / invitation reject.
+     *
+     * @param roomId the room id
+     * @param onSuccessCallback the success asynchronous callback
+     */
+    public void onRejectInvitation(final String roomId, final SimpleApiCallback<Void> onSuccessCallback) {
+        Room room = mSession.getDataHandler().getRoom(roomId);
+
+        if (null != room) {
+            showWaitingView();
+            room.leave(getForgetLeaveCallback(roomId, onSuccessCallback));
         }
     }
 
@@ -1630,6 +1695,21 @@ public void onDrawerClosed(View view) {
                         break;
                     }
 
+                    case R.id.sliding_menu_exit : {
+                        if (null != EventStreamService.getInstance()) {
+                            EventStreamService.getInstance().stopNow();
+                        }
+                        VectorHomeActivity.this.runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                VectorHomeActivity.this.finish();
+                                System.exit(0);
+                            }
+                        });
+
+                        break;
+                    }
+
                     case R.id.sliding_menu_sign_out: {
                         AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(VectorHomeActivity.this);
                         alertDialogBuilder.setMessage(getString(R.string.action_sign_out_confirmation));
diff --git a/vector/src/main/java/im/vector/activity/VectorMediasViewerActivity.java b/vector/src/main/java/im/vector/activity/VectorMediasViewerActivity.java
index 8c24a3052f..7290c61cde 100755
--- a/vector/src/main/java/im/vector/activity/VectorMediasViewerActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorMediasViewerActivity.java
@@ -20,7 +20,6 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v4.view.ViewPager;
-import android.text.TextUtils;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -37,8 +36,6 @@
 import org.matrix.androidsdk.util.Log;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.util.List;
 
 import im.vector.Matrix;
@@ -75,6 +72,8 @@ public class VectorMediasViewerActivity extends MXCActionBarActivity {
     // the medias list
     private List<SlidableMediaInfo> mMediasList;
 
+    private MenuItem mShareMenuItem;
+
     // the slide effect
     public class DepthPageTransformer implements ViewPager.PageTransformer {
         private static final float MIN_SCALE = 0.75f;
@@ -176,6 +175,11 @@ public void onPageSelected(int position) {
                 if (null != VectorMediasViewerActivity.this.getSupportActionBar()) {
                     VectorMediasViewerActivity.this.getSupportActionBar().setTitle(mMediasList.get(position).mFileName);
                 }
+
+                // disable shared for encrypted files as they are saved in a tmp folder
+                if (null != mShareMenuItem) {
+                    mShareMenuItem.setVisible(null == mMediasList.get(position).mEncryptedFileInfo);
+                }
             }
 
             @Override
@@ -204,6 +208,11 @@ public boolean onCreateOptionsMenu(Menu menu) {
         getMenuInflater().inflate(R.menu.vector_medias_viewer, menu);
         CommonActivityUtils.tintMenuIcons(menu, ThemeUtils.getColor(this, R.attr.icon_tint_on_dark_action_bar_color));
 
+        mShareMenuItem = menu.findItem(R.id.ic_action_share);
+        if (null != mShareMenuItem) {
+            mShareMenuItem.setVisible(null == mMediasList.get(mViewPager.getCurrentItem()).mEncryptedFileInfo);
+        }
+
         return true;
     }
 
@@ -212,60 +221,60 @@ public boolean onCreateOptionsMenu(Menu menu) {
      */
     private void onAction(final int position, final int action) {
         MXMediasCache mediasCache = Matrix.getInstance(this).getMediasCache();
-        SlidableMediaInfo mediaInfo = mMediasList.get(position);
-
-        File file = mediasCache.mediaCacheFile(mediaInfo.mMediaUrl, mediaInfo.mMimeType);
+        final SlidableMediaInfo mediaInfo = mMediasList.get(position);
 
         // check if the media has already been downloaded
-        if (null != file) {
-            // download
-            if (action == R.id.ic_action_download) {
-                CommonActivityUtils.saveMediaIntoDownloads(this, file, mediaInfo.mFileName, mediaInfo.mMimeType, new SimpleApiCallback<String>() {
-                    @Override
-                    public void onSuccess(String string) {
-                        Toast.makeText(VectorApp.getInstance(), getText(R.string.media_slider_saved), Toast.LENGTH_LONG).show();
+        if (mediasCache.isMediaCached(mediaInfo.mMediaUrl, mediaInfo.mMimeType)) {
+            mediasCache.createTmpMediaFile(mediaInfo.mMediaUrl, mediaInfo.mMimeType, mediaInfo.mEncryptedFileInfo, new SimpleApiCallback<File>() {
+                @Override
+                public void onSuccess(File file) {
+                    // sanity check
+                    if (null == file) {
+                        return;
                     }
-                });
-            } else {
-                // shared
-                Uri mediaUri = null;
-
-                File renamedFile = file;
 
-                if (!TextUtils.isEmpty(mediaInfo.mFileName))
-                    try {
-                        InputStream fin = new FileInputStream(file);
-                        String tmpUrl = mediasCache.saveMedia(fin, mediaInfo.mFileName, mediaInfo.mMimeType);
-
-                        if (null != tmpUrl) {
-                            renamedFile = mediasCache.mediaCacheFile(tmpUrl, mediaInfo.mMimeType);
+                    if (action == R.id.ic_action_download) {
+                        CommonActivityUtils.saveMediaIntoDownloads(VectorMediasViewerActivity.this, file, mediaInfo.mFileName, mediaInfo.mMimeType, new SimpleApiCallback<String>() {
+                            @Override
+                            public void onSuccess(String savedMediaPath) {
+                                Toast.makeText(VectorApp.getInstance(), getText(R.string.media_slider_saved), Toast.LENGTH_LONG).show();
+                            }
+                        });
+                    } else {
+                        if (null != mediaInfo.mFileName) {
+                            File dstFile = new File(file.getParent(), mediaInfo.mFileName);
+
+                            if (dstFile.exists()) {
+                                dstFile.delete();
+                            }
+
+                            file.renameTo(dstFile);
+                            file = dstFile;
                         }
-                    } catch (Exception e) {
-                        Log.e(LOG_TAG, "## onAction() : mediasCache.mediaCacheFile.absolutePathToUri failed " + e.getMessage());
-                    }
 
+                        // shared / forward
+                        Uri mediaUri = null;
+                        try {
+                            mediaUri = VectorContentProvider.absolutePathToUri(VectorMediasViewerActivity.this, file.getAbsolutePath());
+                        } catch (Exception e) {
+                            Log.e(LOG_TAG, "onMediaAction onAction.absolutePathToUri: " + e.getMessage());
+                        }
 
-                if (null != renamedFile) {
-                    try {
-                        mediaUri = VectorContentProvider.absolutePathToUri(this, renamedFile.getAbsolutePath());
-                    } catch (Exception e) {
-                        Log.e(LOG_TAG, "## onAction() : RiotContentProvider.absolutePathToUri failed " + e.getMessage());
-                    }
-                }
-
-                if (null != mediaUri) {
-                    try {
-                        final Intent sendIntent = new Intent();
-                        sendIntent.setAction(Intent.ACTION_SEND);
-                        sendIntent.setType(mediaInfo.mMimeType);
-                        sendIntent.putExtra(Intent.EXTRA_STREAM, mediaUri);
-                        startActivity(sendIntent);
-                    } catch (Exception e) {
-                        Log.e(LOG_TAG, "## onAction : cannot display the media " + mediaUri + " mimeType " + mediaInfo.mMimeType);
-                        CommonActivityUtils.displayToast(this, e.getLocalizedMessage());
+                        if (null != mediaUri) {
+                            try {
+                                final Intent sendIntent = new Intent();
+                                sendIntent.setAction(Intent.ACTION_SEND);
+                                sendIntent.setType(mediaInfo.mMimeType);
+                                sendIntent.putExtra(Intent.EXTRA_STREAM, mediaUri);
+                                startActivity(sendIntent);
+                            } catch (Exception e) {
+                                Log.e(LOG_TAG, "## onAction : cannot display the media " + mediaUri + " mimeType " + mediaInfo.mMimeType);
+                                CommonActivityUtils.displayToast(VectorMediasViewerActivity.this, e.getLocalizedMessage());
+                            }
+                        }
                     }
                 }
-            }
+            });
         } else {
             // else download it
             final String downloadId = mediasCache.downloadMedia(this, mSession.getHomeServerConfig(), mediaInfo.mMediaUrl, mediaInfo.mMimeType, mediaInfo.mEncryptedFileInfo);
diff --git a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java
index 24938f1091..e64c53d201 100644
--- a/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorMemberDetailsActivity.java
@@ -58,7 +58,6 @@
 
 import im.vector.Matrix;
 import im.vector.R;
-import im.vector.VectorApp;
 import im.vector.adapters.VectorMemberDetailsAdapter;
 import im.vector.adapters.VectorMemberDetailsDevicesAdapter;
 import im.vector.fragments.VectorUnknownDevicesFragment;
@@ -86,7 +85,7 @@ public class VectorMemberDetailsActivity extends MXCActionBarActivity implements
     private static final int ITEM_ACTION_INVITE = 0;
     private static final int ITEM_ACTION_LEAVE = 1;
     public static final int ITEM_ACTION_KICK = 2;
-    private static final int ITEM_ACTION_BAN = 3;
+    public static final int ITEM_ACTION_BAN = 3;
     private static final int ITEM_ACTION_UNBAN = 4;
     private static final int ITEM_ACTION_IGNORE = 5;
     private static final int ITEM_ACTION_UNIGNORE = 6;
@@ -378,21 +377,41 @@ public void performItemAction(final int aActionType) {
 
         final ArrayList<String> idsList = new ArrayList<>();
 
+        String displayName = (null == mRoomMember) ? mMemberId : (TextUtils.isEmpty(mRoomMember.displayname) ? mRoomMember.getUserId() : mRoomMember.displayname);
+
         switch (aActionType) {
             case ITEM_ACTION_DEVICES:
                 refreshDevicesListView();
                 break;
 
             case ITEM_ACTION_START_CHAT:
-                Log.d(LOG_TAG, "## performItemAction(): Start new room - start chat");
+                android.support.v7.app.AlertDialog.Builder builder = new android.support.v7.app.AlertDialog.Builder(this);
+                builder.setTitle(R.string.dialog_title_confirmation);
 
-                VectorMemberDetailsActivity.this.runOnUiThread(new Runnable() {
+                builder.setMessage(getString(R.string.start_new_chat_prompt_msg, displayName));
+                builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
                     @Override
-                    public void run() {
-                        enableProgressBarView(CommonActivityUtils.UTILS_DISPLAY_PROGRESS_BAR);
-                        mSession.createDirectMessageRoom(mMemberId, mCreateDirectMessageCallBack);
+                    public void onClick(DialogInterface dialog, int which) {
+                        Log.d(LOG_TAG, "## performItemAction(): Start new room - start chat");
+
+                        VectorMemberDetailsActivity.this.runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                enableProgressBarView(CommonActivityUtils.UTILS_DISPLAY_PROGRESS_BAR);
+                                mSession.createDirectMessageRoom(mMemberId, mCreateDirectMessageCallBack);
+                            }
+                        });
                     }
                 });
+
+                builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        // nothing to do
+                    }
+                });
+
+                builder.show();
                 break;
 
             case ITEM_ACTION_START_VIDEO_CALL:
@@ -592,8 +611,6 @@ public void onClick(DialogInterface dialog, int id) {
                 break;
             }
             case ITEM_ACTION_MENTION:
-                String displayName = TextUtils.isEmpty(mRoomMember.displayname) ? mRoomMember.getUserId() : mRoomMember.displayname;
-
                 // provide the mention name
                 Intent intent = new Intent();
                 intent.putExtra(RESULT_MENTION_ID, displayName);
diff --git a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
index 9309e57e9f..adb33f1da8 100755
--- a/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorRoomActivity.java
@@ -34,6 +34,7 @@
 import android.net.Uri;
 import android.os.Build;
 import android.os.Bundle;
+import android.os.Vibrator;
 import android.preference.PreferenceManager;
 import android.provider.MediaStore;
 import android.support.annotation.ColorInt;
@@ -85,9 +86,9 @@
 import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
 import org.matrix.androidsdk.rest.model.Event;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.message.Message;
 import org.matrix.androidsdk.rest.model.PowerLevels;
-import org.matrix.androidsdk.rest.model.PublicRoom;
+import org.matrix.androidsdk.rest.model.publicroom.PublicRoom;
 import org.matrix.androidsdk.rest.model.RoomMember;
 import org.matrix.androidsdk.rest.model.User;
 import org.matrix.androidsdk.util.JsonUtils;
@@ -111,9 +112,9 @@
 import im.vector.ViewedRoomTracker;
 import im.vector.fragments.VectorMessageListFragment;
 import im.vector.fragments.VectorUnknownDevicesFragment;
+import im.vector.notifications.NotificationUtils;
 import im.vector.services.EventStreamService;
 import im.vector.util.CallsManager;
-import im.vector.util.NotificationUtils;
 import im.vector.util.PreferencesManager;
 import im.vector.util.ReadMarkerManager;
 import im.vector.util.SlashComandsParser;
@@ -399,6 +400,21 @@ public void run() {
             });
         }
 
+        @Override
+        public void onRoomKick(String roomId) {
+            HashMap<String, Object> params = new HashMap<>();
+
+            params.put(VectorRoomActivity.EXTRA_MATRIX_ID, mSession.getMyUserId());
+            params.put(VectorRoomActivity.EXTRA_ROOM_ID, mRoom.getRoomId());
+
+            // clear the activity stack to home activity
+            Intent intent = new Intent(VectorRoomActivity.this, VectorHomeActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+
+            intent.putExtra(VectorHomeActivity.EXTRA_JUMP_TO_ROOM_PARAMS, params);
+            VectorRoomActivity.this.startActivity(intent);
+        }
+
         @Override
         public void onLiveEvent(final Event event, RoomState roomState) {
             VectorRoomActivity.this.runOnUiThread(new Runnable() {
@@ -691,7 +707,7 @@ public void onClick(View v) {
                     final Integer[] icons;
 
                     if (PreferencesManager.useNativeCamera(VectorRoomActivity.this)) {
-                        messages  = new Integer[]{
+                        messages = new Integer[]{
                                 R.string.option_send_files,
                                 R.string.option_take_photo,
                                 R.string.option_take_video,
@@ -703,7 +719,7 @@ public void onClick(View v) {
                                 R.drawable.ic_material_videocam
                         };
                     } else {
-                        messages  = new Integer[]{
+                        messages = new Integer[]{
                                 R.string.option_send_files,
                                 R.string.option_take_photo_video
                         };
@@ -910,14 +926,16 @@ public void onClick(View v) {
         mVectorRoomMediasSender = new VectorRoomMediasSender(this, mVectorMessageListFragment, Matrix.getInstance(this).getMediasCache());
 
         manageRoomPreview();
-
         addRoomHeaderClickListeners();
 
+        RoomMember member = (null != mRoom) ? mRoom.getMember(mMyUserId) : null;
+        boolean hasBeenKicked = (null != member) && member.kickedOrBanned();
+
         // in timeline mode (i.e search in the forward and backward room history)
         // or in room preview mode
         // the edition items are not displayed
-        if ((!TextUtils.isEmpty(mEventId) || (null != sRoomPreviewData))) {
-            if (!mIsUnreadPreviewMode) {
+        if ((!TextUtils.isEmpty(mEventId) || (null != sRoomPreviewData)) || hasBeenKicked) {
+            if (!mIsUnreadPreviewMode || hasBeenKicked) {
                 mNotificationsArea.setVisibility(View.GONE);
                 findViewById(R.id.bottom_separator).setVisibility(View.GONE);
                 findViewById(R.id.room_notification_separator).setVisibility(View.GONE);
@@ -930,6 +948,10 @@ public void onClick(View v) {
             v.setLayoutParams(params);
         }
 
+        if ((null == sRoomPreviewData) && hasBeenKicked) {
+            manageBannedHeader(member);
+        }
+
         mLatestChatMessageCache = Matrix.getInstance(this).getDefaultLatestChatMessageCache();
 
         // some medias must be sent while opening the chat
@@ -1040,12 +1062,6 @@ public void onClick(DialogInterface d, int n) {
                                     displayWidget(widgets.get(n));
                                 }
                             })
-                            .setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
-                                @Override
-                                public void onClick(DialogInterface dialog, int which) {
-                                    displayWidget(widgets.get(0));
-                                }
-                            })
                             .setNegativeButton(R.string.cancel, null)
                             .show();
                 }
@@ -1057,7 +1073,7 @@ public void onClick(DialogInterface dialog, int which) {
             private void startCall(boolean isVideo) {
                 if (CommonActivityUtils.checkPermissions(isVideo ? CommonActivityUtils.REQUEST_CODE_PERMISSION_VIDEO_IP_CALL : CommonActivityUtils.REQUEST_CODE_PERMISSION_AUDIO_IP_CALL,
                         VectorRoomActivity.this)) {
-                    startIpCall(isVideo);
+                    startIpCall(false, isVideo);
                 }
             }
 
@@ -1302,8 +1318,8 @@ protected void onResume() {
         mVectorMessageListFragment.refresh();
 
         // the list automatically scrolls down when its top moves down
-        if (mVectorMessageListFragment.mMessageListView instanceof AutoScrollDownListView) {
-            ((AutoScrollDownListView) mVectorMessageListFragment.mMessageListView).lockSelectionOnResize();
+        if (null != mVectorMessageListFragment.mMessageListView) {
+            mVectorMessageListFragment.mMessageListView.lockSelectionOnResize();
         }
 
         // the device has been rotated
@@ -1555,6 +1571,13 @@ public boolean onCreateOptionsMenu(Menu menu) {
             mSearchInRoomMenuItem = menu.findItem(R.id.ic_action_search_in_room);
             mUseMatrixAppsMenuItem = menu.findItem(R.id.ic_action_matrix_apps);
 
+            RoomMember member = mRoom.getMember(mSession.getMyUserId());
+
+            // kicked / banned room
+            if ((null != member) && member.kickedOrBanned()) {
+                menu.findItem(R.id.ic_action_room_leave).setVisible(false);
+            }
+
             // hide / show the unsent / resend all entries.
             refreshNotificationsArea();
         }
@@ -1726,9 +1749,35 @@ public void onItemClick(IconAndTextDialogFragment dialogFragment, int position)
                     requestCode = CommonActivityUtils.REQUEST_CODE_PERMISSION_VIDEO_IP_CALL;
                 }
 
-                if (CommonActivityUtils.checkPermissions(requestCode, VectorRoomActivity.this)) {
-                    startIpCall(isVideoCall);
+                final boolean finalIsVideoCall = isVideoCall;
+                final int finalRequestCode = requestCode;
+
+                android.support.v7.app.AlertDialog.Builder builder = new android.support.v7.app.AlertDialog.Builder(VectorRoomActivity.this);
+                builder.setTitle(R.string.dialog_title_confirmation);
+
+                if (finalIsVideoCall) {
+                    builder.setMessage(getString(R.string.start_video_call_prompt_msg));
+                } else {
+                    builder.setMessage(getString(R.string.start_voice_call_prompt_msg));
                 }
+
+                builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        if (CommonActivityUtils.checkPermissions(finalRequestCode, VectorRoomActivity.this)) {
+                            startIpCall(PreferencesManager.useJitsiConfCall(VectorRoomActivity.this), finalIsVideoCall);
+                        }
+                    }
+                });
+
+                builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        // nothing to do
+                    }
+                });
+
+                builder.show();
             }
         });
 
@@ -1794,10 +1843,11 @@ public void onUnexpectedError(Exception e) {
      * Start an IP call: audio call if aIsVideoCall is false or video call if aIsVideoCall
      * is true.
      *
+     * @param useJitsiCall true to use jitsi calls
      * @param aIsVideoCall true to video call, false to audio call
      */
-    private void startIpCall(final boolean aIsVideoCall) {
-        if ((mRoom.getActiveMembers().size() > 2) && PreferencesManager.useJitsiConfCall(this)) {
+    private void startIpCall(final boolean useJitsiCall, final boolean aIsVideoCall) {
+        if ((mRoom.getActiveMembers().size() > 2) && useJitsiCall) {
             startJitsiCall(aIsVideoCall);
             return;
         }
@@ -1858,7 +1908,7 @@ public void onMatrixError(MatrixError e) {
                         CommonActivityUtils.displayUnknownDevicesDialog(mSession, VectorRoomActivity.this, (MXUsersDevicesMap<MXDeviceInfo>) cryptoError.mExceptionData, new VectorUnknownDevicesFragment.IUnknownDevicesSendAnywayListener() {
                             @Override
                             public void onSendAnyway() {
-                                startIpCall(aIsVideoCall);
+                                startIpCall(useJitsiCall, aIsVideoCall);
                             }
                         });
 
@@ -2241,12 +2291,10 @@ private void launchNativeCamera() {
             if (null == dummyUri) {
                 Log.e(LOG_TAG, "Cannot use the external storage media to save image");
             }
-        }
-        catch (UnsupportedOperationException uoe) {
+        } catch (UnsupportedOperationException uoe) {
             Log.e(LOG_TAG, "Unable to insert camera URI into MediaStore.Images.Media.EXTERNAL_CONTENT_URI - no SD card? Attempting to insert into device storage.");
-        }
-        catch (Exception e) {
-            Log.e(LOG_TAG, "Unable to insert camera URI into MediaStore.Images.Media.EXTERNAL_CONTENT_URI. "+e);
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "Unable to insert camera URI into MediaStore.Images.Media.EXTERNAL_CONTENT_URI. " + e);
         }
 
         if (null == dummyUri) {
@@ -2356,11 +2404,11 @@ public void onRequestPermissionsResult(int aRequestCode, @NonNull String[] aPerm
             }
         } else if (aRequestCode == CommonActivityUtils.REQUEST_CODE_PERMISSION_AUDIO_IP_CALL) {
             if (CommonActivityUtils.onPermissionResultAudioIpCall(this, aPermissions, aGrantResults)) {
-                startIpCall(false);
+                startIpCall(PreferencesManager.useJitsiConfCall(this), false);
             }
         } else if (aRequestCode == CommonActivityUtils.REQUEST_CODE_PERMISSION_VIDEO_IP_CALL) {
             if (CommonActivityUtils.onPermissionResultVideoIpCall(this, aPermissions, aGrantResults)) {
-                startIpCall(true);
+                startIpCall(PreferencesManager.useJitsiConfCall(this), true);
             }
         } else {
             Log.w(LOG_TAG, "## onRequestPermissionsResult(): Unknown requestCode =" + aRequestCode);
@@ -2404,6 +2452,20 @@ public static String sanitizeDisplayname(String displayName) {
         return displayName;
     }
 
+    /**
+     * Insert a text in the text editor
+     *
+     * @param text the text
+     */
+    public void insertTextInTextEditor(String text) {
+        // another user
+        if (TextUtils.isEmpty(mEditText.getText())) {
+            mEditText.append(text);
+        } else {
+            mEditText.getText().insert(mEditText.getSelectionStart(), text + " ");
+        }
+    }
+    
     /**
      * Insert an user displayname  in the message editor.
      *
@@ -2411,11 +2473,14 @@ public static String sanitizeDisplayname(String displayName) {
      */
     public void insertUserDisplayNameInTextEditor(String text) {
         if (null != text) {
+            boolean vibrate = false;
+
             if (TextUtils.equals(mSession.getMyUser().displayname, text)) {
                 // current user
                 if (TextUtils.isEmpty(mEditText.getText())) {
-                    mEditText.setText(String.format("%s ", SlashComandsParser.CMD_EMOTE));
+                    mEditText.setText(String.format(VectorApp.getApplicationLocale(), "%s ", SlashComandsParser.CMD_EMOTE));
                     mEditText.setSelection(mEditText.getText().length());
+                    vibrate = true;
                 }
             } else {
                 // another user
@@ -2424,6 +2489,15 @@ public void insertUserDisplayNameInTextEditor(String text) {
                 } else {
                     mEditText.getText().insert(mEditText.getSelectionStart(), sanitizeDisplayname(text) + " ");
                 }
+
+                vibrate = true;
+            }
+
+            if (vibrate && PreferencesManager.vibrateWhenMentioning(this)) {
+                Vibrator v = (Vibrator) getSystemService(Context.VIBRATOR_SERVICE);
+                if ((null != v) && v.hasVibrator()) {
+                    v.vibrate(100);
+                }
             }
         }
     }
@@ -2707,11 +2781,11 @@ private void onRoomTypings() {
             if (0 == names.size()) {
                 mLatestTypingMessage = null;
             } else if (1 == names.size()) {
-                mLatestTypingMessage = String.format(this.getString(R.string.room_one_user_is_typing), names.get(0));
+                mLatestTypingMessage = String.format(VectorApp.getApplicationLocale(), this.getString(R.string.room_one_user_is_typing), names.get(0));
             } else if (2 == names.size()) {
-                mLatestTypingMessage = String.format(this.getString(R.string.room_two_users_are_typing), names.get(0), names.get(1));
+                mLatestTypingMessage = String.format(VectorApp.getApplicationLocale(), this.getString(R.string.room_two_users_are_typing), names.get(0), names.get(1));
             } else if (names.size() > 2) {
-                mLatestTypingMessage = String.format(this.getString(R.string.room_many_users_are_typing), names.get(0), names.get(1));
+                mLatestTypingMessage = String.format(VectorApp.getApplicationLocale(), this.getString(R.string.room_many_users_are_typing), names.get(0), names.get(1));
             }
         }
 
@@ -3089,6 +3163,128 @@ private void enableActionBarHeader(boolean aIsHeaderViewDisplayed) {
         }
     }
 
+    //================================================================================
+    // Kick / ban mode management
+    //================================================================================
+
+    /*
+        <string name="has_been_kicked">You have been kicked from %1$ by %2$</string>
+    <string name="reason_colon">Reason: %1$</string>
+    <string name="rejoin">Rejoin</string>
+    <string name="forget_room">Forget room</string>
+     */
+
+    /**
+     * Manage the room preview buttons area
+     */
+    private void manageBannedHeader(RoomMember member) {
+        mRoomPreviewLayout.setVisibility(View.VISIBLE);
+
+        TextView invitationTextView = findViewById(R.id.room_preview_invitation_textview);
+
+        if (TextUtils.equals(member.membership, RoomMember.MEMBERSHIP_BAN)) {
+            invitationTextView.setText(getString(R.string.has_been_banned, VectorUtils.getRoomDisplayName(this, mSession, mRoom), mRoom.getLiveState().getMemberName(member.mSender)));
+        } else {
+            invitationTextView.setText(getString(R.string.has_been_kicked, VectorUtils.getRoomDisplayName(this, mSession, mRoom), mRoom.getLiveState().getMemberName(member.mSender)));
+        }
+
+        TextView subInvitationTextView = findViewById(R.id.room_preview_subinvitation_textview);
+        subInvitationTextView.setText(getString(R.string.reason_colon, member.reason));
+
+
+        Button joinButton = findViewById(R.id.button_join_room);
+
+        if (TextUtils.equals(member.membership, RoomMember.MEMBERSHIP_BAN)) {
+            joinButton.setVisibility(View.INVISIBLE);
+        } else {
+            joinButton.setText(getString(R.string.rejoin));
+
+            joinButton.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    setProgressVisibility(View.VISIBLE);
+                    mSession.joinRoom(mRoom.getRoomId(), new ApiCallback<String>() {
+                        @Override
+                        public void onSuccess(String roomId) {
+                            setProgressVisibility(View.GONE);
+
+                            HashMap<String, Object> params = new HashMap<>();
+
+                            params.put(VectorRoomActivity.EXTRA_MATRIX_ID, mSession.getMyUserId());
+                            params.put(VectorRoomActivity.EXTRA_ROOM_ID, mRoom.getRoomId());
+
+                            // clear the activity stack to home activity
+                            Intent intent = new Intent(VectorRoomActivity.this, VectorHomeActivity.class);
+                            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+
+                            intent.putExtra(VectorHomeActivity.EXTRA_JUMP_TO_ROOM_PARAMS, params);
+                            VectorRoomActivity.this.startActivity(intent);
+                        }
+
+                        private void onError(String errorMessage) {
+                            Log.d(LOG_TAG, "re join failed " + errorMessage);
+                            CommonActivityUtils.displayToast(VectorRoomActivity.this, errorMessage);
+                            setProgressVisibility(View.GONE);
+                        }
+
+                        @Override
+                        public void onNetworkError(Exception e) {
+                            onError(e.getLocalizedMessage());
+                        }
+
+                        @Override
+                        public void onMatrixError(MatrixError e) {
+                            onError(e.getLocalizedMessage());
+                        }
+
+                        @Override
+                        public void onUnexpectedError(Exception e) {
+                            onError(e.getLocalizedMessage());
+                        }
+                    });
+                }
+            });
+        }
+
+        Button forgetRoomButton = findViewById(R.id.button_decline);
+        forgetRoomButton.setText(getString(R.string.forget_room));
+
+        forgetRoomButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mRoom.forget(new ApiCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void info) {
+                        VectorRoomActivity.this.finish();
+                    }
+
+                    private void onError(String errorMessage) {
+                        Log.d(LOG_TAG, "forget failed " + errorMessage);
+                        CommonActivityUtils.displayToast(VectorRoomActivity.this, errorMessage);
+                        setProgressVisibility(View.GONE);
+                    }
+
+                    @Override
+                    public void onNetworkError(Exception e) {
+                        onError(e.getLocalizedMessage());
+                    }
+
+                    @Override
+                    public void onMatrixError(MatrixError e) {
+                        onError(e.getLocalizedMessage());
+                    }
+
+                    @Override
+                    public void onUnexpectedError(Exception e) {
+                        onError(e.getLocalizedMessage());
+                    }
+                });
+            }
+        });
+
+        enableActionBarHeader(SHOW_ACTION_BAR_HEADER);
+    }
+
     //================================================================================
     // Room preview management
     //================================================================================
diff --git a/vector/src/main/java/im/vector/activity/VectorRoomDetailsActivity.java b/vector/src/main/java/im/vector/activity/VectorRoomDetailsActivity.java
index b1e56d5c2a..5c1b363122 100755
--- a/vector/src/main/java/im/vector/activity/VectorRoomDetailsActivity.java
+++ b/vector/src/main/java/im/vector/activity/VectorRoomDetailsActivity.java
@@ -19,7 +19,6 @@
 import android.Manifest;
 import android.content.Intent;
 import android.content.pm.PackageManager;
-import android.graphics.drawable.ColorDrawable;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.app.FragmentTransaction;
@@ -41,7 +40,6 @@
 import im.vector.fragments.VectorRoomDetailsMembersFragment;
 import im.vector.fragments.VectorRoomSettingsFragment;
 import im.vector.fragments.VectorSearchRoomFilesListFragment;
-import im.vector.util.ThemeUtils;
 
 /**
  * This class implements the room details screen, using a tab UI pattern.
@@ -331,8 +329,6 @@ private void createNavigationTabs(Bundle aSavedInstanceState, int defaultSelecte
             tabIndexToRestore = PEOPLE_TAB_INDEX;
         }
 
-        mActionBar.setStackedBackgroundDrawable(new ColorDrawable(ThemeUtils.getColor(this, R.attr.tab_bar_background_color)));
-
         // set the tab to display & set current tab index
         mActionBar.setSelectedNavigationItem(tabIndexToRestore);
         mCurrentTabIndex = tabIndexToRestore;
diff --git a/vector/src/main/java/im/vector/activity/WidgetActivity.java b/vector/src/main/java/im/vector/activity/WidgetActivity.java
index 8203888679..b50e813e5b 100755
--- a/vector/src/main/java/im/vector/activity/WidgetActivity.java
+++ b/vector/src/main/java/im/vector/activity/WidgetActivity.java
@@ -43,7 +43,6 @@
 import butterknife.ButterKnife;
 import im.vector.Matrix;
 import im.vector.R;
-import im.vector.VectorApp;
 import im.vector.widgets.Widget;
 import im.vector.widgets.WidgetsManager;
 
diff --git a/vector/src/main/java/im/vector/adapters/AbsAdapter.java b/vector/src/main/java/im/vector/adapters/AbsAdapter.java
index 546449c6ab..f42036d365 100644
--- a/vector/src/main/java/im/vector/adapters/AbsAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/AbsAdapter.java
@@ -21,6 +21,7 @@
 import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 
+import org.matrix.androidsdk.rest.model.group.Group;
 import org.matrix.androidsdk.util.Log;
 
 import android.util.Pair;
@@ -39,6 +40,7 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import im.vector.R;
+import im.vector.util.GroupUtils;
 import im.vector.util.RoomUtils;
 import im.vector.util.StickySectionHelper;
 import im.vector.view.SectionView;
@@ -52,6 +54,10 @@ public abstract class AbsAdapter extends AbsFilterableAdapter {
 
     static final int TYPE_ROOM = -3;
 
+    static final int TYPE_GROUP = -4;
+
+    static final int TYPE_GROUP_INVITATION = -5;
+
     // Helper handling the sticky view for each section
     private StickySectionHelper mStickySectionHelper;
 
@@ -59,7 +65,7 @@ public abstract class AbsAdapter extends AbsFilterableAdapter {
     /// Ex <0, section 1 with 2 items>, <3, section 2>
     private final List<Pair<Integer, AdapterSection>> mSections;
 
-    private final AdapterSection<Room> mInviteSection;
+    private AdapterSection<Room> mInviteSection;
 
     /*
      * *********************************************************************************************
@@ -67,20 +73,33 @@ public abstract class AbsAdapter extends AbsFilterableAdapter {
      * *********************************************************************************************
      */
 
-    AbsAdapter(final Context context, final InvitationListener invitationListener, final MoreRoomActionListener moreActionListener) {
+    AbsAdapter(final Context context, final RoomInvitationListener invitationListener, final MoreRoomActionListener moreActionListener) {
         super(context, invitationListener, moreActionListener);
 
         registerAdapterDataObserver(new AdapterDataObserver());
 
         mSections = new ArrayList<>();
 
-        mInviteSection = new AdapterSection<>(context.getString(R.string.room_recents_invites), -1, R.layout.adapter_item_room_view,
+        mInviteSection = new AdapterSection<>(context, context.getString(R.string.room_recents_invites), -1, R.layout.adapter_item_room_view,
                 TYPE_HEADER_DEFAULT, TYPE_ROOM_INVITATION, new ArrayList<Room>(), null);
         mInviteSection.setEmptyViewPlaceholder(null, context.getString(R.string.no_result_placeholder));
         mInviteSection.setIsHiddenWhenEmpty(true);
         addSection(mInviteSection);
     }
 
+
+    AbsAdapter(final Context context, final GroupInvitationListener invitationListener, final MoreGroupActionListener moreActionListener) {
+        super(context, invitationListener, moreActionListener);
+        registerAdapterDataObserver(new AdapterDataObserver());
+        mSections = new ArrayList<>();
+    }
+
+    AbsAdapter(final Context context) {
+        super(context);
+        registerAdapterDataObserver(new AdapterDataObserver());
+        mSections = new ArrayList<>();
+    }
+
     /*
      * *********************************************************************************************
      * RecyclerView.Adapter methods
@@ -122,7 +141,7 @@ public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewT
                 return new HeaderViewHolder(headerItemView);
             case TYPE_ROOM_INVITATION:
                 View invitationView = inflater.inflate(R.layout.adapter_item_room_invite, viewGroup, false);
-                return new InvitationViewHolder(invitationView);
+                return new RoomInvitationViewHolder(invitationView);
             default:
                 return createSubViewHolder(viewGroup, viewType);
         }
@@ -157,9 +176,9 @@ public void onBindViewHolder(final RecyclerView.ViewHolder viewHolder, int posit
                 }
                 break;
             case TYPE_ROOM_INVITATION:
-                final InvitationViewHolder invitationViewHolder = (InvitationViewHolder) viewHolder;
+                final RoomInvitationViewHolder invitationViewHolder = (RoomInvitationViewHolder) viewHolder;
                 final Room room = (Room) getItemForPosition(position);
-                invitationViewHolder.populateViews(mContext, mSession, room, mInvitationListener, mMoreActionListener);
+                invitationViewHolder.populateViews(mContext, mSession, room, mRoomInvitationListener, mMoreRoomActionListener);
                 break;
             default:
                 populateViewHolder(viewType, viewHolder, position);
@@ -207,12 +226,14 @@ protected void publishResults(CharSequence constraint, FilterResults results) {
      * @param rooms
      */
     public void setInvitation(final List<Room> rooms) {
-        mInviteSection.setItems(rooms, mCurrentFilterPattern);
-        if (!TextUtils.isEmpty(mCurrentFilterPattern)) {
-            filterRoomSection(mInviteSection, String.valueOf(mCurrentFilterPattern));
-        }
+        if (null != mInviteSection) {
+            mInviteSection.setItems(rooms, mCurrentFilterPattern);
+            if (!TextUtils.isEmpty(mCurrentFilterPattern)) {
+                filterRoomSection(mInviteSection, String.valueOf(mCurrentFilterPattern));
+            }
 
-        updateSections();
+            updateSections();
+        }
     }
 
     /**
@@ -353,13 +374,38 @@ int getSectionHeaderPosition(final AdapterSection section) {
      * @return nb of items matching the filter
      */
     int filterRoomSection(final AdapterSection<Room> section, final String filterPattern) {
-        if (!TextUtils.isEmpty(filterPattern)) {
-            List<Room> filteredRoom = RoomUtils.getFilteredRooms(mContext, mSession, section.getItems(), filterPattern);
-            section.setFilteredItems(filteredRoom, filterPattern);
+        if (null != section) {
+            if (!TextUtils.isEmpty(filterPattern)) {
+                List<Room> filteredRoom = RoomUtils.getFilteredRooms(mContext, mSession, section.getItems(), filterPattern);
+                section.setFilteredItems(filteredRoom, filterPattern);
+            } else {
+                section.resetFilter();
+            }
+            return section.getFilteredItems().size();
         } else {
-            section.resetFilter();
+            return 0;
+        }
+    }
+
+    /**
+     * Filter the given section of groups with the given pattern
+     *
+     * @param section
+     * @param filterPattern
+     * @return nb of items matching the filter
+     */
+    int filterGroupSection(final AdapterSection<Group> section, final String filterPattern) {
+        if (null != section) {
+            if (!TextUtils.isEmpty(filterPattern)) {
+                List<Group> filteredGroups = GroupUtils.getFilteredGroups(section.getItems(), filterPattern);
+                section.setFilteredItems(filteredGroups, filterPattern);
+            } else {
+                section.resetFilter();
+            }
+            return section.getFilteredItems().size();
+        } else {
+            return 0;
         }
-        return section.getFilteredItems().size();
     }
 
     /*
@@ -430,16 +476,26 @@ public void onItemRangeMoved(int fromPosition, int toPosition, int itemCount) {
         }
     }
 
-    public interface InvitationListener {
+    public interface RoomInvitationListener {
         void onPreviewRoom(MXSession session, String roomId);
 
         void onRejectInvitation(MXSession session, String roomId);
     }
 
+    public interface GroupInvitationListener {
+        void onJoinGroup(MXSession session, String groupId);
+
+        void onRejectInvitation(MXSession session, String groupId);
+    }
+
     public interface MoreRoomActionListener {
         void onMoreActionClick(View itemView, Room room);
     }
 
+    public interface MoreGroupActionListener {
+        void onMoreActionClick(View itemView, Group group);
+    }
+
     /*
      * *********************************************************************************************
      * Abstract methods
diff --git a/vector/src/main/java/im/vector/adapters/AbsFilterableAdapter.java b/vector/src/main/java/im/vector/adapters/AbsFilterableAdapter.java
index 52bbb03721..0f26a43ea7 100644
--- a/vector/src/main/java/im/vector/adapters/AbsFilterableAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/AbsFilterableAdapter.java
@@ -38,21 +38,40 @@ public abstract class AbsFilterableAdapter<T extends RecyclerView.ViewHolder> ex
     CharSequence mCurrentFilterPattern;
     private final Filter mFilter;
 
-    final AbsAdapter.InvitationListener mInvitationListener;
-    final AbsAdapter.MoreRoomActionListener mMoreActionListener;
-
+    AbsAdapter.RoomInvitationListener mRoomInvitationListener;
+    AbsAdapter.GroupInvitationListener mGroupInvitationListener;
+    AbsAdapter.MoreRoomActionListener mMoreRoomActionListener;
+    AbsAdapter.MoreGroupActionListener mMoreGroupActionListener;
     /*
      * *********************************************************************************************
      * Constructor
      * *********************************************************************************************
      */
 
-    AbsFilterableAdapter(final Context context, final AbsAdapter.InvitationListener invitationListener,
+    AbsFilterableAdapter(final Context context) {
+        mContext = context;
+
+        mSession = Matrix.getInstance(context).getDefaultSession();
+        mFilter = createFilter();
+    }
+
+    AbsFilterableAdapter(final Context context, final AbsAdapter.RoomInvitationListener invitationListener,
                          final AbsAdapter.MoreRoomActionListener moreActionListener) {
         mContext = context;
 
-        mInvitationListener = invitationListener;
-        mMoreActionListener = moreActionListener;
+        mRoomInvitationListener = invitationListener;
+        mMoreRoomActionListener = moreActionListener;
+
+        mSession = Matrix.getInstance(context).getDefaultSession();
+        mFilter = createFilter();
+    }
+
+    AbsFilterableAdapter(final Context context, final AbsAdapter.GroupInvitationListener invitationListener,
+                         final AbsAdapter.MoreGroupActionListener moreActionListener) {
+        mContext = context;
+
+        mGroupInvitationListener = invitationListener;
+        mMoreGroupActionListener = moreActionListener;
 
         mSession = Matrix.getInstance(context).getDefaultSession();
         mFilter = createFilter();
diff --git a/vector/src/main/java/im/vector/adapters/AdapterSection.java b/vector/src/main/java/im/vector/adapters/AdapterSection.java
index 686b866b8b..53a37c5639 100644
--- a/vector/src/main/java/im/vector/adapters/AdapterSection.java
+++ b/vector/src/main/java/im/vector/adapters/AdapterSection.java
@@ -16,6 +16,7 @@
 
 package im.vector.adapters;
 
+import android.content.Context;
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.ForegroundColorSpan;
@@ -53,8 +54,11 @@ public class AdapterSection<T> {
     private boolean mIsHiddenWhenEmpty;
     private boolean mIsHiddenWhenNoFilter;
 
-    public AdapterSection(String title, int headerSubViewResId, int contentResId, int headerViewType,
+    private Context mContext;
+
+    public AdapterSection(Context context , String title, int headerSubViewResId, int contentResId, int headerViewType,
                           int contentViewType, List<T> items, Comparator<T> comparator) {
+        mContext = context;
         mTitle = title;
         mItems = items;
         mFilteredItems = new ArrayList<>(items);
@@ -117,8 +121,8 @@ void updateTitle() {
      * @param titleToFormat
      */
     void formatTitle(final String titleToFormat) {
-        SpannableString spannableString = new SpannableString(titleToFormat.toUpperCase());
-        spannableString.setSpan(new ForegroundColorSpan(ThemeUtils.getColor(VectorApp.getInstance(), R.attr.list_header_subtext_color)),
+        SpannableString spannableString = new SpannableString(titleToFormat.toUpperCase(VectorApp.getApplicationLocale()));
+        spannableString.setSpan(new ForegroundColorSpan(ThemeUtils.getColor(mContext, R.attr.list_header_subtext_color)),
                 mTitle.length(), titleToFormat.length(), 0);
         mTitleFormatted = spannableString;
     }
diff --git a/vector/src/main/java/im/vector/adapters/AutoCompletedUserAdapter.java b/vector/src/main/java/im/vector/adapters/AutoCompletedUserAdapter.java
index 2a4d3a60e3..ba7900d014 100755
--- a/vector/src/main/java/im/vector/adapters/AutoCompletedUserAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/AutoCompletedUserAdapter.java
@@ -27,6 +27,7 @@
 import org.matrix.androidsdk.MXSession;
 
 import im.vector.R;
+import im.vector.VectorApp;
 import im.vector.activity.VectorRoomActivity;
 import im.vector.util.VectorUtils;
 import im.vector.view.VectorCircularImageView;
@@ -179,18 +180,18 @@ protected FilterResults performFiltering(CharSequence prefix) {
                 mIsSearchingMatrixId = true;
             } else {
                 newValues = new ArrayList<>();
-                String prefixString = prefix.toString().toLowerCase();
+                String prefixString = prefix.toString().toLowerCase(VectorApp.getApplicationLocale());
                 mIsSearchingMatrixId = prefixString.startsWith("@");
 
                 if (mIsSearchingMatrixId) {
                     for (User user : mUsersList) {
-                        if ((null != user.user_id) && user.user_id.toLowerCase().startsWith(prefixString)) {
+                        if ((null != user.user_id) && user.user_id.toLowerCase(VectorApp.getApplicationLocale()).startsWith(prefixString)) {
                             newValues.add(user);
                         }
                     }
                 } else {
                     for (User user : mUsersList) {
-                        if ((null != user.displayname) && user.displayname.toLowerCase().startsWith(prefixString)) {
+                        if ((null != user.displayname) && user.displayname.toLowerCase(VectorApp.getApplicationLocale()).startsWith(prefixString)) {
                             newValues.add(user);
                         }
                     }
diff --git a/vector/src/main/java/im/vector/adapters/GroupAdapter.java b/vector/src/main/java/im/vector/adapters/GroupAdapter.java
new file mode 100644
index 0000000000..ddf5bf37b5
--- /dev/null
+++ b/vector/src/main/java/im/vector/adapters/GroupAdapter.java
@@ -0,0 +1,171 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.adapters;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.matrix.androidsdk.rest.model.group.Group;
+import org.matrix.androidsdk.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import im.vector.R;
+
+public class GroupAdapter extends AbsAdapter {
+    private static final String LOG_TAG = GroupAdapter.class.getSimpleName();
+
+    private final AdapterSection<Group> mInvitedGroupsSection;
+    private final AdapterSection<Group> mGroupsSection;
+
+    private final OnGroupSelectItemListener mListener;
+
+    /*
+     * *********************************************************************************************
+     * Constructor
+     * *********************************************************************************************
+     */
+
+    public GroupAdapter(final Context context, final OnGroupSelectItemListener listener, final GroupInvitationListener invitationListener, final MoreGroupActionListener moreActionListener) {
+        super(context, invitationListener, moreActionListener);
+
+        mListener = listener;
+
+        mInvitedGroupsSection = new AdapterSection<>(context, context.getString(R.string.groups_invite_header), -1,
+                R.layout.adapter_item_group_invite, TYPE_HEADER_DEFAULT, TYPE_GROUP_INVITATION, new ArrayList<Group>(), Group.mGroupsComparator);
+        mInvitedGroupsSection.setEmptyViewPlaceholder(context.getString(R.string.no_group_placeholder), context.getString(R.string.no_result_placeholder));
+        mInvitedGroupsSection.setIsHiddenWhenEmpty(true);
+
+        mGroupsSection = new AdapterSection<>(context, context.getString(R.string.groups_header), -1,
+                R.layout.adapter_item_group_view, TYPE_HEADER_DEFAULT, TYPE_GROUP, new ArrayList<Group>(), Group.mGroupsComparator);
+        mGroupsSection.setEmptyViewPlaceholder(context.getString(R.string.no_group_placeholder), context.getString(R.string.no_result_placeholder));
+
+        addSection(mInvitedGroupsSection);
+        addSection(mGroupsSection);
+    }
+
+    /*
+     * *********************************************************************************************
+     * Abstract methods implementation
+     * *********************************************************************************************
+     */
+
+    @Override
+    protected RecyclerView.ViewHolder createSubViewHolder(ViewGroup viewGroup, int viewType) {
+        Log.i(LOG_TAG, " onCreateViewHolder for viewType:" + viewType);
+        final LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+
+        switch (viewType) {
+            case TYPE_GROUP:
+                return new GroupViewHolder(inflater.inflate(R.layout.adapter_item_group_view, viewGroup, false));
+            case TYPE_GROUP_INVITATION:
+                return new GroupInvitationViewHolder(inflater.inflate(R.layout.adapter_item_group_invite, viewGroup, false));
+        }
+
+        return null;
+    }
+
+    @Override
+    protected void populateViewHolder(int viewType, RecyclerView.ViewHolder viewHolder, int position) {
+        View groupView = null;
+        Group group = null;
+
+        switch (viewType) {
+            case TYPE_GROUP: {
+                final GroupViewHolder groupViewHolder = (GroupViewHolder) viewHolder;
+                group = (Group) getItemForPosition(position);
+                groupViewHolder.populateViews(mContext, mSession, group, null, false, mMoreGroupActionListener);
+                groupView = groupViewHolder.itemView;
+
+                break;
+            }
+            case TYPE_GROUP_INVITATION: {
+                final GroupInvitationViewHolder groupViewHolder = (GroupInvitationViewHolder) viewHolder;
+                group = (Group) getItemForPosition(position);
+                groupViewHolder.populateViews(mContext, mSession, group, mGroupInvitationListener, true, mMoreGroupActionListener);
+                groupView = groupViewHolder.itemView;
+                break;
+            }
+        }
+
+        if (null != groupView) {
+            final Group fGroup = group;
+
+            groupView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    mListener.onSelectItem(fGroup, -1);
+                }
+            });
+
+            groupView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    return mListener.onLongPressItem(fGroup, -1);
+                }
+            });
+        }
+    }
+
+    @Override
+    protected int applyFilter(String pattern) {
+        int nbResults = 0;
+
+        nbResults += filterGroupSection(mInvitedGroupsSection, pattern);
+        nbResults += filterGroupSection(mGroupsSection, pattern);
+
+        return nbResults;
+    }
+
+    /*
+     * *********************************************************************************************
+     * Public methods
+     * *********************************************************************************************
+     */
+
+    public void setGroups(final List<Group> groups) {
+        mGroupsSection.setItems(groups, mCurrentFilterPattern);
+        if (!TextUtils.isEmpty(mCurrentFilterPattern)) {
+            filterGroupSection(mGroupsSection, String.valueOf(mCurrentFilterPattern));
+        }
+        updateSections();
+    }
+
+    public void setInvitedGroups(final List<Group> groups) {
+        mInvitedGroupsSection.setItems(groups, mCurrentFilterPattern);
+        if (!TextUtils.isEmpty(mCurrentFilterPattern)) {
+            filterGroupSection(mInvitedGroupsSection, String.valueOf(mCurrentFilterPattern));
+        }
+        updateSections();
+    }
+
+    /*
+     * *********************************************************************************************
+     * Inner classes
+     * *********************************************************************************************
+     */
+
+    public interface OnGroupSelectItemListener {
+        void onSelectItem(Group item, int position);
+        boolean onLongPressItem(Group item, int position);
+    }
+}
diff --git a/vector/src/main/java/im/vector/adapters/GroupAdapterSection.java b/vector/src/main/java/im/vector/adapters/GroupAdapterSection.java
new file mode 100644
index 0000000000..0d8169b8ff
--- /dev/null
+++ b/vector/src/main/java/im/vector/adapters/GroupAdapterSection.java
@@ -0,0 +1,47 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.adapters;
+
+import android.content.Context;
+
+import java.util.Comparator;
+import java.util.List;
+
+public class GroupAdapterSection<T> extends AdapterSection<T> {
+
+    public GroupAdapterSection(Context context , String title, int headerSubViewResId, int contentResId, int headerViewType,
+                          int contentViewType, List<T> items, Comparator<T> comparator) {
+        super(context, title, headerSubViewResId, contentResId, headerViewType, contentViewType, items, comparator);
+    }
+
+    /**
+     * Update the title depending on the number of items
+     */
+    void updateTitle() {
+        String newTitle;
+
+        // the group members / rooms lists are estimated
+        // it seems safer to display the count only for the filtered lists
+        if ((getItems().size() != getFilteredItems().size()) && (getNbItems() > 0)) {
+            newTitle = mTitle.concat("   " + getNbItems());
+        } else {
+            newTitle = mTitle;
+        }
+
+        formatTitle(newTitle);
+    }
+}
diff --git a/vector/src/main/java/im/vector/adapters/GroupDetailsFragmentPagerAdapter.java b/vector/src/main/java/im/vector/adapters/GroupDetailsFragmentPagerAdapter.java
new file mode 100755
index 0000000000..5d3a3a5c89
--- /dev/null
+++ b/vector/src/main/java/im/vector/adapters/GroupDetailsFragmentPagerAdapter.java
@@ -0,0 +1,132 @@
+/*
+ * Copyright 2017 OpenMarket Ltd
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.adapters;
+
+import android.content.Context;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.view.ViewGroup;
+
+import im.vector.R;
+import im.vector.fragments.GroupDetailsBaseFragment;
+import im.vector.fragments.GroupDetailsHomeFragment;
+import im.vector.fragments.GroupDetailsPeopleFragment;
+import im.vector.fragments.GroupDetailsRoomsFragment;
+
+/**
+ * Groups pager adapter
+ */
+public class GroupDetailsFragmentPagerAdapter extends FragmentPagerAdapter {
+    private static final String LOG_TAG = GroupDetailsFragmentPagerAdapter.class.getSimpleName();
+
+    private static final int HOME_FRAGMENT_INDEX = 0;
+    private static final int PEOPLE_FRAGMENT_INDEX = 1;
+    private static final int ROOMS_FRAGMENT_INDEX = 2;
+    private static final int FRAGMENTS_COUNT = 3;
+
+    private final Context mContext;
+
+    private GroupDetailsHomeFragment mHomeFragment;
+    private GroupDetailsPeopleFragment mPeopleFragment;
+    private GroupDetailsRoomsFragment mRoomsFragment;
+
+    public GroupDetailsFragmentPagerAdapter(FragmentManager fm, Context context) {
+        super(fm);
+        mContext = context;
+    }
+
+    @Override
+    public int getCount() {
+        return FRAGMENTS_COUNT;
+    }
+
+    @Override
+    public Fragment getItem(int position) {
+        Fragment fragment;
+
+        switch (position) {
+            case HOME_FRAGMENT_INDEX: {
+                fragment = mHomeFragment;
+
+                if (null == fragment) {
+                    fragment = mHomeFragment = new GroupDetailsHomeFragment();
+                }
+                break;
+            }
+            case PEOPLE_FRAGMENT_INDEX: {
+                fragment = mPeopleFragment;
+
+                if (null == fragment) {
+                    fragment = mPeopleFragment = new GroupDetailsPeopleFragment();
+                }
+                break;
+            }
+            case ROOMS_FRAGMENT_INDEX: {
+                fragment = mRoomsFragment;
+
+                if (null == fragment) {
+                    fragment = mRoomsFragment = new GroupDetailsRoomsFragment();
+                }
+                break;
+            }
+            default:
+                fragment = null;
+        }
+
+        return fragment;
+    }
+
+    @Override
+    public CharSequence getPageTitle(int position) {
+        switch (position) {
+            case HOME_FRAGMENT_INDEX: {
+                return mContext.getString(R.string.group_details_home);
+            }
+            case PEOPLE_FRAGMENT_INDEX: {
+                return mContext.getString(R.string.group_details_people);
+            }
+            case ROOMS_FRAGMENT_INDEX: {
+                return mContext.getString(R.string.group_details_rooms);
+            }
+        }
+
+        return super.getPageTitle(position);
+    }
+
+    /**
+     * @return the home fragment
+     */
+    public GroupDetailsBaseFragment getHomeFragment() {
+        return mHomeFragment;
+    }
+
+    /**
+     * @return the people fragment
+     */
+    public GroupDetailsBaseFragment getPeopleFragment() {
+        return mPeopleFragment;
+    }
+
+    /**
+     * @return the rooms fragment
+     */
+    public GroupDetailsBaseFragment getRoomsFragment() {
+        return mRoomsFragment;
+    }
+}
diff --git a/vector/src/main/java/im/vector/adapters/GroupDetailsPeopleAdapter.java b/vector/src/main/java/im/vector/adapters/GroupDetailsPeopleAdapter.java
new file mode 100644
index 0000000000..10f113a4be
--- /dev/null
+++ b/vector/src/main/java/im/vector/adapters/GroupDetailsPeopleAdapter.java
@@ -0,0 +1,173 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.adapters;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.matrix.androidsdk.rest.model.group.GroupUser;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import im.vector.R;
+import im.vector.util.GroupUtils;
+
+public class GroupDetailsPeopleAdapter extends AbsAdapter {
+    private static final int TYPE_JOINED_USERS = 12;
+    private static final int TYPE_INVITED_USERS = 13;
+
+    private final GroupAdapterSection<GroupUser> mJoinedUsersSection;
+    private final GroupAdapterSection<GroupUser> mInvitedUsersSection;
+
+    private final OnSelectUserListener mListener;
+
+    private static final Comparator<GroupUser> mComparator = new Comparator<GroupUser>() {
+        @Override
+        public int compare(GroupUser lhs, GroupUser rhs) {
+            return lhs.getDisplayname().compareTo(rhs.getDisplayname());
+        }
+    };
+
+    /*
+     * *********************************************************************************************
+     * Constructor
+     * *********************************************************************************************
+     */
+
+    public GroupDetailsPeopleAdapter(final Context context, final OnSelectUserListener listener) {
+        super(context);
+
+        mListener = listener;
+
+        mJoinedUsersSection = new GroupAdapterSection<>(context, context.getString(R.string.joined), -1,
+                R.layout.adapter_item_group_user_room_view, TYPE_HEADER_DEFAULT, TYPE_JOINED_USERS, new ArrayList<GroupUser>(), mComparator);
+        mJoinedUsersSection.setEmptyViewPlaceholder(context.getString(R.string.no_users_placeholder), context.getString(R.string.no_result_placeholder));
+
+        mInvitedUsersSection = new GroupAdapterSection<>(context, context.getString(R.string.invited), -1,
+                R.layout.adapter_item_group_user_room_view, TYPE_HEADER_DEFAULT, TYPE_INVITED_USERS, new ArrayList<GroupUser>(), mComparator);
+        mInvitedUsersSection.setEmptyViewPlaceholder(context.getString(R.string.no_users_placeholder), context.getString(R.string.no_result_placeholder));
+        mInvitedUsersSection.setIsHiddenWhenEmpty(true);
+
+        addSection(mJoinedUsersSection);
+        addSection(mInvitedUsersSection);
+    }
+
+    /*
+     * *********************************************************************************************
+     * Abstract methods implementation
+     * *********************************************************************************************
+     */
+
+    @Override
+    protected RecyclerView.ViewHolder createSubViewHolder(ViewGroup viewGroup, int viewType) {
+        final LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+
+        if ((viewType == TYPE_JOINED_USERS) || (viewType == TYPE_INVITED_USERS)) {
+            return new GroupUserViewHolder(inflater.inflate(R.layout.adapter_item_group_user_room_view, viewGroup, false));
+        }
+        return null;
+    }
+
+    @Override
+    protected void populateViewHolder(int viewType, RecyclerView.ViewHolder viewHolder, int position) {
+        switch (viewType) {
+            case TYPE_JOINED_USERS:
+            case TYPE_INVITED_USERS:
+                final GroupUserViewHolder groupUserViewHolder = (GroupUserViewHolder) viewHolder;
+                final GroupUser groupUser = (GroupUser) getItemForPosition(position);
+                groupUserViewHolder.populateViews(mContext, mSession, groupUser);
+
+                groupUserViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mListener.onSelectItem(groupUser, -1);
+                    }
+                });
+                break;
+        }
+    }
+
+    /**
+     * Filter the given section of rooms with the given pattern
+     *
+     * @param section
+     * @param filterPattern
+     * @return nb of items matching the filter
+     */
+    int filterGroupUsersSection(final AdapterSection<GroupUser> section, final String filterPattern) {
+        if (null != section) {
+            if (!TextUtils.isEmpty(filterPattern)) {
+                List<GroupUser> filteredGroupUsers = GroupUtils.getFilteredGroupUsers(section.getItems(), filterPattern);
+                section.setFilteredItems(filteredGroupUsers, filterPattern);
+            } else {
+                section.resetFilter();
+            }
+            return section.getFilteredItems().size();
+        } else {
+            return 0;
+        }
+    }
+
+
+    @Override
+    protected int applyFilter(String pattern) {
+        int nbResults = 0;
+
+        nbResults += filterGroupUsersSection(mJoinedUsersSection, pattern);
+        nbResults += filterGroupUsersSection(mInvitedUsersSection, pattern);
+
+        return nbResults;
+    }
+
+    /*
+     * *********************************************************************************************
+     * Public methods
+     * *********************************************************************************************
+     */
+
+    public void setJoinedGroupUsers(final List<GroupUser> users) {
+        mJoinedUsersSection.setItems(users, mCurrentFilterPattern);
+        if (!TextUtils.isEmpty(mCurrentFilterPattern)) {
+            filterGroupUsersSection(mJoinedUsersSection, String.valueOf(mCurrentFilterPattern));
+        }
+        updateSections();
+    }
+
+    public void setInvitedGroupUsers(final List<GroupUser> users) {
+        mInvitedUsersSection.setItems(users, mCurrentFilterPattern);
+        if (!TextUtils.isEmpty(mCurrentFilterPattern)) {
+            filterGroupUsersSection(mInvitedUsersSection, String.valueOf(mCurrentFilterPattern));
+        }
+        updateSections();
+    }
+
+    /*
+     * *********************************************************************************************
+     * Inner classes
+     * *********************************************************************************************
+     */
+
+    public interface OnSelectUserListener {
+        void onSelectItem(GroupUser user, int position);
+    }
+}
diff --git a/vector/src/main/java/im/vector/adapters/GroupDetailsRoomsAdapter.java b/vector/src/main/java/im/vector/adapters/GroupDetailsRoomsAdapter.java
new file mode 100644
index 0000000000..afba660f91
--- /dev/null
+++ b/vector/src/main/java/im/vector/adapters/GroupDetailsRoomsAdapter.java
@@ -0,0 +1,146 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.adapters;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+
+import org.matrix.androidsdk.rest.model.group.GroupRoom;
+
+import java.util.ArrayList;
+import java.util.Comparator;
+import java.util.List;
+
+import im.vector.R;
+import im.vector.util.GroupUtils;
+
+public class GroupDetailsRoomsAdapter extends AbsAdapter {
+    private static final int TYPE_GROUP_ROOMS = 22;
+
+    private static final Comparator<GroupRoom> mComparator = new Comparator<GroupRoom>() {
+        @Override
+        public int compare(GroupRoom lhs, GroupRoom rhs) {
+            return lhs.getDisplayName().compareTo(rhs.getDisplayName());
+        }
+    };
+
+    private final GroupAdapterSection<GroupRoom> mGroupRoomsSection;
+    private final OnSelectRoomListener mListener;
+
+    /*
+     * *********************************************************************************************
+     * Constructor
+     * *********************************************************************************************
+     */
+
+    public GroupDetailsRoomsAdapter(final Context context, final OnSelectRoomListener listener) {
+        super(context);
+        mListener = listener;
+
+        mGroupRoomsSection = new GroupAdapterSection<>(context, context.getString(R.string.rooms), -1,
+                R.layout.adapter_item_group_user_room_view, TYPE_HEADER_DEFAULT, TYPE_GROUP_ROOMS, new ArrayList<GroupRoom>(), mComparator);
+        mGroupRoomsSection.setEmptyViewPlaceholder(null, context.getString(R.string.no_result_placeholder));
+
+        addSection(mGroupRoomsSection);
+    }
+
+    /*
+     * *********************************************************************************************
+     * Abstract methods implementation
+     * *********************************************************************************************
+     */
+
+    @Override
+    protected RecyclerView.ViewHolder createSubViewHolder(ViewGroup viewGroup, int viewType) {
+        final LayoutInflater inflater = LayoutInflater.from(viewGroup.getContext());
+
+        if (viewType == TYPE_GROUP_ROOMS) {
+            return new GroupRoomViewHolder(inflater.inflate(R.layout.adapter_item_group_user_room_view, viewGroup, false));
+        }
+        return null;
+    }
+
+    @Override
+    protected void populateViewHolder(int viewType, RecyclerView.ViewHolder viewHolder, int position) {
+        switch (viewType) {
+            case TYPE_GROUP_ROOMS:
+                final GroupRoomViewHolder groupRoomViewHolder = (GroupRoomViewHolder) viewHolder;
+                final GroupRoom groupRoom = (GroupRoom) getItemForPosition(position);
+                groupRoomViewHolder.populateViews(mContext, mSession, groupRoom);
+
+                groupRoomViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        mListener.onSelectItem(groupRoom, -1);
+                    }
+                });
+                break;
+        }
+    }
+
+    /**
+     * Filter the given section of rooms with the given pattern
+     *
+     * @param section
+     * @param filterPattern
+     * @return nb of items matching the filter
+     */
+    int filterGroupRoomsSection(final AdapterSection<GroupRoom> section, final String filterPattern) {
+        if (null != section) {
+            if (!TextUtils.isEmpty(filterPattern)) {
+                List<GroupRoom> filteredGroupRooms = GroupUtils.getFilteredGroupRooms(section.getItems(), filterPattern);
+                section.setFilteredItems(filteredGroupRooms, filterPattern);
+            } else {
+                section.resetFilter();
+            }
+            return section.getFilteredItems().size();
+        } else {
+            return 0;
+        }
+    }
+
+
+    @Override
+    protected int applyFilter(String pattern) {
+        return filterGroupRoomsSection(mGroupRoomsSection, pattern);
+    }
+
+    /*
+     * *********************************************************************************************
+     * Public methods
+     * *********************************************************************************************
+     */
+
+    public void setGroupRooms(final List<GroupRoom> rooms) {
+        mGroupRoomsSection.setItems(rooms, mCurrentFilterPattern);
+        updateSections();
+    }
+
+    /*
+     * *********************************************************************************************
+     * Inner classes
+     * *********************************************************************************************
+     */
+
+    public interface OnSelectRoomListener {
+        void onSelectItem(GroupRoom groupRoom, int position);
+    }
+}
diff --git a/vector/src/main/java/im/vector/adapters/GroupInvitationViewHolder.java b/vector/src/main/java/im/vector/adapters/GroupInvitationViewHolder.java
new file mode 100644
index 0000000000..4521835ceb
--- /dev/null
+++ b/vector/src/main/java/im/vector/adapters/GroupInvitationViewHolder.java
@@ -0,0 +1,64 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.adapters;
+
+import android.content.Context;
+import android.view.View;
+import android.widget.Button;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.rest.model.group.Group;
+
+import butterknife.BindView;
+import im.vector.R;
+
+public class GroupInvitationViewHolder extends GroupViewHolder {
+
+    @BindView(R.id.group_invite_reject_button)
+    Button vRejectButton;
+
+    @BindView(R.id.group_invite_join_button)
+    Button vJoinButton;
+
+    GroupInvitationViewHolder(View itemView) {
+        super(itemView);
+    }
+
+    @Override
+    public void populateViews(final Context context, final MXSession session, final Group group, final AbsAdapter.GroupInvitationListener invitationListener, final boolean isInvitation,
+                              final AbsAdapter.MoreGroupActionListener moreGroupActionListener) {
+        super.populateViews(context, session, group, invitationListener, true, moreGroupActionListener);
+
+        vJoinButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (null != invitationListener) {
+                    invitationListener.onJoinGroup(session, group.getGroupId());
+                }
+            }
+        });
+
+        vRejectButton.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (null != invitationListener) {
+                    invitationListener.onRejectInvitation(session, group.getGroupId());
+                }
+            }
+        });
+    }
+}
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/adapters/GroupRoomViewHolder.java b/vector/src/main/java/im/vector/adapters/GroupRoomViewHolder.java
new file mode 100644
index 0000000000..bd35f78d2f
--- /dev/null
+++ b/vector/src/main/java/im/vector/adapters/GroupRoomViewHolder.java
@@ -0,0 +1,84 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.adapters;
+
+import android.content.Context;
+import android.support.annotation.Nullable;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.rest.model.group.GroupRoom;
+import org.matrix.androidsdk.util.Log;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import im.vector.R;
+import im.vector.util.VectorUtils;
+
+public class GroupRoomViewHolder extends RecyclerView.ViewHolder {
+    private static final String LOG_TAG = GroupRoomViewHolder.class.getSimpleName();
+
+    @BindView(R.id.contact_avatar)
+    ImageView vContactAvatar;
+
+    @BindView(R.id.contact_name)
+    TextView vContactName;
+
+    @Nullable
+    @BindView(R.id.contact_desc)
+    TextView vContactDesc;
+
+    public GroupRoomViewHolder(final View itemView) {
+        super(itemView);
+        ButterKnife.bind(this, itemView);
+    }
+
+    /**
+     * Refresh the holder layout
+     *
+     * @param context   the context
+     * @param session   the session
+     * @param groupRoom the group room
+     */
+    public void populateViews(final Context context, final MXSession session, final GroupRoom groupRoom) {
+        // sanity check
+        if (null == groupRoom) {
+            Log.e(LOG_TAG, "## populateViews() : null groupRoom");
+            return;
+        }
+
+        if (null == session) {
+            Log.e(LOG_TAG, "## populateViews() : null session");
+            return;
+        }
+
+        if (null == session.getDataHandler()) {
+            Log.e(LOG_TAG, "## populateViews() : null dataHandler");
+            return;
+        }
+
+        vContactName.setText(groupRoom.getDisplayName());
+        VectorUtils.loadUserAvatar(context, session, vContactAvatar, groupRoom.avatar_url, groupRoom.roomId, groupRoom.getDisplayName());
+
+        if (null != vContactDesc) {
+            vContactDesc.setText(groupRoom.topic);
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/adapters/GroupUserViewHolder.java b/vector/src/main/java/im/vector/adapters/GroupUserViewHolder.java
new file mode 100644
index 0000000000..7c737c2f72
--- /dev/null
+++ b/vector/src/main/java/im/vector/adapters/GroupUserViewHolder.java
@@ -0,0 +1,75 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.adapters;
+
+import android.content.Context;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.rest.model.group.GroupUser;
+import org.matrix.androidsdk.util.Log;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import im.vector.R;
+import im.vector.util.VectorUtils;
+
+public class GroupUserViewHolder extends RecyclerView.ViewHolder {
+    private static final String LOG_TAG = GroupUserViewHolder.class.getSimpleName();
+
+    @BindView(R.id.contact_avatar)
+    ImageView vContactAvatar;
+
+    @BindView(R.id.contact_name)
+    TextView vContactName;
+
+    public GroupUserViewHolder(final View itemView) {
+        super(itemView);
+        ButterKnife.bind(this, itemView);
+    }
+
+    /**
+     * Refresh the holder layout
+     *
+     * @param context   the context
+     * @param session   the session
+     * @param groupUser the user
+     */
+    public void populateViews(final Context context, final MXSession session, final GroupUser groupUser) {
+        // sanity check
+        if (null == groupUser) {
+            Log.e(LOG_TAG, "## populateViews() : null groupUser");
+            return;
+        }
+
+        if (null == session) {
+            Log.e(LOG_TAG, "## populateViews() : null session");
+            return;
+        }
+
+        if (null == session.getDataHandler()) {
+            Log.e(LOG_TAG, "## populateViews() : null dataHandler");
+            return;
+        }
+
+        vContactName.setText(groupUser.getDisplayname());
+        VectorUtils.loadUserAvatar(context, session, vContactAvatar, groupUser.avatarUrl, groupUser.userId, groupUser.getDisplayname());
+    }
+}
diff --git a/vector/src/main/java/im/vector/adapters/GroupViewHolder.java b/vector/src/main/java/im/vector/adapters/GroupViewHolder.java
new file mode 100644
index 0000000000..204687d239
--- /dev/null
+++ b/vector/src/main/java/im/vector/adapters/GroupViewHolder.java
@@ -0,0 +1,114 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.adapters;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.graphics.drawable.GradientDrawable;
+import android.support.annotation.Nullable;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.RecyclerView;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.rest.model.group.Group;
+import org.matrix.androidsdk.util.Log;
+
+import butterknife.BindView;
+import butterknife.ButterKnife;
+import im.vector.R;
+import im.vector.util.VectorUtils;
+
+public class GroupViewHolder extends RecyclerView.ViewHolder {
+    private static final String LOG_TAG = GroupViewHolder.class.getSimpleName();
+
+    @BindView(R.id.room_avatar)
+    ImageView vGroupAvatar;
+
+    @BindView(R.id.group_name)
+    TextView vGroupName;
+
+    @BindView(R.id.group_topic)
+    @Nullable
+    TextView vGroupTopic;
+
+    @BindView(R.id.group_members_count)
+    TextView vGroupMembersCount;
+
+    @BindView(R.id.group_more_action_click_area)
+    @Nullable
+    View vGroupMoreActionClickArea;
+
+    @BindView(R.id.group_more_action_anchor)
+    @Nullable
+    View vGroupMoreActionAnchor;
+
+    public GroupViewHolder(final View itemView) {
+        super(itemView);
+        ButterKnife.bind(this, itemView);
+    }
+
+    /**
+     * Refresh the holder layout
+     *
+     * @param context                 the context
+     * @param group                   the group
+     * @param isInvitation            true if it is an invitation
+     * @param moreGroupActionListener the more actions listener
+     */
+    public void populateViews(final Context context, final MXSession session, final Group group, final AbsAdapter.GroupInvitationListener invitationListener, final boolean isInvitation,
+                              final AbsAdapter.MoreGroupActionListener moreGroupActionListener) {
+        // sanity check
+        if (null == group) {
+            Log.e(LOG_TAG, "## populateViews() : null group");
+            return;
+        }
+
+        if (isInvitation) {
+            vGroupMembersCount.setText("!");
+            vGroupMembersCount.setTypeface(null, Typeface.BOLD);
+            GradientDrawable shape = new GradientDrawable();
+            shape.setShape(GradientDrawable.RECTANGLE);
+            shape.setCornerRadius(100);
+            shape.setColor(ContextCompat.getColor(context, R.color.vector_fuchsia_color));
+            vGroupMembersCount.setBackground(shape);
+            vGroupMembersCount.setVisibility(View.VISIBLE);
+        } else {
+            vGroupMembersCount.setVisibility(View.GONE);
+        }
+
+        vGroupName.setText(group.getDisplayName());
+        vGroupName.setTypeface(null, Typeface.NORMAL);
+
+        VectorUtils.loadGroupAvatar(context, session, vGroupAvatar, group);
+
+        vGroupTopic.setText(group.getShortDescription());
+
+        if (vGroupMoreActionClickArea != null && vGroupMoreActionAnchor != null) {
+            vGroupMoreActionClickArea.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (null != moreGroupActionListener) {
+                        moreGroupActionListener.onMoreActionClick(vGroupMoreActionAnchor, group);
+                    }
+                }
+            });
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/adapters/HomeRoomAdapter.java b/vector/src/main/java/im/vector/adapters/HomeRoomAdapter.java
index a28c892321..01805e2dba 100644
--- a/vector/src/main/java/im/vector/adapters/HomeRoomAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/HomeRoomAdapter.java
@@ -47,7 +47,7 @@ public class HomeRoomAdapter extends AbsFilterableAdapter<RoomViewHolder> {
      */
 
     public HomeRoomAdapter(final Context context, @LayoutRes final int layoutRes, final OnSelectRoomListener listener,
-                           final AbsAdapter.InvitationListener invitationListener, final AbsAdapter.MoreRoomActionListener moreActionListener) {
+                           final AbsAdapter.RoomInvitationListener invitationListener, final AbsAdapter.MoreRoomActionListener moreActionListener) {
         super(context, invitationListener, moreActionListener);
 
         mRooms = new ArrayList<>();
@@ -68,7 +68,7 @@ public HomeRoomAdapter(final Context context, @LayoutRes final int layoutRes, fi
     public RoomViewHolder onCreateViewHolder(ViewGroup viewGroup, int viewType) {
         final LayoutInflater layoutInflater = LayoutInflater.from(viewGroup.getContext());
         final View view = layoutInflater.inflate(mLayoutRes, viewGroup, false);
-        return mLayoutRes == R.layout.adapter_item_room_invite ? new InvitationViewHolder(view) : new RoomViewHolder(view);
+        return mLayoutRes == R.layout.adapter_item_room_invite ? new RoomInvitationViewHolder(view) : new RoomViewHolder(view);
     }
 
     @Override
@@ -77,8 +77,8 @@ public void onBindViewHolder(final RoomViewHolder viewHolder, int position) {
         if (position < mFilteredRooms.size()) {
             final Room room = mFilteredRooms.get(position);
             if (mLayoutRes == R.layout.adapter_item_room_invite) {
-                final InvitationViewHolder invitationViewHolder = (InvitationViewHolder) viewHolder;
-                invitationViewHolder.populateViews(mContext, mSession, room, mInvitationListener, mMoreActionListener);
+                final RoomInvitationViewHolder invitationViewHolder = (RoomInvitationViewHolder) viewHolder;
+                invitationViewHolder.populateViews(mContext, mSession, room, mRoomInvitationListener, mMoreActionListener);
             } else {
                 viewHolder.populateViews(mContext, mSession, room, mSession.getDirectChatRoomIdsList().contains(room.getRoomId()), false, mMoreActionListener);
                 viewHolder.itemView.setOnClickListener(new View.OnClickListener() {
diff --git a/vector/src/main/java/im/vector/adapters/KnownContactsAdapterSection.java b/vector/src/main/java/im/vector/adapters/KnownContactsAdapterSection.java
index ab8cd0ad20..7716ad3174 100644
--- a/vector/src/main/java/im/vector/adapters/KnownContactsAdapterSection.java
+++ b/vector/src/main/java/im/vector/adapters/KnownContactsAdapterSection.java
@@ -16,6 +16,7 @@
 
 package im.vector.adapters;
 
+import android.content.Context;
 import android.text.TextUtils;
 
 import java.util.Comparator;
@@ -27,9 +28,9 @@ class KnownContactsAdapterSection extends AdapterSection<ParticipantAdapterItem>
     private boolean mIsLimited;
     private String mCustomHeaderExtra;
 
-    public KnownContactsAdapterSection(String title, int headerSubViewResId, int contentResId, int headerViewType,
+    public KnownContactsAdapterSection(Context context, String title, int headerSubViewResId, int contentResId, int headerViewType,
                                        int contentViewType, List<ParticipantAdapterItem> items, Comparator<ParticipantAdapterItem> comparator) {
-        super(title, headerSubViewResId, contentResId, headerViewType, contentViewType, items, comparator);
+        super(context, title, headerSubViewResId, contentResId, headerViewType, contentViewType, items, comparator);
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/adapters/ParticipantAdapterItem.java b/vector/src/main/java/im/vector/adapters/ParticipantAdapterItem.java
index 4092e65f35..1a1e59f3f4 100755
--- a/vector/src/main/java/im/vector/adapters/ParticipantAdapterItem.java
+++ b/vector/src/main/java/im/vector/adapters/ParticipantAdapterItem.java
@@ -136,11 +136,11 @@ public ParticipantAdapterItem(String displayName, String avatarUrl, String userI
      */
     private void initSearchByPatternFields() {
         if (!TextUtils.isEmpty(mDisplayName)) {
-            mLowerCaseDisplayName = mDisplayName.toLowerCase();
+            mLowerCaseDisplayName = mDisplayName.toLowerCase(VectorApp.getApplicationLocale());
         }
 
         if (!TextUtils.isEmpty(mUserId)) {
-            mLowerCaseMatrixId = mUserId.toLowerCase();
+            mLowerCaseMatrixId = mUserId.toLowerCase(VectorApp.getApplicationLocale());
         }
     }
 
@@ -352,7 +352,7 @@ public boolean startsWith(String prefix) {
 
                 if (componentsArrays.length > 0) {
                     for (int i = 0; i < componentsArrays.length; i++) {
-                        mDisplayNameComponents.add(componentsArrays[i].trim().toLowerCase());
+                        mDisplayNameComponents.add(componentsArrays[i].trim().toLowerCase(VectorApp.getApplicationLocale()));
                     }
                 }
             }
@@ -446,7 +446,7 @@ public String getUniqueDisplayName(List<String> otherDisplayNames) {
 
         // for the matrix users, append the matrix id to see the difference
         if (null == mContact) {
-            String lowerCaseDisplayname = displayname.toLowerCase();
+            String lowerCaseDisplayname = displayname.toLowerCase(VectorApp.getApplicationLocale());
 
             // detect if the username is used by several users
             int pos = -1;
diff --git a/vector/src/main/java/im/vector/adapters/PeopleAdapter.java b/vector/src/main/java/im/vector/adapters/PeopleAdapter.java
index 15df1f567a..9559553bde 100644
--- a/vector/src/main/java/im/vector/adapters/PeopleAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/PeopleAdapter.java
@@ -40,6 +40,7 @@
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import im.vector.R;
+import im.vector.VectorApp;
 import im.vector.contacts.ContactsManager;
 import im.vector.util.RoomUtils;
 import im.vector.util.VectorUtils;
@@ -67,7 +68,7 @@ public class PeopleAdapter extends AbsAdapter {
      * *********************************************************************************************
      */
 
-    public PeopleAdapter(final Context context, final OnSelectItemListener listener, final InvitationListener invitationListener, final MoreRoomActionListener moreActionListener) {
+    public PeopleAdapter(final Context context, final OnSelectItemListener listener, final RoomInvitationListener invitationListener, final MoreRoomActionListener moreActionListener) {
         super(context, invitationListener, moreActionListener);
         mListener = listener;
 
@@ -75,15 +76,15 @@ public PeopleAdapter(final Context context, final OnSelectItemListener listener,
         mNoContactAccessPlaceholder = context.getString(R.string.no_contact_access_placeholder);
         mNoResultPlaceholder = context.getString(R.string.no_result_placeholder);
 
-        mDirectChatsSection = new AdapterSection<>(context.getString(R.string.direct_chats_header), -1,
+        mDirectChatsSection = new AdapterSection<>(context, context.getString(R.string.direct_chats_header), -1,
                 R.layout.adapter_item_room_view, TYPE_HEADER_DEFAULT, TYPE_ROOM, new ArrayList<Room>(), RoomUtils.getRoomsDateComparator(mSession, false));
         mDirectChatsSection.setEmptyViewPlaceholder(context.getString(R.string.no_conversation_placeholder), context.getString(R.string.no_result_placeholder));
 
-        mLocalContactsSection = new AdapterSection<>(context.getString(R.string.local_address_book_header),
+        mLocalContactsSection = new AdapterSection<>(context, context.getString(R.string.local_address_book_header),
                 R.layout.adapter_local_contacts_sticky_header_subview, R.layout.adapter_item_contact_view, TYPE_HEADER_LOCAL_CONTACTS, TYPE_CONTACT, new ArrayList<ParticipantAdapterItem>(), ParticipantAdapterItem.alphaComparator);
         mLocalContactsSection.setEmptyViewPlaceholder(!ContactsManager.getInstance().isContactBookAccessAllowed() ? mNoContactAccessPlaceholder : mNoResultPlaceholder);
 
-        mKnownContactsSection = new KnownContactsAdapterSection(context.getString(R.string.user_directory_header), -1,
+        mKnownContactsSection = new KnownContactsAdapterSection(context, context.getString(R.string.user_directory_header), -1,
                 R.layout.adapter_item_contact_view, TYPE_HEADER_DEFAULT, TYPE_CONTACT, new ArrayList<ParticipantAdapterItem>(), null);
         mKnownContactsSection.setEmptyViewPlaceholder(null, context.getString(R.string.no_result_placeholder));
         mKnownContactsSection.setIsHiddenWhenNoFilter(true);
@@ -139,7 +140,7 @@ protected void populateViewHolder(int viewType, RecyclerView.ViewHolder viewHold
             case TYPE_ROOM:
                 final RoomViewHolder roomViewHolder = (RoomViewHolder) viewHolder;
                 final Room room = (Room) getItemForPosition(position);
-                roomViewHolder.populateViews(mContext, mSession, room, true, false, mMoreActionListener);
+                roomViewHolder.populateViews(mContext, mSession, room, true, false, mMoreRoomActionListener);
                 roomViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
@@ -247,7 +248,7 @@ public void updateKnownContact(final User user) {
     private int filterLocalContacts(final String pattern) {
         if (!TextUtils.isEmpty(pattern)) {
             List<ParticipantAdapterItem> filteredLocalContacts = new ArrayList<>();
-            final String formattedPattern = pattern.toLowerCase().trim().toLowerCase();
+            final String formattedPattern = pattern.toLowerCase(VectorApp.getApplicationLocale()).trim();
 
             List<ParticipantAdapterItem> sectionItems = new ArrayList<>(mLocalContactsSection.getItems());
             for (final ParticipantAdapterItem item : sectionItems) {
@@ -282,7 +283,7 @@ public void filterAccountKnownContacts(final String pattern) {
     private int filterKnownContacts(final String pattern) {
         List<ParticipantAdapterItem> filteredKnownContacts = new ArrayList<>();
         if (!TextUtils.isEmpty(pattern)) {
-            final String formattedPattern = pattern.toLowerCase().trim().toLowerCase();
+            final String formattedPattern = pattern.trim().toLowerCase(VectorApp.getApplicationLocale());
             List<ParticipantAdapterItem> sectionItems = new ArrayList<>(mKnownContactsSection.getItems());
             for (final ParticipantAdapterItem item : sectionItems) {
                 if (item.startsWith(formattedPattern)) {
diff --git a/vector/src/main/java/im/vector/adapters/PublicRoomsAdapterSection.java b/vector/src/main/java/im/vector/adapters/PublicRoomsAdapterSection.java
index 6d09b8fa59..af1ede7ade 100644
--- a/vector/src/main/java/im/vector/adapters/PublicRoomsAdapterSection.java
+++ b/vector/src/main/java/im/vector/adapters/PublicRoomsAdapterSection.java
@@ -16,9 +16,10 @@
 
 package im.vector.adapters;
 
+import android.content.Context;
 import android.text.TextUtils;
 
-import org.matrix.androidsdk.rest.model.PublicRoom;
+import org.matrix.androidsdk.rest.model.publicroom.PublicRoom;
 
 import java.util.Comparator;
 import java.util.List;
@@ -32,9 +33,9 @@ class PublicRoomsAdapterSection extends AdapterSection<PublicRoom> {
     // tell if the
     private boolean mHasMoreResults;
 
-    public PublicRoomsAdapterSection(String title, int headerSubViewResId, int contentResId, int headerViewType,
+    public PublicRoomsAdapterSection(Context context, String title, int headerSubViewResId, int contentResId, int headerViewType,
                                      int contentViewType, List<PublicRoom> items, Comparator<PublicRoom> comparator) {
-        super(title, headerSubViewResId, contentResId, headerViewType, contentViewType, items, comparator);
+        super(context, title, headerSubViewResId, contentResId, headerViewType, contentViewType, items, comparator);
     }
 
     @Override
diff --git a/vector/src/main/java/im/vector/adapters/RoomAdapter.java b/vector/src/main/java/im/vector/adapters/RoomAdapter.java
index d83506beee..f89a9905ec 100644
--- a/vector/src/main/java/im/vector/adapters/RoomAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/RoomAdapter.java
@@ -30,7 +30,7 @@
 import android.widget.TextView;
 
 import org.matrix.androidsdk.data.Room;
-import org.matrix.androidsdk.rest.model.PublicRoom;
+import org.matrix.androidsdk.rest.model.publicroom.PublicRoom;
 import org.matrix.androidsdk.util.Log;
 
 import java.util.ArrayList;
@@ -61,16 +61,16 @@ public class RoomAdapter extends AbsAdapter {
      * *********************************************************************************************
      */
 
-    public RoomAdapter(final Context context, final OnSelectItemListener listener, final InvitationListener invitationListener, final MoreRoomActionListener moreActionListener) {
+    public RoomAdapter(final Context context, final OnSelectItemListener listener, final RoomInvitationListener invitationListener, final MoreRoomActionListener moreActionListener) {
         super(context, invitationListener, moreActionListener);
 
         mListener = listener;
 
-        mRoomsSection = new AdapterSection<>(context.getString(R.string.rooms_header), -1,
+        mRoomsSection = new AdapterSection<>(context, context.getString(R.string.rooms_header), -1,
                 R.layout.adapter_item_room_view, TYPE_HEADER_DEFAULT, TYPE_ROOM, new ArrayList<Room>(), RoomUtils.getRoomsDateComparator(mSession, false));
         mRoomsSection.setEmptyViewPlaceholder(context.getString(R.string.no_room_placeholder), context.getString(R.string.no_result_placeholder));
 
-        mPublicRoomsSection = new PublicRoomsAdapterSection(context.getString(R.string.rooms_directory_header),
+        mPublicRoomsSection = new PublicRoomsAdapterSection(context, context.getString(R.string.rooms_directory_header),
                 R.layout.adapter_public_room_sticky_header_subview, R.layout.adapter_item_public_room_view,
                 TYPE_HEADER_PUBLIC_ROOM, TYPE_PUBLIC_ROOM, new ArrayList<PublicRoom>(), null);
         mPublicRoomsSection.setEmptyViewPlaceholder(context.getString(R.string.no_public_room_placeholder), context.getString(R.string.no_result_placeholder));
@@ -125,7 +125,7 @@ protected void populateViewHolder(int viewType, RecyclerView.ViewHolder viewHold
             case TYPE_ROOM:
                 final RoomViewHolder roomViewHolder = (RoomViewHolder) viewHolder;
                 final Room room = (Room) getItemForPosition(position);
-                roomViewHolder.populateViews(mContext, mSession, room, false, false, mMoreActionListener);
+                roomViewHolder.populateViews(mContext, mSession, room, false, false, mMoreRoomActionListener);
                 roomViewHolder.itemView.setOnClickListener(new View.OnClickListener() {
                     @Override
                     public void onClick(View v) {
diff --git a/vector/src/main/java/im/vector/adapters/InvitationViewHolder.java b/vector/src/main/java/im/vector/adapters/RoomInvitationViewHolder.java
similarity index 87%
rename from vector/src/main/java/im/vector/adapters/InvitationViewHolder.java
rename to vector/src/main/java/im/vector/adapters/RoomInvitationViewHolder.java
index 881063a10e..8c33c0b530 100644
--- a/vector/src/main/java/im/vector/adapters/InvitationViewHolder.java
+++ b/vector/src/main/java/im/vector/adapters/RoomInvitationViewHolder.java
@@ -26,7 +26,7 @@
 import butterknife.BindView;
 import im.vector.R;
 
-public class InvitationViewHolder extends RoomViewHolder {
+public class RoomInvitationViewHolder extends RoomViewHolder {
 
     @BindView(R.id.recents_invite_reject_button)
     Button vRejectButton;
@@ -34,12 +34,12 @@ public class InvitationViewHolder extends RoomViewHolder {
     @BindView(R.id.recents_invite_preview_button)
     Button vPreViewButton;
 
-    InvitationViewHolder(View itemView) {
+    RoomInvitationViewHolder(View itemView) {
         super(itemView);
     }
 
     void populateViews(final Context context, final MXSession session, final Room room,
-                       final AbsAdapter.InvitationListener invitationListener, final AbsAdapter.MoreRoomActionListener moreRoomActionListener) {
+                       final AbsAdapter.RoomInvitationListener invitationListener, final AbsAdapter.MoreRoomActionListener moreRoomActionListener) {
         super.populateViews(context, session, room, room.isDirectChatInvitation(), true, moreRoomActionListener);
 
         vPreViewButton.setOnClickListener(new View.OnClickListener() {
diff --git a/vector/src/main/java/im/vector/adapters/RoomViewHolder.java b/vector/src/main/java/im/vector/adapters/RoomViewHolder.java
index 1fcce43981..0ab2432d94 100644
--- a/vector/src/main/java/im/vector/adapters/RoomViewHolder.java
+++ b/vector/src/main/java/im/vector/adapters/RoomViewHolder.java
@@ -40,7 +40,7 @@
 import im.vector.util.VectorUtils;
 
 public class RoomViewHolder extends RecyclerView.ViewHolder {
-    private static final String LOG_TAG = PeopleAdapter.class.getSimpleName();
+    private static final String LOG_TAG = RoomViewHolder.class.getSimpleName();
 
     @BindView(R.id.room_avatar)
     ImageView vRoomAvatar;
diff --git a/vector/src/main/java/im/vector/adapters/VectorGroupsListAdapter.java b/vector/src/main/java/im/vector/adapters/VectorGroupsListAdapter.java
new file mode 100644
index 0000000000..7d3afeed4f
--- /dev/null
+++ b/vector/src/main/java/im/vector/adapters/VectorGroupsListAdapter.java
@@ -0,0 +1,164 @@
+/*
+ * Copyright 2015 OpenMarket Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.adapters;
+
+import android.content.ClipData;
+import android.content.ClipboardManager;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Typeface;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ArrayAdapter;
+import android.widget.ImageView;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.rest.callback.ApiCallback;
+import org.matrix.androidsdk.rest.model.MatrixError;
+import org.matrix.androidsdk.rest.model.group.Group;
+import org.matrix.androidsdk.rest.model.group.GroupProfile;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import im.vector.R;
+import im.vector.activity.VectorGroupDetailsActivity;
+import im.vector.util.VectorUtils;
+
+/**
+ * An adapter which can display groups list
+ */
+public class VectorGroupsListAdapter extends ArrayAdapter<String> {
+
+    private final Context mContext;
+    private final LayoutInflater mLayoutInflater;
+    private final int mLayoutResourceId;
+    private final MXSession mSession;
+
+    private Map<String, Group> mGroupByGroupId = new HashMap<>();
+
+    public VectorGroupsListAdapter(Context context, int layoutResourceId, MXSession session) {
+        super(context, layoutResourceId);
+        mContext = context;
+        mLayoutResourceId = layoutResourceId;
+        mLayoutInflater = LayoutInflater.from(mContext);
+        mSession = session;
+    }
+
+    @Override
+    public View getView(int position, View convertView, ViewGroup parent) {
+        if (convertView == null) {
+            convertView = mLayoutInflater.inflate(mLayoutResourceId, parent, false);
+        }
+
+        final String groupId = getItem(position);
+        Group group = mGroupByGroupId.get(groupId);
+
+        if (null == group) {
+            group = mSession.getGroupsManager().getGroup(groupId);
+
+            if (null != group) {
+                mGroupByGroupId.put(groupId, group);
+            }
+        }
+
+        boolean needRefresh = (null == group);
+
+        if (null == group) {
+            group = new Group(groupId);
+        }
+
+        convertView.findViewById(R.id.group_members_count).setVisibility(View.GONE);
+
+        final TextView groupName = convertView.findViewById(R.id.group_name);
+        groupName.setTag(groupId);
+        groupName.setText(group.getDisplayName());
+        groupName.setTypeface(null, Typeface.NORMAL);
+
+        final ImageView groupAvatar = convertView.findViewById(R.id.room_avatar);
+        VectorUtils.loadGroupAvatar(mContext, mSession, groupAvatar, group);
+
+        final TextView groupTopic = convertView.findViewById(R.id.group_topic);
+        groupTopic.setText(group.getShortDescription());
+
+        convertView.findViewById(R.id.group_more_action_click_area).setVisibility(View.INVISIBLE);
+        convertView.findViewById(R.id.group_more_action_anchor).setVisibility(View.INVISIBLE);
+        convertView.findViewById(R.id.group_more_action_ic).setVisibility(View.INVISIBLE);
+
+        if (needRefresh) {
+            mSession.getGroupsManager().getGroupProfile(groupId, new ApiCallback<GroupProfile>() {
+                @Override
+                public void onSuccess(GroupProfile groupProfile) {
+                    if (TextUtils.equals((String) groupName.getTag(), groupId)) {
+                        Group updatedGroup = mGroupByGroupId.get(groupId);
+
+                        if (null == updatedGroup) {
+                            updatedGroup = new Group(groupId);
+                            updatedGroup.setGroupProfile(groupProfile);
+                            mGroupByGroupId.put(groupId, updatedGroup);
+                        }
+
+                        groupName.setText(updatedGroup.getDisplayName());
+                        VectorUtils.loadGroupAvatar(mContext, mSession, groupAvatar, updatedGroup);
+                        groupTopic.setText(updatedGroup.getShortDescription());
+                    }
+                }
+
+                @Override
+                public void onNetworkError(Exception e) {
+                }
+
+                @Override
+                public void onMatrixError(MatrixError e) {
+                }
+
+                @Override
+                public void onUnexpectedError(Exception e) {
+                }
+            });
+        }
+
+        convertView.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Intent intent = new Intent(mContext, VectorGroupDetailsActivity.class);
+                intent.putExtra(VectorGroupDetailsActivity.EXTRA_GROUP_ID, groupId);
+                intent.putExtra(VectorGroupDetailsActivity.EXTRA_MATRIX_ID, mSession.getCredentials().userId);
+                mContext.startActivity(intent);
+            }
+        });
+
+
+        convertView.setOnLongClickListener(new View.OnLongClickListener() {
+            @Override
+            public boolean onLongClick(View v) {
+                ClipboardManager clipboard = (ClipboardManager) mContext.getSystemService(Context.CLIPBOARD_SERVICE);
+                ClipData clip = ClipData.newPlainText("", groupId);
+                clipboard.setPrimaryClip(clip);
+
+                Toast.makeText(mContext, mContext.getResources().getString(R.string.copied_to_clipboard), Toast.LENGTH_SHORT).show();
+                return true;
+            }
+        });
+
+        return convertView;
+    }
+}
diff --git a/vector/src/main/java/im/vector/adapters/VectorMediasViewerAdapter.java b/vector/src/main/java/im/vector/adapters/VectorMediasViewerAdapter.java
index 7e3cc1d8ac..abd648ddbf 100755
--- a/vector/src/main/java/im/vector/adapters/VectorMediasViewerAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/VectorMediasViewerAdapter.java
@@ -30,6 +30,7 @@
 import android.text.TextUtils;
 
 import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
+import org.matrix.androidsdk.rest.model.crypto.EncryptedFileInfo;
 import org.matrix.androidsdk.util.Log;
 
 import android.view.LayoutInflater;
@@ -47,7 +48,7 @@
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.listeners.MXMediaDownloadListener;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.message.Message;
 import org.matrix.androidsdk.util.ImageUtils;
 import org.matrix.androidsdk.util.JsonUtils;
 import org.matrix.androidsdk.view.PieFractionView;
@@ -112,6 +113,8 @@ public void setPrimaryItem(ViewGroup container, final int position, Object objec
             final View view = (View) object;
             mLatestPrimaryView = view;
 
+            view.findViewById(R.id.media_download_failed).setVisibility(View.GONE);
+
             view.post(new Runnable() {
                 @Override
                 public void run() {
@@ -125,13 +128,22 @@ public void run() {
                     if (mHighResMediaIndex.indexOf(position) < 0) {
                         downloadHighResMedia(view, position);
                     } else if (position == mAutoPlayItemAt) {
-                        SlidableMediaInfo mediaInfo = mMediasMessagesList.get(position);
+                        final SlidableMediaInfo mediaInfo = mMediasMessagesList.get(position);
 
                         if (mediaInfo.mMessageType.equals(Message.MSGTYPE_VIDEO)) {
                             final VideoView videoView = view.findViewById(R.id.media_slider_videoview);
-                            playVideo(view, videoView, mediaInfo.mMediaUrl, mediaInfo.mMimeType);
-                        }
 
+                            if (mMediasCache.isMediaCached(mediaInfo.mMediaUrl, mediaInfo.mMimeType)) {
+                                mMediasCache.createTmpMediaFile(mediaInfo.mMediaUrl, mediaInfo.mMimeType, mediaInfo.mEncryptedFileInfo, new SimpleApiCallback<File>() {
+                                    @Override
+                                    public void onSuccess(File file) {
+                                        if (null != file) {
+                                            playVideo(view, videoView, file, mediaInfo.mMimeType);
+                                        }
+                                    }
+                                });
+                            }
+                        }
                         mAutoPlayItemAt = -1;
                     }
                 }
@@ -189,21 +201,28 @@ private void downloadVideo(final View view, final int position, boolean force) {
         final VideoView videoView = view.findViewById(R.id.media_slider_videoview);
         final ImageView thumbView = view.findViewById(R.id.media_slider_video_thumbnail);
         final PieFractionView pieFractionView = view.findViewById(R.id.media_slider_piechart);
+        final View downloadFailedView = view.findViewById(R.id.media_download_failed);
 
         final SlidableMediaInfo mediaInfo = mMediasMessagesList.get(position);
         final String loadingUri = mediaInfo.mMediaUrl;
         final String thumbnailUrl = mediaInfo.mThumbnailUrl;
 
         // check if the media has been downloaded
-        File file = mMediasCache.mediaCacheFile(loadingUri, mediaInfo.mMimeType);
-        if (null != file) {
-            mHighResMediaIndex.add(position);
-            loadVideo(position, view, thumbnailUrl, Uri.fromFile(file).toString(), mediaInfo.mMimeType);
+        if (mMediasCache.isMediaCached(loadingUri, mediaInfo.mMimeType)) {
+            mMediasCache.createTmpMediaFile(loadingUri, mediaInfo.mMimeType, mediaInfo.mEncryptedFileInfo, new SimpleApiCallback<File>() {
+                @Override
+                public void onSuccess(File file) {
+                    if (null != file) {
+                        mHighResMediaIndex.add(position);
+                        loadVideo(position, view, thumbnailUrl, Uri.fromFile(file).toString(), mediaInfo.mMimeType, mediaInfo.mEncryptedFileInfo);
 
-            if (position == mAutoPlayItemAt) {
-                playVideo(view, videoView, mediaInfo.mMediaUrl, mediaInfo.mMimeType);
-            }
-            mAutoPlayItemAt = -1;
+                        if (position == mAutoPlayItemAt) {
+                            playVideo(view, videoView, file, mediaInfo.mMimeType);
+                        }
+                        mAutoPlayItemAt = -1;
+                    }
+                }
+            });
             return;
         }
 
@@ -230,6 +249,8 @@ public void onDownloadError(String downloadId, JsonElement jsonElement) {
                     if ((null != error) && error.isSupportedErrorCode()) {
                         Toast.makeText(VectorMediasViewerAdapter.this.mContext, error.getLocalizedMessage(), Toast.LENGTH_LONG).show();
                     }
+
+                    downloadFailedView.setVisibility(View.VISIBLE);
                 }
 
                 @Override
@@ -244,25 +265,34 @@ public void onDownloadComplete(String aDownloadId) {
                     if (aDownloadId.equals(pieFractionView.getTag())) {
                         pieFractionView.setVisibility(View.GONE);
 
-                        final File mediaFile = mMediasCache.mediaCacheFile(loadingUri, mediaInfo.mMimeType);
-
-                        if (null != mediaFile) {
-                            mHighResMediaIndex.add(position);
-
-                            Uri uri = Uri.fromFile(mediaFile);
-                            final String newHighResUri = uri.toString();
 
-                            thumbView.post(new Runnable() {
+                        // check if the media has been downloaded
+                        if (mMediasCache.isMediaCached(loadingUri, mediaInfo.mMimeType)) {
+                            mMediasCache.createTmpMediaFile(loadingUri, mediaInfo.mMimeType, mediaInfo.mEncryptedFileInfo, new SimpleApiCallback<File>() {
                                 @Override
-                                public void run() {
-                                    loadVideo(position, view, thumbnailUrl, newHighResUri, mediaInfo.mMimeType);
-
-                                    if (position == mAutoPlayItemAt) {
-                                        playVideo(view, videoView, mediaInfo.mMediaUrl, mediaInfo.mMimeType);
-                                        mAutoPlayItemAt = -1;
+                                public void onSuccess(final File mediaFile) {
+                                    if (null != mediaFile) {
+                                        mHighResMediaIndex.add(position);
+
+                                        Uri uri = Uri.fromFile(mediaFile);
+                                        final String newHighResUri = uri.toString();
+
+                                        thumbView.post(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                loadVideo(position, view, thumbnailUrl, newHighResUri, mediaInfo.mMimeType, mediaInfo.mEncryptedFileInfo);
+
+                                                if (position == mAutoPlayItemAt) {
+                                                    playVideo(view, videoView, mediaFile, mediaInfo.mMimeType);
+                                                    mAutoPlayItemAt = -1;
+                                                }
+                                            }
+                                        });
                                     }
                                 }
                             });
+                        } else {
+                            downloadFailedView.setVisibility(View.VISIBLE);
                         }
                     }
                 }
@@ -279,6 +309,8 @@ public void run() {
     private void downloadHighResPict(final View view, final int position) {
         final WebView webView = view.findViewById(R.id.media_slider_image_webview);
         final PieFractionView pieFractionView = view.findViewById(R.id.media_slider_piechart);
+        final View downloadFailedView = view.findViewById(R.id.media_download_failed);
+
         final SlidableMediaInfo imageInfo = mMediasMessagesList.get(position);
         final String viewportContent = "width=640";
         final String loadingUri = imageInfo.mMediaUrl;
@@ -291,11 +323,17 @@ private void downloadHighResPict(final View view, final int position) {
             pieFractionView.setFraction(mMediasCache.getProgressValueForDownloadId(downloadId));
             mMediasCache.addDownloadListener(downloadId, new MXMediaDownloadListener() {
                 @Override
-                public void onDownloadError(String downloadId, JsonElement jsonElement) {
-                    MatrixError error = JsonUtils.toMatrixError(jsonElement);
+                public void onDownloadError(String aDownloadId, JsonElement jsonElement) {
+                    if (aDownloadId.equals(downloadId)) {
+                        pieFractionView.setVisibility(View.GONE);
 
-                    if ((null != error) && error.isSupportedErrorCode()) {
-                        Toast.makeText(VectorMediasViewerAdapter.this.mContext, error.getLocalizedMessage(), Toast.LENGTH_LONG).show();
+                        MatrixError error = JsonUtils.toMatrixError(jsonElement);
+
+                        if (null != error) {
+                            Toast.makeText(VectorMediasViewerAdapter.this.mContext, error.getLocalizedMessage(), Toast.LENGTH_LONG).show();
+                        }
+
+                        downloadFailedView.setVisibility(View.VISIBLE);
                     }
                 }
 
@@ -310,22 +348,30 @@ public void onDownloadProgress(String aDownloadId, DownloadStats stats) {
                 public void onDownloadComplete(String aDownloadId) {
                     if (aDownloadId.equals(downloadId)) {
                         pieFractionView.setVisibility(View.GONE);
-                        final File mediaFile = mMediasCache.mediaCacheFile(loadingUri, imageInfo.mMimeType);
 
-                        if (null != mediaFile) {
-                            mHighResMediaIndex.add(position);
-
-                            Uri uri = Uri.fromFile(mediaFile);
-                            final String newHighResUri = uri.toString();
-
-                            webView.post(new Runnable() {
+                        if (mMediasCache.isMediaCached(loadingUri, imageInfo.mMimeType)) {
+                            mMediasCache.createTmpMediaFile(loadingUri, imageInfo.mMimeType, imageInfo.mEncryptedFileInfo, new SimpleApiCallback<File>() {
                                 @Override
-                                public void run() {
-                                    Uri mediaUri = Uri.parse(newHighResUri);
-                                    // refresh the UI
-                                    loadImage(webView, mediaUri, viewportContent, computeCss(newHighResUri, VectorMediasViewerAdapter.this.mMaxImageWidth, VectorMediasViewerAdapter.this.mMaxImageHeight, imageInfo.mRotationAngle));
+                                public void onSuccess(File mediaFile) {
+                                    if (null != mediaFile) {
+                                        mHighResMediaIndex.add(position);
+
+                                        Uri uri = Uri.fromFile(mediaFile);
+                                        final String newHighResUri = uri.toString();
+
+                                        webView.post(new Runnable() {
+                                            @Override
+                                            public void run() {
+                                                Uri mediaUri = Uri.parse(newHighResUri);
+                                                // refresh the UI
+                                                loadImage(webView, mediaUri, viewportContent, computeCss(newHighResUri, VectorMediasViewerAdapter.this.mMaxImageWidth, VectorMediasViewerAdapter.this.mMaxImageHeight, imageInfo.mRotationAngle));
+                                            }
+                                        });
+                                    }
                                 }
                             });
+                        } else {
+                            downloadFailedView.setVisibility(View.VISIBLE);
                         }
                     }
                 }
@@ -339,13 +385,15 @@ public boolean isViewFromObject(View view, Object object) {
     }
 
     @Override
-    public Object instantiateItem(ViewGroup container, final int position) {
-        View view = mLayoutInflater.inflate(R.layout.adapter_vector_medias_viewer, null, false);
+    public Object instantiateItem(final ViewGroup container, final int position) {
+        final View view = mLayoutInflater.inflate(R.layout.adapter_vector_medias_viewer, null, false);
 
         // hide the pie chart
         final PieFractionView pieFractionView = view.findViewById(R.id.media_slider_piechart);
         pieFractionView.setVisibility(View.GONE);
 
+        view.findViewById(R.id.media_download_failed).setVisibility(View.GONE);
+
         final WebView imageWebView = view.findViewById(R.id.media_slider_image_webview);
         final View videoLayout = view.findViewById(R.id.media_slider_videolayout);
         final ImageView thumbView = view.findViewById(R.id.media_slider_video_thumbnail);
@@ -393,33 +441,42 @@ public boolean onLongClick(View v) {
             }
 
             final String mimeType = mediaInfo.mMimeType;
-            File mediaFile = mMediasCache.mediaCacheFile(mediaUrl, mimeType);
+            int width = -1;
+            int height = -1;
 
             // is the high picture already downloaded ?
-            if (null != mediaFile) {
+            if (mMediasCache.isMediaCached(mediaUrl, mimeType)) {
                 if (mHighResMediaIndex.indexOf(position) < 0) {
                     mHighResMediaIndex.add(position);
                 }
             } else {
-                // try to retrieve the thumbnail
-                mediaFile = mMediasCache.mediaCacheFile(mediaUrl, mMaxImageWidth, mMaxImageHeight, null);
+                width = mMaxImageWidth;
+                height = mMaxImageHeight;
             }
 
             // the thumbnail is not yet downloaded
-            if (null == mediaFile) {
+            if (!mMediasCache.isMediaCached(mediaUrl, width, height, mimeType)) {
                 // display nothing
                 container.addView(view, 0);
                 return view;
             }
 
-            String mediaUri = "file://" + mediaFile.getPath();
+            mMediasCache.createTmpMediaFile(mediaUrl, width, height, mimeType, mediaInfo.mEncryptedFileInfo, new SimpleApiCallback<File>() {
+                @Override
+                public void onSuccess(File mediaFile) {
+                    if (null != mediaFile) {
+                        String mediaUri = "file://" + mediaFile.getPath();
+
+                        String css = computeCss(mediaUri, mMaxImageWidth, mMaxImageHeight, rotationAngle);
+                        final String viewportContent = "width=640";
+                        loadImage(imageWebView, Uri.parse(mediaUri), viewportContent, css);
+                        container.addView(view, 0);
+                    }
+                }
+            });
 
-            String css = computeCss(mediaUri, mMaxImageWidth, mMaxImageHeight, rotationAngle);
-            final String viewportContent = "width=640";
-            loadImage(imageWebView, Uri.parse(mediaUri), viewportContent, css);
-            container.addView(view, 0);
         } else {
-            loadVideo(position, view, mediaInfo.mThumbnailUrl, mediaUrl, mediaInfo.mMimeType);
+            loadVideo(position, view, mediaInfo.mThumbnailUrl, mediaUrl, mediaInfo.mMimeType, mediaInfo.mEncryptedFileInfo);
             container.addView(view, 0);
         }
 
@@ -494,15 +551,11 @@ public void stopPlayingVideo() {
      *
      * @param pageView      the pageView
      * @param videoView     the video view
-     * @param videoUrl      the video Url
+     * @param videoFile     the video file
      * @param videoMimeType the video mime type
      */
-    private void playVideo(View pageView, VideoView videoView, String videoUrl, String videoMimeType) {
-        // init the video view only if there is a valid file
-        // check if the media has been downloaded
-        File srcFile = mMediasCache.mediaCacheFile(videoUrl, videoMimeType);
-
-        if ((null != srcFile) && srcFile.exists()) {
+    private void playVideo(View pageView, VideoView videoView, File videoFile, String videoMimeType) {
+        if ((null != videoFile) && videoFile.exists()) {
             try {
                 stopPlayingVideo();
                 String extension = MimeTypeMap.getSingleton().getExtensionFromMimeType(videoMimeType);
@@ -525,7 +578,7 @@ private void playVideo(View pageView, VideoView videoView, String videoUrl, Stri
                     if (!dstFile.exists()) {
                         dstFile.createNewFile();
 
-                        inputStream = new FileInputStream(srcFile);
+                        inputStream = new FileInputStream(videoFile);
                         outputStream = new FileOutputStream(dstFile);
 
                         byte[] buffer = new byte[1024 * 10];
@@ -567,16 +620,21 @@ private void playVideo(View pageView, VideoView videoView, String videoUrl, Stri
      */
     private void downloadMedia() {
         final SlidableMediaInfo mediaInfo = mMediasMessagesList.get(mLatestPrimaryItemPosition);
-        File file = mMediasCache.mediaCacheFile(mediaInfo.mMediaUrl, mediaInfo.mMimeType);
 
-        if (null != file) {
-            CommonActivityUtils.saveMediaIntoDownloads(mContext, file, null, mediaInfo.mMimeType, new SimpleApiCallback<String>() {
+        if (mMediasCache.isMediaCached(mediaInfo.mMediaUrl, mediaInfo.mMimeType)) {
+            mMediasCache.createTmpMediaFile(mediaInfo.mMediaUrl, mediaInfo.mMimeType, mediaInfo.mEncryptedFileInfo, new SimpleApiCallback<File>() {
                 @Override
-                public void onSuccess(String path) {
-                    Toast.makeText(mContext, mContext.getText(R.string.media_slider_saved), Toast.LENGTH_LONG).show();
+                public void onSuccess(File file) {
+                    if (null != file) {
+                        CommonActivityUtils.saveMediaIntoDownloads(mContext, file, null, mediaInfo.mMimeType, new SimpleApiCallback<String>() {
+                            @Override
+                            public void onSuccess(String path) {
+                                Toast.makeText(mContext, mContext.getText(R.string.media_slider_saved), Toast.LENGTH_LONG).show();
+                            }
+                        });
+                    }
                 }
             });
-
         } else {
             downloadVideo(mLatestPrimaryView, mLatestPrimaryItemPosition, true);
             final String downloadId = mMediasCache.downloadMedia(mContext, mSession.getHomeServerConfig(), mediaInfo.mMediaUrl, mediaInfo.mMimeType, mediaInfo.mEncryptedFileInfo);
@@ -595,13 +653,18 @@ public void onDownloadError(String downloadId, JsonElement jsonElement) {
                     @Override
                     public void onDownloadComplete(String aDownloadId) {
                         if (aDownloadId.equals(downloadId)) {
-                            File file = mMediasCache.mediaCacheFile(mediaInfo.mMediaUrl, mediaInfo.mMimeType);
-                            if (null != file) {
-
-                                CommonActivityUtils.saveMediaIntoDownloads(mContext, file, null, mediaInfo.mMimeType, new SimpleApiCallback<String>() {
+                            if (mMediasCache.isMediaCached(mediaInfo.mMediaUrl, mediaInfo.mMimeType)) {
+                                mMediasCache.createTmpMediaFile(mediaInfo.mMediaUrl, mediaInfo.mMimeType, mediaInfo.mEncryptedFileInfo, new SimpleApiCallback<File>() {
                                     @Override
-                                    public void onSuccess(String path) {
-                                        Toast.makeText(mContext, mContext.getText(R.string.media_slider_saved), Toast.LENGTH_LONG).show();
+                                    public void onSuccess(File file) {
+                                        if (null != file) {
+                                            CommonActivityUtils.saveMediaIntoDownloads(mContext, file, null, mediaInfo.mMimeType, new SimpleApiCallback<String>() {
+                                                @Override
+                                                public void onSuccess(String path) {
+                                                    Toast.makeText(mContext, mContext.getText(R.string.media_slider_saved), Toast.LENGTH_LONG).show();
+                                                }
+                                            });
+                                        }
                                     }
                                 });
                             }
@@ -644,7 +707,7 @@ public void onClick(DialogInterface dialog, int which) {
      * @param videoUrl      the video Url
      * @param videoMimeType the video mime type
      */
-    private void loadVideo(final int position, final View view, final String thumbnailUrl, final String videoUrl, final String videoMimeType) {
+    private void loadVideo(final int position, final View view, final String thumbnailUrl, final String videoUrl, final String videoMimeType, final EncryptedFileInfo encryptedFileInfo) {
         final VideoView videoView = view.findViewById(R.id.media_slider_videoview);
         final ImageView thumbView = view.findViewById(R.id.media_slider_video_thumbnail);
         final ImageView playView = view.findViewById(R.id.media_slider_video_playView);
@@ -684,12 +747,17 @@ public boolean onError(MediaPlayer mp, int what, int extra) {
         playView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
-                // init the video view only if there is a valid file
-                // check if the media has been downloaded
-                File srcFile = mMediasCache.mediaCacheFile(videoUrl, videoMimeType);
+                if (mMediasCache.isMediaCached(videoUrl, videoMimeType)) {
+
+                    mMediasCache.createTmpMediaFile(videoUrl, videoMimeType, encryptedFileInfo, new SimpleApiCallback<File>() {
+                        @Override
+                        public void onSuccess(File file) {
+                            if (null != file) {
+                                playVideo(view, videoView, file, videoMimeType);
+                            }
+                        }
+                    });
 
-                if (null != srcFile) {
-                    playVideo(view, videoView, videoUrl, videoMimeType);
                 } else {
                     mAutoPlayItemAt = position;
                     downloadVideo(view, position);
diff --git a/vector/src/main/java/im/vector/adapters/VectorMemberDetailsAdapter.java b/vector/src/main/java/im/vector/adapters/VectorMemberDetailsAdapter.java
index 9d90f84a74..a6ad8b55c6 100644
--- a/vector/src/main/java/im/vector/adapters/VectorMemberDetailsAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/VectorMemberDetailsAdapter.java
@@ -18,6 +18,7 @@
 package im.vector.adapters;
 
 import android.content.Context;
+import android.content.DialogInterface;
 import android.support.v4.content.ContextCompat;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -409,7 +410,34 @@ public void onClick(View view) {
                 @Override
                 public void onClick(View view) {
                     if (null != mActionListener) {
-                        mActionListener.performItemAction(currentItem.mActionType);
+                        if (VectorMemberDetailsActivity.ITEM_ACTION_KICK == currentItem.mActionType
+                                || VectorMemberDetailsActivity.ITEM_ACTION_BAN == currentItem.mActionType) {
+                            android.support.v7.app.AlertDialog.Builder builder = new android.support.v7.app.AlertDialog.Builder(view.getContext());
+                            builder.setTitle(R.string.dialog_title_confirmation);
+
+                            if (VectorMemberDetailsActivity.ITEM_ACTION_KICK == currentItem.mActionType) {
+                                builder.setMessage(view.getContext().getString(R.string.room_participants_kick_prompt_msg));
+                            } else {
+                                builder.setMessage(view.getContext().getString(R.string.room_participants_ban_prompt_msg));
+                            }
+                            builder.setPositiveButton(R.string.ok, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    mActionListener.performItemAction(currentItem.mActionType);
+                                }
+                            });
+
+                            builder.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                                @Override
+                                public void onClick(DialogInterface dialog, int which) {
+                                    // nothing to do
+                                }
+                            });
+
+                            builder.show();
+                        } else {
+                            mActionListener.performItemAction(currentItem.mActionType);
+                        }
                     }
                 }
             });
diff --git a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java
index fefd9b8f39..e47bd99010 100755
--- a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapter.java
@@ -44,6 +44,7 @@
 import android.view.animation.Animation;
 import android.view.animation.AnimationUtils;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.PopupMenu;
 import android.widget.TextView;
 
@@ -54,12 +55,13 @@
 import org.matrix.androidsdk.data.Room;
 import org.matrix.androidsdk.data.RoomState;
 import org.matrix.androidsdk.db.MXMediasCache;
-import org.matrix.androidsdk.rest.model.EncryptedEventContent;
+import org.matrix.androidsdk.rest.model.URLPreview;
+import org.matrix.androidsdk.rest.model.crypto.EncryptedEventContent;
 import org.matrix.androidsdk.rest.model.Event;
 import org.matrix.androidsdk.rest.model.EventContent;
-import org.matrix.androidsdk.rest.model.FileMessage;
-import org.matrix.androidsdk.rest.model.ImageMessage;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.message.FileMessage;
+import org.matrix.androidsdk.rest.model.message.ImageMessage;
+import org.matrix.androidsdk.rest.model.message.Message;
 import org.matrix.androidsdk.rest.model.PowerLevels;
 import org.matrix.androidsdk.rest.model.RoomMember;
 import org.matrix.androidsdk.util.EventDisplay;
@@ -78,6 +80,7 @@
 import java.util.HashSet;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -92,6 +95,8 @@
 import im.vector.util.PreferencesManager;
 import im.vector.util.RiotEventDisplay;
 import im.vector.util.ThemeUtils;
+import im.vector.util.VectorImageGetter;
+import im.vector.util.VectorMarkdownParser;
 import im.vector.widgets.WidgetsManager;
 
 /**
@@ -142,7 +147,8 @@ public class VectorMessagesAdapter extends AbstractMessagesAdapter {
     static final int ROW_TYPE_HIDDEN = 7;
     static final int ROW_TYPE_ROOM_MEMBER = 8;
     static final int ROW_TYPE_EMOJI = 9;
-    static final int NUM_ROW_TYPES = 10;
+    static final int ROW_TYPE_CODE = 10;
+    static final int NUM_ROW_TYPES = 11;
 
     final Context mContext;
     private final HashMap<Integer, Integer> mRowTypeToLayoutId = new HashMap<>();
@@ -212,6 +218,7 @@ public VectorMessagesAdapter(MXSession session, Context context, MXMediasCache m
                 R.layout.adapter_item_vector_message_image_video,
                 R.layout.adapter_item_vector_message_merge,
                 R.layout.adapter_item_vector_message_emoji,
+                R.layout.adapter_item_vector_message_code,
                 mediasCache);
     }
 
@@ -240,6 +247,7 @@ public VectorMessagesAdapter(MXSession session, Context context, MXMediasCache m
                           int videoResLayoutId,
                           int mergeResLayoutId,
                           int emojiResLayoutId,
+                          int codeResLayoutId,
                           MXMediasCache mediasCache) {
         super(context, 0);
         mContext = context;
@@ -253,6 +261,7 @@ public VectorMessagesAdapter(MXSession session, Context context, MXMediasCache m
         mRowTypeToLayoutId.put(ROW_TYPE_MERGE, mergeResLayoutId);
         mRowTypeToLayoutId.put(ROW_TYPE_HIDDEN, R.layout.adapter_item_vector_hidden_message);
         mRowTypeToLayoutId.put(ROW_TYPE_EMOJI, emojiResLayoutId);
+        mRowTypeToLayoutId.put(ROW_TYPE_CODE, codeResLayoutId);
 
         mMediasCache = mediasCache;
         mLayoutInflater = LayoutInflater.from(mContext);
@@ -286,7 +295,7 @@ public VectorMessagesAdapter(MXSession session, Context context, MXMediasCache m
 
         // helpers
         mMediasHelper = new VectorMessagesAdapterMediasHelper(context, mSession, mMaxImageWidth, mMaxImageHeight, mNotSentMessageTextColor, mDefaultMessageTextColor);
-        mHelper = new VectorMessagesAdapterHelper(context, mSession);
+        mHelper = new VectorMessagesAdapterHelper(context, mSession, this);
 
         mLocale = VectorApp.getApplicationLocale();
 
@@ -311,13 +320,7 @@ public VectorMessagesAdapter(MXSession session, Context context, MXMediasCache m
     @SuppressWarnings("deprecation")
     private void getScreenSize(Point size) {
         WindowManager wm = (WindowManager) getContext().getSystemService(Context.WINDOW_SERVICE);
-        Display display = wm.getDefaultDisplay();
-
-        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB_MR2) {
-            display.getSize(size);
-        } else {
-            size.set(display.getWidth(), display.getHeight());
-        }
+        wm.getDefaultDisplay().getSize(size);
     }
 
     /**
@@ -425,11 +428,11 @@ public void add(MessageRow row) {
 
     @Override
     public void add(MessageRow row, boolean refresh) {
-        // ensure that notifyDataSetChanged is not called
-        // it seems that setNotifyOnChange is reinitialized to true;
-        setNotifyOnChange(false);
-
         if (isSupportedRow(row)) {
+            // ensure that notifyDataSetChanged is not called
+            // it seems that setNotifyOnChange is reinitialized to true;
+            setNotifyOnChange(false);
+
             if (mIsSearchMode) {
                 mLiveMessagesRowList.add(row);
             } else {
@@ -446,8 +449,6 @@ public void add(MessageRow row, boolean refresh) {
             } else {
                 setNotifyOnChange(true);
             }
-        } else {
-            setNotifyOnChange(true);
         }
     }
 
@@ -667,8 +668,19 @@ public View getView(int position, View convertView, ViewGroup parent) {
         final View inflatedView;
         int viewType = getItemViewType(position);
 
+        // when the user scrolls quickly
+        // it seems that the recycled view does not have the right layout.
+        // check it
+        if (null != convertView) {
+            if (viewType != (int)convertView.getTag()) {
+                Log.e(LOG_TAG, "## getView() : invalid view type : got " + convertView.getTag() + " instead of " + viewType);
+                convertView = null;
+            }
+        }
+
         switch (viewType) {
             case ROW_TYPE_EMOJI:
+            case ROW_TYPE_CODE:
             case ROW_TYPE_TEXT:
                 inflatedView = getTextView(viewType, position, convertView, parent);
                 break;
@@ -702,6 +714,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
         if (null != inflatedView) {
             inflatedView.setBackgroundColor(Color.TRANSPARENT);
+            inflatedView.setTag(viewType);
         }
 
         displayE2eIcon(inflatedView, position);
@@ -942,6 +955,8 @@ private int getItemViewType(Event event) {
             if (Message.MSGTYPE_TEXT.equals(msgType)) {
                 if (containsOnlyEmojis(message.body)) {
                     viewType = ROW_TYPE_EMOJI;
+                } else if (!TextUtils.isEmpty(message.formatted_body) && mHelper.containsFencedCodeBlocks(message)) {
+                    viewType = ROW_TYPE_CODE;
                 } else {
                     viewType = ROW_TYPE_TEXT;
                 }
@@ -1090,7 +1105,7 @@ public boolean onLongClick(View v) {
         }
 
         // selection mode
-        manageSelectionMode(convertView, event);
+        manageSelectionMode(convertView, event, msgType);
 
         // read marker
         setReadMarker(convertView, row, isMergedView, avatarLayoutView, bodyLayoutView);
@@ -1125,17 +1140,29 @@ private View getTextView(final int viewType, final int position, View convertVie
             CharSequence textualDisplay = display.getTextualDisplay();
 
             SpannableString body = new SpannableString((null == textualDisplay) ? "" : textualDisplay);
-            final TextView bodyTextView = convertView.findViewById(R.id.messagesAdapter_body);
-
-            // cannot refresh it
-            if (null == bodyTextView) {
-                Log.e(LOG_TAG, "getTextView : invalid layout");
-                return convertView;
-            }
 
             boolean shouldHighlighted = (null != mVectorMessagesAdapterEventsListener) && mVectorMessagesAdapterEventsListener.shouldHighlightEvent(event);
 
-            highlightPattern(bodyTextView, body, TextUtils.equals(Message.FORMAT_MATRIX_HTML, message.format) ? mHelper.getSanitisedHtml(message.formatted_body) : null, mPattern, shouldHighlighted);
+            final List<TextView> textViews;
+
+            if (ROW_TYPE_CODE == viewType) {
+                textViews = populateRowTypeCode(message, convertView, shouldHighlighted);
+            } else {
+                final TextView bodyTextView = convertView.findViewById(R.id.messagesAdapter_body);
+
+                // cannot refresh it
+                if (null == bodyTextView) {
+                    Log.e(LOG_TAG, "getTextView : invalid layout");
+                    return convertView;
+                }
+
+                highlightPattern(bodyTextView, body,
+                        TextUtils.equals(Message.FORMAT_MATRIX_HTML, message.format) ? mHelper.getSanitisedHtml(message.formatted_body) : null,
+                        mPattern, shouldHighlighted);
+
+                textViews = new ArrayList<>();
+                textViews.add(bodyTextView);
+            }
 
             int textColor;
 
@@ -1149,12 +1176,18 @@ private View getTextView(final int viewType, final int position, View convertVie
                 textColor = shouldHighlighted ? mHighlightMessageTextColor : mDefaultMessageTextColor;
             }
 
-            bodyTextView.setTextColor(textColor);
+            for (final TextView tv : textViews) {
+                tv.setTextColor(textColor);
+            }
 
             View textLayout = convertView.findViewById(R.id.messagesAdapter_text_layout);
-            this.manageSubView(position, convertView, textLayout, ROW_TYPE_TEXT);
+            this.manageSubView(position, convertView, textLayout, viewType);
+
+            for (final TextView tv : textViews) {
+                addContentViewListeners(convertView, tv, position, viewType);
+            }
 
-            addContentViewListeners(convertView, bodyTextView, position);
+            mHelper.manageURLPreviews(message, convertView, event.eventId);
         } catch (Exception e) {
             Log.e(LOG_TAG, "## getTextView() failed : " + e.getMessage());
         }
@@ -1162,6 +1195,56 @@ private View getTextView(final int viewType, final int position, View convertVie
         return convertView;
     }
 
+    /**
+     * For ROW_TYPE_CODE message which may contain mixture of
+     * fenced and inline code blocks and non-code (issue 145)
+     */
+    private List<TextView> populateRowTypeCode(final Message message,
+                                               final View convertView,
+                                               final boolean shouldHighlighted) {
+        final List<TextView> textViews = new ArrayList<>();
+        final LinearLayout container = convertView.findViewById(R.id.messages_container);
+
+        // remove older blocks
+        container.removeAllViews();
+
+        final String[] blocks = mHelper.getFencedCodeBlocks(message);
+        final String START_FB = VectorMessagesAdapterHelper.START_FENCED_BLOCK;
+        final String END_FB = VectorMessagesAdapterHelper.END_FENCED_BLOCK;
+        for (final String block : blocks) {
+            if (block.startsWith(START_FB) && block.endsWith(END_FB)) {
+                // Fenced block
+                final String minusTags = block
+                        .substring(START_FB.length(), block.length() - END_FB.length())
+                        .replace("\n", "<br/>")
+                        .replace(" ", "&nbsp;");
+                final View blockView = mLayoutInflater.inflate(R.layout.adapter_item_vector_message_code_block, null);
+                container.addView(blockView);
+                final TextView tv = blockView.findViewById(R.id.messagesAdapter_body);
+                highlightPattern(tv, new SpannableString(minusTags),
+                        TextUtils.equals(Message.FORMAT_MATRIX_HTML, message.format) ? mHelper.getSanitisedHtml(minusTags) : null,
+                        mPattern, shouldHighlighted);
+
+                mHelper.highlightFencedCode(tv);
+                textViews.add(tv);
+
+                ((View) tv.getParent()).setBackgroundColor(ThemeUtils.getColor(mContext, R.attr.markdown_block_background_color));
+            } else {
+                // Not a fenced block
+                final TextView tv = (TextView) mLayoutInflater.inflate(R.layout.adapter_item_vector_message_code_text, null);
+
+                highlightPattern(tv, new SpannableString(block),
+                        TextUtils.equals(Message.FORMAT_MATRIX_HTML, message.format) ? mHelper.getSanitisedHtml(block) : null,
+                        mPattern, shouldHighlighted);
+
+                container.addView(tv);
+                textViews.add(tv);
+            }
+        }
+
+        return textViews;
+    }
+
     /**
      * Image / Video  message management
      *
@@ -1226,7 +1309,7 @@ private View getImageVideoView(int type, final int position, View convertView, V
             this.manageSubView(position, convertView, imageLayout, type);
 
             ImageView imageView = convertView.findViewById(R.id.messagesAdapter_image);
-            addContentViewListeners(convertView, imageView, position);
+            addContentViewListeners(convertView, imageView, position, type);
         } catch (Exception e) {
             Log.e(LOG_TAG, "## getImageVideoView() failed : " + e.getMessage());
         }
@@ -1275,7 +1358,7 @@ private View getNoticeRoomMemberView(final int viewType, final int position, Vie
             View textLayout = convertView.findViewById(R.id.messagesAdapter_text_layout);
             this.manageSubView(position, convertView, textLayout, viewType);
 
-            addContentViewListeners(convertView, noticeTextView, position);
+            addContentViewListeners(convertView, noticeTextView, position, viewType);
 
             // android seems having a big issue when the text is too long and an alpha !=1 is applied:
             // ---> the text is not displayed.
@@ -1286,6 +1369,9 @@ private View getNoticeRoomMemberView(final int viewType, final int position, Vie
             // the patch apply the alpha to the text color but it does not work for the hyperlinks.
             noticeTextView.setAlpha(1.0f);
             noticeTextView.setTextColor(getNoticeTextColor());
+
+            Message message = JsonUtils.toMessage(msg.getContent());
+            mHelper.manageURLPreviews(message, convertView, msg.eventId);
         } catch (Exception e) {
             Log.e(LOG_TAG, "## getNoticeRoomMemberView() failed : " + e.getMessage());
         }
@@ -1352,7 +1438,9 @@ private View getEmoteView(final int position, View convertView, ViewGroup parent
             View textLayout = convertView.findViewById(R.id.messagesAdapter_text_layout);
             this.manageSubView(position, convertView, textLayout, ROW_TYPE_EMOTE);
 
-            addContentViewListeners(convertView, emoteTextView, position);
+            addContentViewListeners(convertView, emoteTextView, position, ROW_TYPE_EMOTE);
+
+            mHelper.manageURLPreviews(message, convertView, event.eventId);
         } catch (Exception e) {
             Log.e(LOG_TAG, "## getEmoteView() failed : " + e.getMessage());
         }
@@ -1403,7 +1491,7 @@ private View getFileView(final int position, View convertView, ViewGroup parent)
             View fileLayout = convertView.findViewById(R.id.messagesAdapter_file_layout);
             this.manageSubView(position, convertView, fileLayout, ROW_TYPE_FILE);
 
-            addContentViewListeners(convertView, fileTextView, position);
+            addContentViewListeners(convertView, fileTextView, position, ROW_TYPE_FILE);
         } catch (Exception e) {
             Log.e(LOG_TAG, "## getFileView() failed " + e.getMessage());
         }
@@ -1559,51 +1647,56 @@ private void highlightPattern(TextView textView, Spannable text, String htmlForm
      * @return true if should be added
      */
     private boolean isSupportedRow(MessageRow row) {
-        boolean isSupported = VectorMessagesAdapterHelper.isDisplayableEvent(mContext, row);
-
-        if (isSupported) {
-            String eventId = row.getEvent().eventId;
-
-            MessageRow currentRow = mEventRowMap.get(eventId);
+        Event event = row.getEvent();
 
-            // the row should be added only if the message has not been received
-            isSupported = (null == currentRow);
+        // sanity checks
+        if ((null == event) || (null == event.eventId)) {
+            Log.e(LOG_TAG, "## isSupportedRow() : invalid row");
+            return false;
+        }
 
-            // check if the message is already received
-            if (null != currentRow) {
-                // waiting for echo
-                // the message is displayed as sent event if the echo has not been received
-                // it avoids displaying a pending message whereas the message has been sent
-                if (currentRow.getEvent().getAge() == Event.DUMMY_EVENT_AGE) {
-                    currentRow.updateEvent(row.getEvent());
-                }
+        String eventId = event.eventId;
+        MessageRow currentRow = mEventRowMap.get(eventId);
+
+        if (null != currentRow) {
+            // waiting for echo
+            // the message is displayed as sent event if the echo has not been received
+            // it avoids displaying a pending message whereas the message has been sent
+            if (event.getAge() == Event.DUMMY_EVENT_AGE) {
+                currentRow.updateEvent(event);
+                Log.d(LOG_TAG, "## isSupportedRow() : update the timestamp of " + eventId);
+            } else {
+                Log.e(LOG_TAG, "## isSupportedRow() : the event " + eventId + " has already been received");
             }
+            return false;
+        }
 
-            if (TextUtils.equals(row.getEvent().getType(), Event.EVENT_TYPE_STATE_ROOM_MEMBER)) {
-                RoomMember roomMember = JsonUtils.toRoomMember(row.getEvent().getContent());
-                String membership = roomMember.membership;
+        boolean isSupported = VectorMessagesAdapterHelper.isDisplayableEvent(mContext, row);
 
-                if (PreferencesManager.hideJoinLeaveMessages(mContext)) {
-                    isSupported = !TextUtils.equals(membership, RoomMember.MEMBERSHIP_LEAVE) && !TextUtils.equals(membership, RoomMember.MEMBERSHIP_JOIN);
-                }
+        if (isSupported && TextUtils.equals(event.getType(), Event.EVENT_TYPE_STATE_ROOM_MEMBER)) {
+            RoomMember roomMember = JsonUtils.toRoomMember(event.getContent());
+            String membership = roomMember.membership;
 
-                if (isSupported && PreferencesManager.hideAvatarDisplayNameChangeMessages(mContext) && TextUtils.equals(membership, RoomMember.MEMBERSHIP_JOIN)) {
-                    EventContent eventContent = JsonUtils.toEventContent(row.getEvent().getContentAsJsonObject());
-                    EventContent prevEventContent = row.getEvent().getPrevContent();
+            if (PreferencesManager.hideJoinLeaveMessages(mContext)) {
+                isSupported = !TextUtils.equals(membership, RoomMember.MEMBERSHIP_LEAVE) && !TextUtils.equals(membership, RoomMember.MEMBERSHIP_JOIN);
+            }
 
-                    String senderDisplayName = eventContent.displayname;
-                    String prevUserDisplayName = null;
-                    String avatar = eventContent.avatar_url;
-                    String prevAvatar = null;
+            if (isSupported && PreferencesManager.hideAvatarDisplayNameChangeMessages(mContext) && TextUtils.equals(membership, RoomMember.MEMBERSHIP_JOIN)) {
+                EventContent eventContent = JsonUtils.toEventContent(event.getContentAsJsonObject());
+                EventContent prevEventContent = event.getPrevContent();
 
-                    if ((null != prevEventContent)) {
-                        prevUserDisplayName = prevEventContent.displayname;
-                        prevAvatar = prevEventContent.avatar_url;
-                    }
+                String senderDisplayName = eventContent.displayname;
+                String prevUserDisplayName = null;
+                String avatar = eventContent.avatar_url;
+                String prevAvatar = null;
 
-                    // !Updated display name && same avatar
-                    isSupported = TextUtils.equals(prevUserDisplayName, senderDisplayName) && TextUtils.equals(avatar, prevAvatar);
+                if ((null != prevEventContent)) {
+                    prevUserDisplayName = prevEventContent.displayname;
+                    prevAvatar = prevEventContent.avatar_url;
                 }
+
+                // !Updated display name && same avatar
+                isSupported = TextUtils.equals(prevUserDisplayName, senderDisplayName) && TextUtils.equals(avatar, prevAvatar);
             }
         }
 
@@ -1731,7 +1824,7 @@ String headerMessage(int position) {
      * @param contentView the cell view.
      * @param event       the linked event
      */
-    private void manageSelectionMode(final View contentView, final Event event) {
+    private void manageSelectionMode(final View contentView, final Event event, final int msgType) {
         final String eventId = event.eventId;
 
         boolean isInSelectionMode = (null != mSelectedEventId);
@@ -1746,6 +1839,11 @@ private void manageSelectionMode(final View contentView, final Event event) {
         contentView.findViewById(R.id.messagesAdapter_body_view).setAlpha(alpha);
         contentView.findViewById(R.id.messagesAdapter_avatars_list).setAlpha(alpha);
 
+        View urlsPreviewView =  contentView.findViewById(R.id.messagesAdapter_urls_preview_list);
+        if (null != urlsPreviewView) {
+            urlsPreviewView.setAlpha(alpha);
+        }
+
         TextView tsTextView = contentView.findViewById(R.id.messagesAdapter_timestamp);
         if (isInSelectionMode && isSelected) {
             tsTextView.setVisibility(View.VISIBLE);
@@ -1756,7 +1854,7 @@ private void manageSelectionMode(final View contentView, final Event event) {
                 @Override
                 public void onClick(View v) {
                     if (TextUtils.equals(eventId, mSelectedEventId)) {
-                        onMessageClick(event, getEventText(contentView), contentView.findViewById(R.id.messagesAdapter_action_anchor));
+                        onMessageClick(event, getEventText(contentView, event, msgType), contentView.findViewById(R.id.messagesAdapter_action_anchor));
                     } else {
                         onEventTap(eventId);
                     }
@@ -1767,7 +1865,7 @@ public void onClick(View v) {
                 @Override
                 public boolean onLongClick(View v) {
                     if (!mIsSearchMode) {
-                        onMessageClick(event, getEventText(contentView), contentView.findViewById(R.id.messagesAdapter_action_anchor));
+                        onMessageClick(event, getEventText(contentView, event, msgType), contentView.findViewById(R.id.messagesAdapter_action_anchor));
                         mSelectedEventId = eventId;
                         notifyDataSetChanged();
                         return true;
@@ -1801,14 +1899,19 @@ boolean mergeView(Event event, int position, boolean shouldBeMerged) {
      * @param contentView the cell view
      * @return the displayed text.
      */
-    private String getEventText(View contentView) {
+    private String getEventText(View contentView, Event event, int msgType) {
         String text = null;
 
         if (null != contentView) {
-            TextView bodyTextView = contentView.findViewById(R.id.messagesAdapter_body);
+            if ((ROW_TYPE_CODE == msgType) || (ROW_TYPE_TEXT == msgType)) {
+                final Message message = JsonUtils.toMessage(event.getContent());
+                text = message.body;
+            } else {
+                TextView bodyTextView = contentView.findViewById(R.id.messagesAdapter_body);
 
-            if (null != bodyTextView) {
-                text = bodyTextView.getText().toString();
+                if (null != bodyTextView) {
+                    text = bodyTextView.getText().toString();
+                }
             }
         }
 
@@ -1822,7 +1925,7 @@ private String getEventText(View contentView) {
      * @param contentView the main message view
      * @param position    the item position
      */
-    private void addContentViewListeners(final View convertView, final View contentView, final int position) {
+    private void addContentViewListeners(final View convertView, final View contentView, final int position, final int msgType) {
         contentView.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(View v) {
@@ -1844,7 +1947,7 @@ public boolean onLongClick(View v) {
                     Event event = row.getEvent();
 
                     if (!mIsSearchMode) {
-                        onMessageClick(event, getEventText(contentView), convertView.findViewById(R.id.messagesAdapter_action_anchor));
+                        onMessageClick(event, getEventText(contentView, event, msgType), convertView.findViewById(R.id.messagesAdapter_action_anchor));
                         mSelectedEventId = event.eventId;
                         notifyDataSetChanged();
                         return true;
@@ -2023,6 +2126,15 @@ public void setReadMarkerListener(final ReadMarkerListener listener) {
         mReadMarkerListener = listener;
     }
 
+    /**
+     * Set a image getter
+     *
+     * @param imageGetter the image getter
+     */
+    public void setImageGetter(VectorImageGetter imageGetter) {
+        mHelper.setImageGetter(imageGetter);
+    }
+
     /**
      * Animate a read marker view
      */
@@ -2267,7 +2379,7 @@ private void onMessageClick(final Event event, final String textMsg, final View
                 Message message = JsonUtils.toMessage(event.getContentAsJsonObject());
 
                 // share / forward the message
-                menu.findItem(R.id.ic_action_vector_share).setVisible(true);
+                menu.findItem(R.id.ic_action_vector_share).setVisible(!mIsRoomEncrypted);
                 menu.findItem(R.id.ic_action_vector_forward).setVisible(true);
 
                 // save the media in the downloads directory
@@ -2467,4 +2579,4 @@ private void checkEventGroupsMerge(MessageRow deletedRow, int position) {
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java
index 947a0edbce..3aaaee2884 100755
--- a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java
+++ b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterHelper.java
@@ -33,6 +33,7 @@
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
 import android.widget.ImageView;
+import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import com.google.gson.JsonNull;
@@ -40,10 +41,16 @@
 
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.adapters.MessageRow;
+import org.matrix.androidsdk.data.Room;
 import org.matrix.androidsdk.data.RoomState;
 import org.matrix.androidsdk.data.store.IMXStore;
+import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.Event;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.MatrixError;
+import org.matrix.androidsdk.rest.model.URLPreview;
+import org.matrix.androidsdk.rest.model.group.Group;
+import org.matrix.androidsdk.rest.model.group.GroupProfile;
+import org.matrix.androidsdk.rest.model.message.Message;
 import org.matrix.androidsdk.rest.model.ReceiptData;
 import org.matrix.androidsdk.rest.model.RoomMember;
 import org.matrix.androidsdk.util.EventDisplay;
@@ -54,20 +61,25 @@
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import im.vector.R;
+import im.vector.VectorApp;
 import im.vector.listeners.IMessagesAdapterActionsListener;
 import im.vector.util.MatrixLinkMovementMethod;
 import im.vector.util.MatrixURLSpan;
 import im.vector.util.PreferencesManager;
 import im.vector.util.RiotEventDisplay;
 import im.vector.util.ThemeUtils;
+import im.vector.util.VectorImageGetter;
 import im.vector.util.VectorUtils;
 import im.vector.view.PillView;
+import im.vector.view.UrlPreviewView;
 import im.vector.widgets.WidgetsManager;
 
 /**
@@ -76,14 +88,30 @@
 class VectorMessagesAdapterHelper {
     private static final String LOG_TAG = VectorMessagesAdapterHelper.class.getSimpleName();
 
+    /**
+     * Enable multiline mode, split on <pre><code>...</code></pre> and retain those delimiters in
+     * the returned fenced block.
+     */
+    public static final String START_FENCED_BLOCK = "<pre><code>";
+    public static final String END_FENCED_BLOCK = "</code></pre>";
+    private static final Pattern FENCED_CODE_BLOCK_PATTERN = Pattern.compile("(?m)(?=<pre><code>)|(?<=</code></pre>)");
+
     private IMessagesAdapterActionsListener mEventsListener;
-    private final MXSession mSession;
+
     private final Context mContext;
+    private final MXSession mSession;
+    private final VectorMessagesAdapter mAdapter;
+    private Room mRoom = null;
+
     private MatrixLinkMovementMethod mLinkMovementMethod;
 
-    VectorMessagesAdapterHelper(Context context, MXSession session) {
+    private VectorImageGetter mImageGetter;
+
+
+    VectorMessagesAdapterHelper(Context context, MXSession session, VectorMessagesAdapter adapter) {
         mContext = context;
         mSession = session;
+        mAdapter = adapter;
     }
 
     /**
@@ -95,7 +123,6 @@ void setVectorMessagesAdapterActionsListener(IMessagesAdapterActionsListener lis
         mEventsListener = listener;
     }
 
-
     /**
      * Define the links movement method
      *
@@ -105,6 +132,15 @@ void setLinkMovementMethod(MatrixLinkMovementMethod method) {
         mLinkMovementMethod = method;
     }
 
+    /**
+     * Set the image getter.
+     *
+     * @param imageGetter the image getter
+     */
+    void setImageGetter(VectorImageGetter imageGetter) {
+        mImageGetter = imageGetter;
+    }
+
     /**
      * Returns an user display name for an user Id.
      *
@@ -130,12 +166,15 @@ public static String getUserDisplayName(String userId, RoomState roomState) {
     public void setSenderValue(View convertView, MessageRow row, boolean isMergedView) {
         // manage sender text
         TextView senderTextView = convertView.findViewById(R.id.messagesAdapter_sender);
+        View groupFlairView = convertView.findViewById(R.id.messagesAdapter_flair_groups_list);
 
         if (null != senderTextView) {
             Event event = row.getEvent();
 
             if (isMergedView) {
                 senderTextView.setVisibility(View.GONE);
+                groupFlairView.setVisibility(View.GONE);
+                groupFlairView.setTag(null);
             } else {
                 String eventType = event.getType();
 
@@ -149,6 +188,8 @@ public void setSenderValue(View convertView, MessageRow row, boolean isMergedVie
                         Event.EVENT_TYPE_STATE_HISTORY_VISIBILITY.equals(eventType) ||
                         Event.EVENT_TYPE_MESSAGE_ENCRYPTION.equals(eventType)) {
                     senderTextView.setVisibility(View.GONE);
+                    groupFlairView.setVisibility(View.GONE);
+                    groupFlairView.setTag(null);
                 } else {
                     senderTextView.setVisibility(View.VISIBLE);
                     senderTextView.setText(getUserDisplayName(event.getSender(), row.getRoomState()));
@@ -164,8 +205,189 @@ public void onClick(View v) {
                             }
                         }
                     });
+
+                    refreshGroupFlairView(groupFlairView, event);
+                }
+            }
+        }
+    }
+
+    /**
+     * Refresh the flairs group view
+     *
+     * @param groupFlairView the flairs view
+     * @param event          the event
+     * @param groupIdsSet    the groupids
+     * @param tag            the tag
+     */
+    private void refreshGroupFlairView(final View groupFlairView, final Event event, final Set<String> groupIdsSet, final String tag) {
+        Log.d(LOG_TAG, "## refreshGroupFlairView () : " + event.sender + " allows flair to " + groupIdsSet);
+        Log.d(LOG_TAG, "## refreshGroupFlairView () : room related groups " + mRoom.getLiveState().getRelatedGroups());
+
+        if (!groupIdsSet.isEmpty()) {
+            // keeps only the intersections
+            groupIdsSet.retainAll(mRoom.getLiveState().getRelatedGroups());
+        }
+
+        Log.d(LOG_TAG, "## refreshGroupFlairView () : group ids to display " + groupIdsSet);
+
+        if (groupIdsSet.isEmpty()) {
+            groupFlairView.setVisibility(View.GONE);
+        } else {
+
+            if (!mSession.isAlive()) {
+                return;
+            }
+
+            groupFlairView.setVisibility(View.VISIBLE);
+
+            ArrayList<ImageView> imageViews = new ArrayList<>();
+
+            imageViews.add((ImageView) (groupFlairView.findViewById(R.id.message_avatar_group_1).findViewById(R.id.avatar_img)));
+            imageViews.add((ImageView) (groupFlairView.findViewById(R.id.message_avatar_group_2).findViewById(R.id.avatar_img)));
+            imageViews.add((ImageView) (groupFlairView.findViewById(R.id.message_avatar_group_3).findViewById(R.id.avatar_img)));
+
+            TextView moreText = groupFlairView.findViewById(R.id.message_more_than_expected);
+
+            final List<String> groupIds = new ArrayList<>(groupIdsSet);
+            int index = 0;
+            int bound = Math.min(groupIds.size(), imageViews.size());
+
+            for (; index < bound; index++) {
+                final String groupId = groupIds.get(index);
+                final ImageView imageView = imageViews.get(index);
+
+                imageView.setVisibility(View.VISIBLE);
+
+                Group group = mSession.getGroupsManager().getGroup(groupId);
+
+                if (null == group) {
+                    group = new Group(groupId);
+                }
+
+                GroupProfile cachedGroupProfile = mSession.getGroupsManager().getGroupProfile(groupId);
+
+                if (null != cachedGroupProfile) {
+                    Log.d(LOG_TAG, "## refreshGroupFlairView () : profile of " + groupId + " is cached");
+                    group.setGroupProfile(cachedGroupProfile);
+                    VectorUtils.loadGroupAvatar(mContext, mSession, imageView, group);
+                } else {
+                    VectorUtils.loadGroupAvatar(mContext, mSession, imageView, group);
+
+                    Log.d(LOG_TAG, "## refreshGroupFlairView () : get profile of " + groupId);
+
+                    mSession.getGroupsManager().getGroupProfile(groupId, new ApiCallback<GroupProfile>() {
+                        private void refresh(GroupProfile profile) {
+                            if (TextUtils.equals((String) groupFlairView.getTag(), tag)) {
+                                Group group = new Group(groupId);
+                                group.setGroupProfile(profile);
+                                Log.d(LOG_TAG, "## refreshGroupFlairView () : refresh group avatar " + groupId);
+                                VectorUtils.loadGroupAvatar(mContext, mSession, imageView, group);
+                            }
+                        }
+
+                        @Override
+                        public void onSuccess(GroupProfile groupProfile) {
+                            Log.d(LOG_TAG, "## refreshGroupFlairView () : get profile of " + groupId + " succeeded");
+                            refresh(groupProfile);
+                        }
+
+                        @Override
+                        public void onNetworkError(Exception e) {
+                            Log.e(LOG_TAG, "## refreshGroupFlairView () : get profile of " + groupId + " failed " + e.getMessage());
+                            refresh(null);
+                        }
+
+                        @Override
+                        public void onMatrixError(MatrixError e) {
+                            Log.e(LOG_TAG, "## refreshGroupFlairView () : get profile of " + groupId + " failed " + e.getMessage());
+                            refresh(null);
+                        }
+
+                        @Override
+                        public void onUnexpectedError(Exception e) {
+                            Log.e(LOG_TAG, "## refreshGroupFlairView () : get profile of " + groupId + " failed " + e.getMessage());
+                            refresh(null);
+                        }
+                    });
                 }
             }
+
+            for (; index < imageViews.size(); index++) {
+                imageViews.get(index).setVisibility(View.GONE);
+            }
+
+            moreText.setVisibility((groupIdsSet.size() <= imageViews.size()) ? View.GONE : View.VISIBLE);
+            moreText.setText("+" + (groupIdsSet.size() - imageViews.size()));
+
+            if (groupIdsSet.size() > 0) {
+                groupFlairView.setOnClickListener(new View.OnClickListener() {
+                    @Override
+                    public void onClick(View v) {
+                        if (null != mEventsListener) {
+                            mEventsListener.onGroupFlairClick(event.getSender()
+                                    , groupIds);
+                        }
+                    }
+                });
+            } else {
+                groupFlairView.setOnClickListener(null);
+            }
+        }
+    }
+
+    /**
+     * Refresh the group flair view
+     *
+     * @param groupFlairView the flairs view
+     * @param event          the event
+     */
+    private void refreshGroupFlairView(final View groupFlairView, final Event event) {
+        final String tag = event.getSender() + "__" + event.eventId;
+
+        if (null == mRoom) {
+            mRoom = mSession.getDataHandler().getRoom(event.roomId);
+        }
+
+        // no related groups to this room
+        if (mRoom.getLiveState().getRelatedGroups().isEmpty()) {
+            Log.d(LOG_TAG, "## refreshGroupFlairView () : no related group");
+            groupFlairView.setVisibility(View.GONE);
+            return;
+        }
+
+        groupFlairView.setTag(tag);
+
+        Log.d(LOG_TAG, "## refreshGroupFlairView () : eventId " + event.eventId + " from " + event.sender);
+
+        // cached value first
+        Set<String> userPublicisedGroups = mSession.getGroupsManager().getUserPublicisedGroups(event.getSender());
+
+        if (null != userPublicisedGroups) {
+            refreshGroupFlairView(groupFlairView, event, userPublicisedGroups, tag);
+        } else {
+            groupFlairView.setVisibility(View.GONE);
+            mSession.getGroupsManager().getUserPublicisedGroups(event.getSender(), false, new ApiCallback<Set<String>>() {
+                @Override
+                public void onSuccess(Set<String> groupIdsSet) {
+                    refreshGroupFlairView(groupFlairView, event, groupIdsSet, tag);
+                }
+
+                @Override
+                public void onNetworkError(Exception e) {
+                    Log.e(LOG_TAG, "## refreshGroupFlairView failed " + e.getMessage());
+                }
+
+                @Override
+                public void onMatrixError(MatrixError e) {
+                    Log.e(LOG_TAG, "## refreshGroupFlairView failed " + e.getMessage());
+                }
+
+                @Override
+                public void onUnexpectedError(Exception e) {
+                    Log.e(LOG_TAG, "## refreshGroupFlairView failed " + e.getMessage());
+                }
+            });
         }
     }
 
@@ -506,7 +728,7 @@ static void setMediaProgressLayout(View convertView, View bodyLayoutView) {
     }
 
     // cache the pills to avoid compute them again
-    Map<String, Drawable> mPillsCache = new HashMap<>();
+    private Map<String, Drawable> mPillsDrawableCache = new HashMap<>();
 
     /**
      * Trap the clicked URL.
@@ -523,17 +745,31 @@ private void makeLinkClickable(SpannableStringBuilder strBuilder, final URLSpan
             int flags = strBuilder.getSpanFlags(span);
 
             if (PillView.isPillable(span.getURL())) {
-                String key = span.getURL() + " " + isHighlighted;
-                Drawable drawable = mPillsCache.get(key);
+                final String key = span.getURL() + " " + isHighlighted;
+                Drawable drawable = mPillsDrawableCache.get(key);
 
                 if (null == drawable) {
-                    PillView aView = new PillView(mContext);
-                    aView.setText(strBuilder.subSequence(start, end), span.getURL());
+                    final PillView aView = new PillView(mContext);
+                    aView.initData(strBuilder.subSequence(start, end), span.getURL(), mSession, new PillView.OnUpdateListener() {
+                        @Override
+                        public void onAvatarUpdate() {
+                            // force to compose
+                            aView.setBackgroundResource(android.R.color.transparent);
+
+                            // get a drawable from the view
+                            Drawable updatedDrawable = aView.getDrawable();
+                            mPillsDrawableCache.put(key, updatedDrawable);
+                            // should update only the current cell
+                            // but it might have been recycled
+                            mAdapter.notifyDataSetChanged();
+                        }
+                    });
                     aView.setHighlighted(isHighlighted);
                     drawable = aView.getDrawable();
                 }
+
                 if (null != drawable) {
-                    mPillsCache.put(key, drawable);
+                    mPillsDrawableCache.put(key, drawable);
                     ImageSpan imageSpan = new ImageSpan(drawable);
                     drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
                     strBuilder.setSpan(imageSpan, start, end, flags);
@@ -553,6 +789,59 @@ public void onClick(View view) {
         }
     }
 
+    /**
+     * Determine if the message body contains any code blocks.
+     *
+     * @param message the message
+     * @return true if it contains code blocks
+     */
+    boolean containsFencedCodeBlocks(final Message message) {
+        return (null != message.formatted_body) &&
+                message.formatted_body.contains(START_FENCED_BLOCK) &&
+                message.formatted_body.contains(END_FENCED_BLOCK);
+    }
+
+    private Map<String, String[]> mCodeBlocksMap = new HashMap<>();
+
+    /**
+     * Split the message body with code blocks delimiters.
+     *
+     * @param message the message
+     * @return the split message body
+     */
+    String[] getFencedCodeBlocks(final Message message) {
+        if (TextUtils.isEmpty(message.formatted_body)) {
+            return new String[0];
+        }
+
+        String[] codeBlocks = mCodeBlocksMap.get(message.formatted_body);
+
+        if (null == codeBlocks) {
+            codeBlocks = FENCED_CODE_BLOCK_PATTERN.split(message.formatted_body);
+            mCodeBlocksMap.put(message.formatted_body, codeBlocks);
+        }
+
+        return codeBlocks;
+    }
+
+    /**
+     * Highlight fenced code
+     *
+     * @param textView the text view
+     */
+    void highlightFencedCode(final TextView textView) {
+        // sanity check
+        if (null == textView) {
+            return;
+        }
+
+        textView.setBackgroundColor(ThemeUtils.getColor(mContext, R.attr.markdown_block_background_color));
+
+        if (null != mLinkMovementMethod) {
+            textView.setMovementMethod(mLinkMovementMethod);
+        }
+    }
+
     /**
      * Highlight the pattern in the text.
      *
@@ -571,8 +860,8 @@ void highlightPattern(TextView textView, Spannable text, String htmlFormattedTex
 
         if (!TextUtils.isEmpty(pattern) && !TextUtils.isEmpty(text) && (text.length() >= pattern.length())) {
 
-            String lowerText = text.toString().toLowerCase();
-            String lowerPattern = pattern.toLowerCase();
+            String lowerText = text.toString().toLowerCase(VectorApp.getApplicationLocale());
+            String lowerPattern = pattern.toLowerCase(VectorApp.getApplicationLocale());
 
             int start = 0;
             int pos = lowerText.indexOf(lowerPattern, start);
@@ -597,7 +886,7 @@ void highlightPattern(TextView textView, Spannable text, String htmlFormattedTex
 
             // the links are not yet supported by ConsoleHtmlTagHandler
             // the markdown tables are not properly supported
-            sequence = Html.fromHtml(htmlFormattedText, null, isCustomizable ? htmlTagHandler : null);
+            sequence = Html.fromHtml(htmlFormattedText, mImageGetter, isCustomizable ? htmlTagHandler : null);
 
             // sanity check
             if (!TextUtils.isEmpty(sequence)) {
@@ -664,7 +953,7 @@ static boolean isDisplayableEvent(Context context, MessageRow row) {
         if (Event.EVENT_TYPE_MESSAGE.equals(eventType)) {
             // A message is displayable as long as it has a body
             Message message = JsonUtils.toMessage(event.getContent());
-            return (message.body != null) && (!message.body.equals(""));
+            return !TextUtils.isEmpty(message.body) || TextUtils.equals(message.msgtype, Message.MSGTYPE_EMOTE);
         } else if (Event.EVENT_TYPE_STATE_ROOM_TOPIC.equals(eventType)
                 || Event.EVENT_TYPE_STATE_ROOM_NAME.equals(eventType)) {
             EventDisplay display = new RiotEventDisplay(context, event, roomState);
@@ -721,13 +1010,12 @@ String getSanitisedHtml(final String html) {
         return res;
     }
 
-    private static final List<String> mAllowedHTMLTags = Arrays.asList(
+    private static final Set<String> mAllowedHTMLTags = new HashSet<>(Arrays.asList(
             "font", // custom to matrix for IRC-style font coloring
             "del", // for markdown
-            // deliberately no h1/h2 to stop people shouting.
-            "h3", "h4", "h5", "h6", "blockquote", "p", "a", "ul", "ol",
+            "h1", "h2", "h3", "h4", "h5", "h6", "blockquote", "p", "a", "ul", "ol", "sup", "sub",
             "nl", "li", "b", "i", "u", "strong", "em", "strike", "code", "hr", "br", "div",
-            "table", "thead", "caption", "tbody", "tr", "th", "td", "pre");
+            "table", "thead", "caption", "tbody", "tr", "th", "td", "pre", "span", "img"));
 
     private static final Pattern mHtmlPatter = Pattern.compile("<(\\w+)[^>]*>", Pattern.CASE_INSENSITIVE);
 
@@ -742,7 +1030,7 @@ private static String sanitiseHTML(final String htmlString) {
         String html = htmlString;
         Matcher matcher = mHtmlPatter.matcher(htmlString);
 
-        ArrayList<String> tagsToRemove = new ArrayList<>();
+        HashSet<String> tagsToRemove = new HashSet<>();
 
         while (matcher.find()) {
 
@@ -750,11 +1038,8 @@ private static String sanitiseHTML(final String htmlString) {
                 String tag = htmlString.substring(matcher.start(1), matcher.end(1));
 
                 // test if the tag is not allowed
-                if (mAllowedHTMLTags.indexOf(tag) < 0) {
-                    // add it once
-                    if (tagsToRemove.indexOf(tag) < 0) {
-                        tagsToRemove.add(tag);
-                    }
+                if (!mAllowedHTMLTags.contains(tag)) {
+                    tagsToRemove.add(tag);
                 }
             } catch (Exception e) {
                 Log.e(LOG_TAG, "sanitiseHTML failed " + e.getLocalizedMessage());
@@ -762,12 +1047,16 @@ private static String sanitiseHTML(final String htmlString) {
         }
 
         // some tags to remove ?
-        if (tagsToRemove.size() > 0) {
+        if (!tagsToRemove.isEmpty()) {
             // append the tags to remove
-            String tagsToRemoveString = tagsToRemove.get(0);
+            String tagsToRemoveString = "";
 
-            for (int i = 1; i < tagsToRemove.size(); i++) {
-                tagsToRemoveString += "|" + tagsToRemove.get(i);
+            for (String tag : tagsToRemove) {
+                if (!tagsToRemoveString.isEmpty()) {
+                    tagsToRemoveString += "|";
+                }
+
+                tagsToRemoveString += tag;
             }
 
             html = html.replaceAll("<\\/?(" + tagsToRemoveString + ")[^>]*>", "");
@@ -775,4 +1064,127 @@ private static String sanitiseHTML(final String htmlString) {
 
         return html;
     }
+
+    /*
+  * *********************************************************************************************
+  *  Url preview managements
+  * *********************************************************************************************
+  */
+    private final Map<String, List<String>> mExtractedUrls = new HashMap<>();
+    private final Map<String, URLPreview> mUrlsPreview = new HashMap<>();
+    private final Set<String> mPendingUrls = new HashSet<>();
+    private final Set<String> mDismissedPreviews = new HashSet<>();
+
+    /**
+     * Retrieves the webUrl extracted from a text
+     *
+     * @param text the text
+     * @return the web urls list
+     */
+    private List<String> extractWebUrl(String text) {
+        List<String> list = mExtractedUrls.get(text);
+
+        if (null == list) {
+            list = new ArrayList<>();
+
+            Matcher matcher = android.util.Patterns.WEB_URL.matcher(text);
+            while (matcher.find()) {
+                try {
+                    String value = text.substring(matcher.start(0), matcher.end(0));
+
+                    if (!list.contains(value)) {
+                        list.add(value);
+                    }
+                } catch (Exception e) {
+                    Log.e(LOG_TAG, "## extractWebUrl() " + e.getMessage());
+                }
+            }
+
+            mExtractedUrls.put(text, list);
+        }
+
+        return list;
+    }
+
+    void manageURLPreviews(final Message message, final View convertView, final String id) {
+        LinearLayout urlsPreviewLayout = convertView.findViewById(R.id.messagesAdapter_urls_preview_list);
+
+        // sanity checks
+        if (null == urlsPreviewLayout) {
+            return;
+        }
+
+        //
+        if (TextUtils.isEmpty(message.body)) {
+            urlsPreviewLayout.setVisibility(View.GONE);
+            return;
+        }
+
+        List<String> urls = extractWebUrl(message.body);
+
+        if (urls.isEmpty()) {
+            urlsPreviewLayout.setVisibility(View.GONE);
+            return;
+        }
+
+        // avoid removing items if they are displayed
+        if (TextUtils.equals((String) urlsPreviewLayout.getTag(), id)) {
+            // all the urls have been displayed
+            if (urlsPreviewLayout.getChildCount() == urls.size()) {
+                return;
+            }
+        }
+
+        urlsPreviewLayout.setTag(id);
+
+        // remove url previews
+        while (urlsPreviewLayout.getChildCount() > 0) {
+            urlsPreviewLayout.removeViewAt(0);
+        }
+
+        urlsPreviewLayout.setVisibility(View.VISIBLE);
+
+        for (final String url : urls) {
+            final String downloadKey = url.hashCode() + "---";
+            String displayKey = url + "<----->" + id;
+
+            if (UrlPreviewView.didUrlPreviewDismiss(displayKey)) {
+                Log.d(LOG_TAG, "## manageURLPreviews() : " + displayKey + " has been dismissed");
+            } else if (mPendingUrls.contains(url)) {
+                // please wait
+            } else if (!mUrlsPreview.containsKey(downloadKey)) {
+                mPendingUrls.add(url);
+                mSession.getEventsApiClient().getURLPreview(url, System.currentTimeMillis(), new ApiCallback<URLPreview>() {
+                    @Override
+                    public void onSuccess(URLPreview urlPreview) {
+                        mPendingUrls.remove(url);
+
+                        if (!mUrlsPreview.containsKey(downloadKey)) {
+                            mUrlsPreview.put(downloadKey, urlPreview);
+                            mAdapter.notifyDataSetChanged();
+                        }
+                    }
+
+                    @Override
+                    public void onNetworkError(Exception e) {
+                        onSuccess(null);
+                    }
+
+                    @Override
+                    public void onMatrixError(MatrixError e) {
+                        onSuccess(null);
+                    }
+
+                    @Override
+                    public void onUnexpectedError(Exception e) {
+                        onSuccess(null);
+                    }
+                });
+            } else {
+                UrlPreviewView previewView = new UrlPreviewView(mContext);
+                previewView.setUrlPreview(mContext, mSession, mUrlsPreview.get(downloadKey), displayKey);
+                urlsPreviewLayout.addView(previewView);
+            }
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterMediasHelper.java b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterMediasHelper.java
index 716936a4e6..4935cb6ca0 100755
--- a/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterMediasHelper.java
+++ b/vector/src/main/java/im/vector/adapters/VectorMessagesAdapterMediasHelper.java
@@ -37,18 +37,21 @@
 import org.matrix.androidsdk.listeners.IMXMediaUploadListener;
 import org.matrix.androidsdk.listeners.MXMediaDownloadListener;
 import org.matrix.androidsdk.listeners.MXMediaUploadListener;
-import org.matrix.androidsdk.rest.model.EncryptedFileInfo;
+import org.matrix.androidsdk.rest.model.crypto.EncryptedFileInfo;
 import org.matrix.androidsdk.rest.model.Event;
-import org.matrix.androidsdk.rest.model.FileMessage;
-import org.matrix.androidsdk.rest.model.ImageInfo;
-import org.matrix.androidsdk.rest.model.ImageMessage;
+import org.matrix.androidsdk.rest.model.message.FileMessage;
+import org.matrix.androidsdk.rest.model.message.ImageInfo;
+import org.matrix.androidsdk.rest.model.message.ImageMessage;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.Message;
-import org.matrix.androidsdk.rest.model.VideoInfo;
-import org.matrix.androidsdk.rest.model.VideoMessage;
+import org.matrix.androidsdk.rest.model.message.Message;
+import org.matrix.androidsdk.rest.model.message.VideoInfo;
+import org.matrix.androidsdk.rest.model.message.VideoMessage;
 import org.matrix.androidsdk.util.JsonUtils;
 import org.matrix.androidsdk.util.Log;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import im.vector.R;
 import im.vector.listeners.IMessagesAdapterActionsListener;
 
@@ -168,6 +171,10 @@ public void onUploadComplete(final String uploadId, final String contentUri) {
         refreshUploadViews(event, uploadStats, uploadProgressLayout);
     }
 
+    // the image / video bitmaps are set to null if the matching URL is not the same
+    // to avoid flickering
+    private Map<String, String> mUrlByBitmapIndex = new HashMap<>();
+
     /**
      * Manage the image/video download.
      *
@@ -240,8 +247,13 @@ void managePendingImageVideoDownload(final View convertView, final Event event,
 
         ImageView imageView = convertView.findViewById(R.id.messagesAdapter_image);
 
-        // reset the bitmap
-        imageView.setImageBitmap(null);
+        // reset the bitmap if the url is not the same than before
+        if ((null == thumbUrl) || !TextUtils.equals(imageView.hashCode() + "", mUrlByBitmapIndex.get(thumbUrl))) {
+            imageView.setImageBitmap(null);
+            if (null != thumbUrl) {
+                mUrlByBitmapIndex.put(thumbUrl, imageView.hashCode() + "");
+            }
+        }
 
         RelativeLayout informationLayout = convertView.findViewById(R.id.messagesAdapter_image_layout);
         final FrameLayout.LayoutParams layoutParams = (FrameLayout.LayoutParams) informationLayout.getLayoutParams();
@@ -397,12 +409,13 @@ void managePendingImageVideoUpload(final View convertView, final Event event, Me
 
         String uploadingUrl;
         final boolean isUploadingThumbnail;
+        boolean isUploadingContent = false;
 
         if (isVideoMessage) {
-            uploadingUrl = ((VideoMessage) message).info.thumbnail_url;
+            uploadingUrl = ((VideoMessage) message).getThumbnailUrl();
             isUploadingThumbnail = ((VideoMessage) message).isThumbnailLocalContent();
         } else {
-            uploadingUrl = ((ImageMessage) message).info.thumbnailUrl;
+            uploadingUrl = ((ImageMessage) message).getThumbnailUrl();
             isUploadingThumbnail = ((ImageMessage) message).isThumbnailLocalContent();
         }
 
@@ -412,10 +425,14 @@ void managePendingImageVideoUpload(final View convertView, final Event event, Me
             progress = mSession.getMediasCache().getProgressValueForUploadId(uploadingUrl);
         } else {
             if (isVideoMessage) {
-                uploadingUrl = ((VideoMessage) message).url;
+                uploadingUrl = ((VideoMessage) message).getUrl();
+                isUploadingContent = ((VideoMessage) message).isLocalContent();
+
             } else {
-                uploadingUrl = ((ImageMessage) message).url;
+                uploadingUrl = ((ImageMessage) message).getUrl();
+                isUploadingContent = ((ImageMessage) message).isLocalContent();
             }
+
             progress = mSession.getMediasCache().getProgressValueForUploadId(uploadingUrl);
         }
 
@@ -478,11 +495,12 @@ public void onUploadComplete(final String uploadId, final String contentUri) {
         uploadSpinner.setVisibility(((progress < 0) && event.isSending()) ? View.VISIBLE : View.GONE);
         refreshUploadViews(event, mSession.getMediasCache().getStatsForUploadId(uploadingUrl), uploadProgressLayout);
 
-        if (!isUploadingThumbnail) {
+        if (isUploadingContent) {
             progress = 10 + (progress * 90 / 100);
-        } else {
+        } else if (isUploadingThumbnail) {
             progress = (progress * 10 / 100);
         }
+
         updateUploadProgress(uploadProgressLayout, progress);
         uploadProgressLayout.setVisibility(((progress >= 0) && event.isSending()) ? View.VISIBLE : View.GONE);
     }
diff --git a/vector/src/main/java/im/vector/adapters/VectorParticipantsAdapter.java b/vector/src/main/java/im/vector/adapters/VectorParticipantsAdapter.java
index 429923394a..d2495c42ad 100755
--- a/vector/src/main/java/im/vector/adapters/VectorParticipantsAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/VectorParticipantsAdapter.java
@@ -40,7 +40,7 @@
 import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
 import org.matrix.androidsdk.rest.model.MatrixError;
 import org.matrix.androidsdk.rest.model.RoomMember;
-import org.matrix.androidsdk.rest.model.Search.SearchUsersResponse;
+import org.matrix.androidsdk.rest.model.search.SearchUsersResponse;
 import org.matrix.androidsdk.rest.model.User;
 import org.matrix.androidsdk.util.Log;
 
@@ -55,6 +55,7 @@
 
 import im.vector.Matrix;
 import im.vector.R;
+import im.vector.VectorApp;
 import im.vector.activity.CommonActivityUtils;
 import im.vector.contacts.Contact;
 import im.vector.contacts.ContactsManager;
@@ -182,7 +183,7 @@ public void setSearchedPattern(String pattern, ParticipantAdapterItem firstEntry
         if (null == pattern) {
             pattern = "";
         } else {
-            pattern = pattern.toLowerCase().trim().toLowerCase();
+            pattern = pattern.toLowerCase().trim().toLowerCase(VectorApp.getApplicationLocale());
         }
 
         if (!pattern.equals(mPattern) || TextUtils.isEmpty(mPattern)) {
@@ -306,7 +307,7 @@ private void listOtherMembers() {
                 iterator.remove();
             } else if (!TextUtils.isEmpty(item.mDisplayName)) {
                 // Add to the display names list
-                displayNamesList.add(item.mDisplayName.toLowerCase());
+                displayNamesList.add(item.mDisplayName.toLowerCase(VectorApp.getApplicationLocale()));
             }
         }
 
@@ -433,14 +434,15 @@ public void onSuccess(SearchUsersResponse searchUsersResponse) {
 
                         mIsOfflineContactsSearch = false;
                         mKnownContactsLimited = (null != searchUsersResponse.limited) ? searchUsersResponse.limited : false;
-                        onKnownContactsSearchEnd(participantItemList, theFirstEntry, searchListener);
+
+                        searchAccountKnownContacts(theFirstEntry, participantItemList, false, searchListener);
                     }
                 }
 
                 private void onError() {
                     if (TextUtils.equals(fPattern, mPattern)) {
                         mIsOfflineContactsSearch = true;
-                        searchAccountKnownContacts(theFirstEntry, searchListener);
+                        searchAccountKnownContacts(theFirstEntry, new ArrayList<ParticipantAdapterItem>(), true, searchListener);
                     }
                 }
 
@@ -460,19 +462,19 @@ public void onUnexpectedError(Exception e) {
                 }
             });
         } else {
-            searchAccountKnownContacts(theFirstEntry, searchListener);
+            searchAccountKnownContacts(theFirstEntry, new ArrayList<ParticipantAdapterItem>(), true, searchListener);
         }
     }
 
     /**
      * Search the known contacts from the account known users list.
      *
-     * @param theFirstEntry  the adapter first entry
-     * @param searchListener the listener
+     * @param theFirstEntry        the adapter first entry
+     * @param participantItemList  the participants initial list
+     * @param sortRoomContactsList true to sort the room contacts list
+     * @param searchListener       the listener
      */
-    private void searchAccountKnownContacts(final ParticipantAdapterItem theFirstEntry, final OnParticipantsSearchListener searchListener) {
-        List<ParticipantAdapterItem> participantItemList = new ArrayList<>();
-
+    private void searchAccountKnownContacts(final ParticipantAdapterItem theFirstEntry, final List<ParticipantAdapterItem> participantItemList, final boolean sortRoomContactsList, final OnParticipantsSearchListener searchListener) {
         // the list is not anymore limited
         mKnownContactsLimited = false;
 
@@ -490,7 +492,7 @@ public void run() {
                         handler.post(new Runnable() {
                             @Override
                             public void run() {
-                                searchAccountKnownContacts(theFirstEntry, searchListener);
+                                searchAccountKnownContacts(theFirstEntry, participantItemList, sortRoomContactsList, searchListener);
                             }
                         });
                     }
@@ -570,7 +572,7 @@ public void run() {
             }
         }
 
-        onKnownContactsSearchEnd(participantItemList, theFirstEntry, searchListener);
+        onKnownContactsSearchEnd(participantItemList, theFirstEntry, sortRoomContactsList, searchListener);
     }
 
     /**
@@ -579,9 +581,10 @@ public void run() {
      *
      * @param participantItemList the known contacts list
      * @param theFirstEntry       the adapter first entry
+     * @param sort                true to sort participantItemList
      * @param searchListener      the search listener
      */
-    private void onKnownContactsSearchEnd(List<ParticipantAdapterItem> participantItemList, final ParticipantAdapterItem theFirstEntry, final OnParticipantsSearchListener searchListener) {
+    private void onKnownContactsSearchEnd(List<ParticipantAdapterItem> participantItemList, final ParticipantAdapterItem theFirstEntry, final boolean sort, final OnParticipantsSearchListener searchListener) {
         // ensure that the PIDs have been retrieved
         // it might have failed
         ContactsManager.getInstance().retrievePids();
@@ -655,7 +658,7 @@ private void onKnownContactsSearchEnd(List<ParticipantAdapterItem> participantIt
         }
 
         if (!TextUtils.isEmpty(mPattern)) {
-            if (roomContactsList.size() > 0) {
+            if ((roomContactsList.size() > 0) && sort) {
                 Collections.sort(roomContactsList, mSortMethod);
             }
             mParticipantsListsList.add(roomContactsList);
diff --git a/vector/src/main/java/im/vector/adapters/VectorPublicRoomsAdapter.java b/vector/src/main/java/im/vector/adapters/VectorPublicRoomsAdapter.java
index b8c74aa48c..fa2f7d7a14 100644
--- a/vector/src/main/java/im/vector/adapters/VectorPublicRoomsAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/VectorPublicRoomsAdapter.java
@@ -29,7 +29,7 @@
 import im.vector.util.VectorUtils;
 
 import org.matrix.androidsdk.MXSession;
-import org.matrix.androidsdk.rest.model.PublicRoom;
+import org.matrix.androidsdk.rest.model.publicroom.PublicRoom;
 
 /**
  * An adapter which can display m.room.member content.
diff --git a/vector/src/main/java/im/vector/adapters/VectorRoomCreationAdapter.java b/vector/src/main/java/im/vector/adapters/VectorRoomCreationAdapter.java
index 1543af6bbb..39c753d372 100755
--- a/vector/src/main/java/im/vector/adapters/VectorRoomCreationAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/VectorRoomCreationAdapter.java
@@ -37,6 +37,7 @@
 
 import im.vector.Matrix;
 import im.vector.R;
+import im.vector.VectorApp;
 import im.vector.util.VectorUtils;
 
 /**
@@ -102,7 +103,7 @@ public void notifyDataSetChanged() {
             ParticipantAdapterItem item = getItem(i);
 
             if (!TextUtils.isEmpty(item.mDisplayName)) {
-                mDisplayNamesList.add(item.mDisplayName.toLowerCase());
+                mDisplayNamesList.add(item.mDisplayName.toLowerCase(VectorApp.getApplicationLocale()));
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/adapters/VectorRoomDetailsMembersAdapter.java b/vector/src/main/java/im/vector/adapters/VectorRoomDetailsMembersAdapter.java
index f0a7f90a9b..8f3a986864 100644
--- a/vector/src/main/java/im/vector/adapters/VectorRoomDetailsMembersAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/VectorRoomDetailsMembersAdapter.java
@@ -37,7 +37,7 @@
 import org.matrix.androidsdk.db.MXMediasCache;
 import org.matrix.androidsdk.rest.model.PowerLevels;
 import org.matrix.androidsdk.rest.model.RoomMember;
-import org.matrix.androidsdk.rest.model.RoomThirdPartyInvite;
+import org.matrix.androidsdk.rest.model.pid.RoomThirdPartyInvite;
 import org.matrix.androidsdk.rest.model.User;
 import org.matrix.androidsdk.util.Log;
 
@@ -48,6 +48,7 @@
 import java.util.HashMap;
 
 import im.vector.R;
+import im.vector.VectorApp;
 import im.vector.activity.CommonActivityUtils;
 import im.vector.util.ThemeUtils;
 import im.vector.util.VectorUtils;
@@ -208,7 +209,7 @@ public void setSearchedPattern(String aPattern, final OnRoomMembersSearchListene
         } else {
             // new pattern different from previous one?
             if (!aPattern.trim().equals(mSearchPattern) || aIsRefreshForced) {
-                mSearchPattern = aPattern.trim().toLowerCase();
+                mSearchPattern = aPattern.trim().toLowerCase(VectorApp.getApplicationLocale());
                 updateRoomMembersDataModel(searchListener);
             } else {
                 // search pattern is identical, notify listener and exit
diff --git a/vector/src/main/java/im/vector/adapters/VectorRoomSummaryAdapter.java b/vector/src/main/java/im/vector/adapters/VectorRoomSummaryAdapter.java
index 47dedd2178..9e05a21443 100644
--- a/vector/src/main/java/im/vector/adapters/VectorRoomSummaryAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/VectorRoomSummaryAdapter.java
@@ -50,6 +50,7 @@
 import im.vector.Matrix;
 import im.vector.PublicRoomsManager;
 import im.vector.R;
+import im.vector.VectorApp;
 import im.vector.util.RiotEventDisplay;
 import im.vector.util.RoomUtils;
 import im.vector.util.ThemeUtils;
@@ -222,7 +223,7 @@ private boolean isMatchedPattern(Room room) {
 
         if (!TextUtils.isEmpty(mSearchedPattern)) {
             String roomName = VectorUtils.getRoomDisplayName(mContext, mMxSession, room);
-            res = (!TextUtils.isEmpty(roomName) && (roomName.toLowerCase().contains(mSearchedPattern)));
+            res = (!TextUtils.isEmpty(roomName) && (roomName.toLowerCase(VectorApp.getApplicationLocale()).contains(mSearchedPattern)));
         }
 
         return res;
@@ -953,7 +954,7 @@ public void setSearchPattern(String pattern) {
         String trimmedPattern = pattern;
 
         if (null != pattern) {
-            trimmedPattern = pattern.trim().toLowerCase();
+            trimmedPattern = pattern.trim().toLowerCase(VectorApp.getApplicationLocale());
             trimmedPattern = TextUtils.getTrimmedLength(trimmedPattern) == 0 ? null : trimmedPattern;
         }
 
diff --git a/vector/src/main/java/im/vector/adapters/VectorSearchFilesListAdapter.java b/vector/src/main/java/im/vector/adapters/VectorSearchFilesListAdapter.java
index 9fb9a64150..896fe3b770 100755
--- a/vector/src/main/java/im/vector/adapters/VectorSearchFilesListAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/VectorSearchFilesListAdapter.java
@@ -29,12 +29,12 @@
 import org.matrix.androidsdk.adapters.MessageRow;
 import org.matrix.androidsdk.data.Room;
 import org.matrix.androidsdk.db.MXMediasCache;
-import org.matrix.androidsdk.rest.model.EncryptedFileInfo;
+import org.matrix.androidsdk.rest.model.crypto.EncryptedFileInfo;
 import org.matrix.androidsdk.rest.model.Event;
-import org.matrix.androidsdk.rest.model.FileMessage;
-import org.matrix.androidsdk.rest.model.ImageMessage;
-import org.matrix.androidsdk.rest.model.Message;
-import org.matrix.androidsdk.rest.model.VideoMessage;
+import org.matrix.androidsdk.rest.model.message.FileMessage;
+import org.matrix.androidsdk.rest.model.message.ImageMessage;
+import org.matrix.androidsdk.rest.model.message.Message;
+import org.matrix.androidsdk.rest.model.message.VideoMessage;
 import org.matrix.androidsdk.util.JsonUtils;
 
 import im.vector.R;
diff --git a/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java b/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java
index e1e8f52102..3ee94b8bd5 100755
--- a/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java
+++ b/vector/src/main/java/im/vector/adapters/VectorSearchMessagesListAdapter.java
@@ -32,6 +32,7 @@
 import org.matrix.androidsdk.db.MXMediasCache;
 import org.matrix.androidsdk.rest.model.Event;
 import org.matrix.androidsdk.util.EventDisplay;
+import org.matrix.androidsdk.util.Log;
 
 import im.vector.R;
 import im.vector.util.RiotEventDisplay;
@@ -41,6 +42,7 @@
  * An adapter which display a list of messages found after a search
  */
 public class VectorSearchMessagesListAdapter extends VectorMessagesAdapter {
+    private static final String LOG_TAG = VectorSearchMessagesListAdapter.class.getSimpleName();
 
     // display the room name in the result view
     private final boolean mDisplayRoomName;
@@ -57,6 +59,7 @@ public VectorSearchMessagesListAdapter(MXSession session, Context context, boole
                 R.layout.adapter_item_vector_search_message_image_video,
                 -1,
                 R.layout.adapter_item_vector_search_message_emoji,
+                R.layout.adapter_item_vector_message_code,
                 mediasCache);
 
         setNotifyOnChange(true);
@@ -87,110 +90,113 @@ protected boolean supportMessageRowMerge(MessageRow row) {
     public View getView(int position, View convertView2, ViewGroup parent) {
         View convertView = super.getView(position, convertView2, parent);
 
-        MessageRow row = getItem(position);
-        Event event = row.getEvent();
-
-        //  some items are always hidden
-        convertView.findViewById(R.id.messagesAdapter_avatars_list).setVisibility(View.GONE);
-        convertView.findViewById(R.id.messagesAdapter_message_separator).setVisibility(View.GONE);
-        convertView.findViewById(R.id.messagesAdapter_action_image).setVisibility(View.GONE);
-        convertView.findViewById(R.id.messagesAdapter_top_margin_when_no_room_name).setVisibility(mDisplayRoomName ? View.GONE : View.VISIBLE);
-        convertView.findViewById(R.id.messagesAdapter_message_header).setVisibility(View.GONE);
+        try {
+            MessageRow row = getItem(position);
+            Event event = row.getEvent();
 
-        Room room = mSession.getDataHandler().getStore().getRoom(event.roomId);
+            //  some items are always hidden
+            convertView.findViewById(R.id.messagesAdapter_avatars_list).setVisibility(View.GONE);
+            convertView.findViewById(R.id.messagesAdapter_message_separator).setVisibility(View.GONE);
+            convertView.findViewById(R.id.messagesAdapter_action_image).setVisibility(View.GONE);
+            convertView.findViewById(R.id.messagesAdapter_top_margin_when_no_room_name).setVisibility(mDisplayRoomName ? View.GONE : View.VISIBLE);
+            convertView.findViewById(R.id.messagesAdapter_message_header).setVisibility(View.GONE);
 
-        RoomState roomState = row.getRoomState();
+            Room room = mSession.getDataHandler().getStore().getRoom(event.roomId);
 
-        if (null == roomState) {
-            roomState = room.getLiveState();
-        }
+            RoomState roomState = row.getRoomState();
 
+            if (null == roomState) {
+                roomState = room.getLiveState();
+            }
 
-        // refresh the avatar
-        ImageView avatarView = convertView.findViewById(R.id.messagesAdapter_roundAvatar).findViewById(R.id.avatar_img);
-        mHelper.loadMemberAvatar(avatarView, row);
+            // refresh the avatar
+            ImageView avatarView = convertView.findViewById(R.id.messagesAdapter_roundAvatar).findViewById(R.id.avatar_img);
+            mHelper.loadMemberAvatar(avatarView, row);
 
-        // display the sender
-        TextView senderTextView = convertView.findViewById(R.id.messagesAdapter_sender);
-        if (senderTextView != null) {
-            senderTextView.setText(VectorMessagesAdapterHelper.getUserDisplayName(event.getSender(), roomState));
-        }
+            // display the sender
+            TextView senderTextView = convertView.findViewById(R.id.messagesAdapter_sender);
+            if (senderTextView != null) {
+                senderTextView.setText(VectorMessagesAdapterHelper.getUserDisplayName(event.getSender(), roomState));
+            }
 
-        // display the body
-        TextView bodyTextView = convertView.findViewById(R.id.messagesAdapter_body);
-        // set the message text
-        EventDisplay display = new RiotEventDisplay(mContext, event, (null != room) ? room.getLiveState() : null);
-        CharSequence text = display.getTextualDisplay();
+            // display the body
+            TextView bodyTextView = convertView.findViewById(R.id.messagesAdapter_body);
+            // set the message text
+            EventDisplay display = new RiotEventDisplay(mContext, event, (null != room) ? room.getLiveState() : null);
+            CharSequence text = display.getTextualDisplay();
 
-        if (null == text) {
-            text = "";
-        }
+            if (null == text) {
+                text = "";
+            }
 
-        try {
-            highlightPattern(bodyTextView, new SpannableString(text), mPattern);
-        } catch (Exception e) {
-            // an exception might be triggered with HTML content
-            // Indeed, the formatting can fail because of the single line display.
-            // in this case, the formatting is ignored.
-            bodyTextView.setText(text.toString());
-        }
+            try {
+                highlightPattern(bodyTextView, new SpannableString(text), mPattern);
+            } catch (Exception e) {
+                // an exception might be triggered with HTML content
+                // Indeed, the formatting can fail because of the single line display.
+                // in this case, the formatting is ignored.
+                bodyTextView.setText(text.toString());
+            }
 
-        // display timestamp
-        TextView timeTextView = convertView.findViewById(R.id.messagesAdapter_timestamp);
-        timeTextView.setText(AdapterUtils.tsToString(mContext, event.getOriginServerTs(), true));
+            // display timestamp
+            TextView timeTextView = convertView.findViewById(R.id.messagesAdapter_timestamp);
+            timeTextView.setText(AdapterUtils.tsToString(mContext, event.getOriginServerTs(), true));
 
-        // display the room name
-        View roomNameLayout = convertView.findViewById(R.id.messagesAdapter_message_room_name_layout);
-        roomNameLayout.setVisibility(mDisplayRoomName ? View.VISIBLE : View.GONE);
+            // display the room name
+            View roomNameLayout = convertView.findViewById(R.id.messagesAdapter_message_room_name_layout);
+            roomNameLayout.setVisibility(mDisplayRoomName ? View.VISIBLE : View.GONE);
 
-        if (mDisplayRoomName) {
-            TextView roomTextView = convertView.findViewById(R.id.messagesAdapter_message_room_name_textview);
-            roomTextView.setText(VectorUtils.getRoomDisplayName(mContext, mSession, room));
-        }
+            if (mDisplayRoomName) {
+                TextView roomTextView = convertView.findViewById(R.id.messagesAdapter_message_room_name_textview);
+                roomTextView.setText(VectorUtils.getRoomDisplayName(mContext, mSession, room));
+            }
 
-        // display the day
-        View dayLayout = convertView.findViewById(R.id.messagesAdapter_search_message_day_separator);
+            // display the day
+            View dayLayout = convertView.findViewById(R.id.messagesAdapter_search_message_day_separator);
 
-        // day separator
-        String headerMessage = headerMessage(position);
+            // day separator
+            String headerMessage = headerMessage(position);
 
-        if (!TextUtils.isEmpty(headerMessage)) {
-            dayLayout.setVisibility(View.VISIBLE);
+            if (!TextUtils.isEmpty(headerMessage)) {
+                dayLayout.setVisibility(View.VISIBLE);
 
-            TextView headerText = convertView.findViewById(R.id.messagesAdapter_message_header_text);
-            headerText.setText(headerMessage);
+                TextView headerText = convertView.findViewById(R.id.messagesAdapter_message_header_text);
+                headerText.setText(headerMessage);
 
-            dayLayout.findViewById(R.id.messagesAdapter_message_header_top_margin).setVisibility(View.GONE);
-            dayLayout.findViewById(R.id.messagesAdapter_message_header_bottom_margin).setVisibility(View.GONE);
-        } else {
-            dayLayout.setVisibility(View.GONE);
-        }
+                dayLayout.findViewById(R.id.messagesAdapter_message_header_top_margin).setVisibility(View.GONE);
+                dayLayout.findViewById(R.id.messagesAdapter_message_header_bottom_margin).setVisibility(View.GONE);
+            } else {
+                dayLayout.setVisibility(View.GONE);
+            }
 
-        // message separator is only displayed when a message is not the last message in a day section
-        convertView.findViewById(R.id.messagesAdapter_search_separator_line).setVisibility(!TextUtils.isEmpty(headerMessage(position + 1)) ? View.GONE : View.VISIBLE);
+            // message separator is only displayed when a message is not the last message in a day section
+            convertView.findViewById(R.id.messagesAdapter_search_separator_line).setVisibility(!TextUtils.isEmpty(headerMessage(position + 1)) ? View.GONE : View.VISIBLE);
 
-        final int fPosition = position;
+            final int fPosition = position;
 
-        convertView.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (null != mVectorMessagesAdapterEventsListener) {
-                    mVectorMessagesAdapterEventsListener.onContentClick(fPosition);
+            convertView.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View v) {
+                    if (null != mVectorMessagesAdapterEventsListener) {
+                        mVectorMessagesAdapterEventsListener.onContentClick(fPosition);
+                    }
                 }
-            }
-        });
+            });
 
 
-        convertView.setOnLongClickListener(new View.OnLongClickListener() {
-            @Override
-            public boolean onLongClick(View v) {
-                if (null != mVectorMessagesAdapterEventsListener) {
-                    return mVectorMessagesAdapterEventsListener.onContentLongClick(fPosition);
-                }
+            convertView.setOnLongClickListener(new View.OnLongClickListener() {
+                @Override
+                public boolean onLongClick(View v) {
+                    if (null != mVectorMessagesAdapterEventsListener) {
+                        return mVectorMessagesAdapterEventsListener.onContentLongClick(fPosition);
+                    }
 
-                return false;
-            }
-        });
+                    return false;
+                }
+            });
+        } catch (Throwable t) {
+            Log.e(LOG_TAG, "## getView() failed " + t.getMessage());
+        }
 
         return convertView;
     }
diff --git a/vector/src/main/java/im/vector/car/CarBroadcastReceiver.java b/vector/src/main/java/im/vector/car/CarBroadcastReceiver.java
index 6cdf49d3f4..638e8b5973 100755
--- a/vector/src/main/java/im/vector/car/CarBroadcastReceiver.java
+++ b/vector/src/main/java/im/vector/car/CarBroadcastReceiver.java
@@ -14,10 +14,10 @@
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.Event;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.message.Message;
 
 import im.vector.Matrix;
-import im.vector.util.NotificationUtils;
+import im.vector.notifications.NotificationUtils;
 
 public class CarBroadcastReceiver extends BroadcastReceiver {
 
diff --git a/vector/src/main/java/im/vector/contacts/Contact.java b/vector/src/main/java/im/vector/contacts/Contact.java
index 936364ef5d..d29cf177e9 100755
--- a/vector/src/main/java/im/vector/contacts/Contact.java
+++ b/vector/src/main/java/im/vector/contacts/Contact.java
@@ -303,20 +303,20 @@ public boolean contains(String pattern) {
         boolean matched = false;
 
         if (!TextUtils.isEmpty(mDisplayName)) {
-            matched = (mDisplayName.toLowerCase().contains(pattern));
+            matched = (mDisplayName.toLowerCase(VectorApp.getApplicationLocale()).contains(pattern));
         }
 
         if (!matched) {
             for (String email : mEmails) {
-                matched |= email.toLowerCase().contains(pattern);
+                matched |= email.toLowerCase(VectorApp.getApplicationLocale()).contains(pattern);
             }
         }
 
         if (!matched) {
             for (PhoneNumber pn : mPhoneNumbers) {
-                matched |= pn.mMsisdnPhoneNumber.toLowerCase().contains(pattern)
-                        || pn.mRawPhoneNumber.toLowerCase().contains(pattern)
-                        || (pn.mE164PhoneNumber != null && pn.mE164PhoneNumber.toLowerCase().contains(pattern));
+                matched |= pn.mMsisdnPhoneNumber.toLowerCase(VectorApp.getApplicationLocale()).contains(pattern)
+                        || pn.mRawPhoneNumber.toLowerCase(VectorApp.getApplicationLocale()).contains(pattern)
+                        || (pn.mE164PhoneNumber != null && pn.mE164PhoneNumber.toLowerCase(VectorApp.getApplicationLocale()).contains(pattern));
             }
         }
 
diff --git a/vector/src/main/java/im/vector/contacts/PIDsRetriever.java b/vector/src/main/java/im/vector/contacts/PIDsRetriever.java
index 0cb8481714..190d29a741 100755
--- a/vector/src/main/java/im/vector/contacts/PIDsRetriever.java
+++ b/vector/src/main/java/im/vector/contacts/PIDsRetriever.java
@@ -26,7 +26,7 @@
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.ThreePid;
+import org.matrix.androidsdk.rest.model.pid.ThreePid;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -37,6 +37,7 @@
 import java.util.Set;
 
 import im.vector.Matrix;
+import im.vector.VectorApp;
 
 /**
  * retrieve the contact matrix IDs
@@ -177,7 +178,7 @@ private Set<String> retrieveMatrixIds(List<Contact> contacts) {
      * @return true if the matrix Ids have been retrieved
      */
     public void retrieveMatrixIds(final Context context, final List<Contact> contacts, final boolean localUpdateOnly) {
-        Log.d(LOG_TAG, String.format("retrieveMatrixIds starts for %d contacts", contacts == null ? 0 : contacts.size()));
+        Log.d(LOG_TAG, String.format(VectorApp.getApplicationLocale(), "retrieveMatrixIds starts for %d contacts", contacts == null ? 0 : contacts.size()));
         // sanity checks
         if ((null == contacts) || (0 == contacts.size())) {
             if (null != mListener) {
diff --git a/vector/src/main/java/im/vector/db/VectorContentProvider.java b/vector/src/main/java/im/vector/db/VectorContentProvider.java
index e611f0d470..19eb8abf52 100755
--- a/vector/src/main/java/im/vector/db/VectorContentProvider.java
+++ b/vector/src/main/java/im/vector/db/VectorContentProvider.java
@@ -22,9 +22,10 @@
 import android.database.Cursor;
 import android.net.Uri;
 import android.os.ParcelFileDescriptor;
-import android.util.Log;
 import android.webkit.MimeTypeMap;
 
+import org.matrix.androidsdk.util.Log;
+
 import java.io.File;
 import java.io.FileNotFoundException;
 
@@ -97,7 +98,7 @@ public int delete(Uri arg0, String arg1, String[] arg2) {
     @Override
     public String getType(Uri arg0) {
         String type = null;
-        String extension = MimeTypeMap.getFileExtensionFromUrl(arg0.toString().toLowerCase());
+        String extension = MimeTypeMap.getFileExtensionFromUrl(arg0.toString().toLowerCase(VectorApp.getApplicationLocale()));
         if (extension != null) {
             MimeTypeMap mime = MimeTypeMap.getSingleton();
             type = mime.getMimeTypeFromExtension(extension);
diff --git a/vector/src/main/java/im/vector/fragments/AbsHomeFragment.java b/vector/src/main/java/im/vector/fragments/AbsHomeFragment.java
index 470fcf1e4f..707f80940d 100644
--- a/vector/src/main/java/im/vector/fragments/AbsHomeFragment.java
+++ b/vector/src/main/java/im/vector/fragments/AbsHomeFragment.java
@@ -32,6 +32,7 @@
 import org.matrix.androidsdk.data.RoomSummary;
 import org.matrix.androidsdk.data.RoomTag;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
+import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
 import org.matrix.androidsdk.rest.model.MatrixError;
 import org.matrix.androidsdk.util.BingRulesManager;
 import org.matrix.androidsdk.util.Log;
@@ -53,7 +54,7 @@
 /**
  * Abstract fragment providing the universal search
  */
-public abstract class AbsHomeFragment extends Fragment implements AbsAdapter.InvitationListener, AbsAdapter.MoreRoomActionListener, RoomUtils.MoreActionListener {
+public abstract class AbsHomeFragment extends Fragment implements AbsAdapter.RoomInvitationListener, AbsAdapter.MoreRoomActionListener, RoomUtils.MoreActionListener {
 
     private static final String LOG_TAG = AbsHomeFragment.class.getSimpleName();
     private static final String CURRENT_FILTER = "CURRENT_FILTER";
@@ -107,7 +108,9 @@ public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
     public void onActivityCreated(final Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
-        mActivity = (VectorHomeActivity) getActivity();
+        if (getActivity() instanceof VectorHomeActivity) {
+            mActivity = (VectorHomeActivity) getActivity();
+        }
         mSession = Matrix.getInstance(getActivity()).getDefaultSession();
 
         if (savedInstanceState != null && savedInstanceState.containsKey(CURRENT_FILTER)) {
@@ -119,7 +122,7 @@ public void onActivityCreated(final Bundle savedInstanceState) {
     @CallSuper
     public void onResume() {
         super.onResume();
-        if (mPrimaryColor != -1) {
+        if ((mPrimaryColor != -1) && (null != mActivity)) {
             mActivity.updateTabStyle(mPrimaryColor, mSecondaryColor != -1 ? mSecondaryColor : mPrimaryColor);
         }
     }
@@ -171,7 +174,7 @@ public void onPreviewRoom(MXSession session, String roomId) {
     @Override
     public void onRejectInvitation(MXSession session, String roomId) {
         Log.i(LOG_TAG, "onRejectInvitation " + roomId);
-        mActivity.onRejectInvitation(session, roomId);
+        mActivity.onRejectInvitation(roomId, null);
     }
 
     @Override
@@ -184,9 +187,9 @@ public void onMoreActionClick(View itemView, Room room) {
     }
 
     @Override
-    public void onToggleRoomNotifications(MXSession session, String roomId) {
+    public void onUpdateRoomNotificationsState(MXSession session, String roomId, BingRulesManager.RoomNotificationState state) {
         mActivity.showWaitingView();
-        RoomUtils.toggleNotifications(session, roomId, new BingRulesManager.onBingRuleUpdateListener() {
+        session.getDataHandler().getBingRulesManager().updateRoomNotificationState(roomId, state, new BingRulesManager.onBingRuleUpdateListener() {
             @Override
             public void onBingRuleUpdateSuccess() {
                 onRequestDone(null);
@@ -249,15 +252,36 @@ public void onLeaveRoom(final MXSession session, final String roomId) {
             @Override
             public void onClick(DialogInterface dialog, int which) {
                 if (mActivity != null && !mActivity.isFinishing()) {
-                    mActivity.onRejectInvitation(session, roomId);
-                    if (mOnRoomChangedListener != null) {
-                        mOnRoomChangedListener.onRoomLeft(roomId);
-                    }
+                    mActivity.onRejectInvitation(roomId, new SimpleApiCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void info) {
+                            if (mOnRoomChangedListener != null) {
+                                mOnRoomChangedListener.onRoomLeft(roomId);
+                            }
+                        }
+                    });
+                }
+            }
+        });
+    }
+
+    @Override
+    public void onForgetRoom(final MXSession session, final String roomId) {
+        mActivity.onForgetRoom(roomId, new SimpleApiCallback<Void>() {
+            @Override
+            public void onSuccess(Void info) {
+                if (mOnRoomChangedListener != null) {
+                    mOnRoomChangedListener.onRoomForgot(roomId);
                 }
             }
         });
     }
 
+    @Override
+    public void addHomeScreenShortcut(MXSession session, String roomId) {
+        RoomUtils.addHomeScreenShortcut(getActivity(), session, roomId);
+    }
+
     /*
      * *********************************************************************************************
      * Public methods
@@ -330,6 +354,15 @@ void openRoom(final Room room) {
         }
     }
 
+    /**
+     * Manage the fab actions
+     *
+     * @return true if the fragment has a dedicated action.
+     */
+    public boolean onFabClick() {
+        return false;
+    }
+
     /*
      * *********************************************************************************************
      * Private methods
@@ -461,5 +494,7 @@ public interface OnRoomChangedListener {
         void onToggleDirectChat(final String roomId, final boolean isDirectChat);
 
         void onRoomLeft(final String roomId);
+
+        void onRoomForgot(final String roomId);
     }
 }
diff --git a/vector/src/main/java/im/vector/fragments/GroupDetailsBaseFragment.java b/vector/src/main/java/im/vector/fragments/GroupDetailsBaseFragment.java
new file mode 100755
index 0000000000..4d98f7af2e
--- /dev/null
+++ b/vector/src/main/java/im/vector/fragments/GroupDetailsBaseFragment.java
@@ -0,0 +1,97 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.fragments;
+
+import android.content.Context;
+import android.os.Bundle;
+import android.support.annotation.CallSuper;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
+import android.view.View;
+import android.view.inputmethod.InputMethodManager;
+
+import org.matrix.androidsdk.MXSession;
+
+import butterknife.ButterKnife;
+import butterknife.Unbinder;
+import im.vector.Matrix;
+import im.vector.activity.VectorGroupDetailsActivity;
+
+public abstract class GroupDetailsBaseFragment extends Fragment {
+    private static final String LOG_TAG = GroupDetailsBaseFragment.class.getSimpleName();
+
+    private static final String CURRENT_FILTER = "CURRENT_FILTER";
+
+    protected MXSession mSession;
+    protected VectorGroupDetailsActivity mActivity;
+
+    // Butterknife unbinder
+    private Unbinder mUnBinder;
+
+    @Override
+    public void onActivityCreated(final Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        mSession = Matrix.getInstance(getContext()).getDefaultSession();
+        mActivity = (VectorGroupDetailsActivity) getActivity();
+
+        initViews();
+    }
+
+    @Override
+    @CallSuper
+    public void onViewCreated(View view, @Nullable Bundle savedInstanceState) {
+        super.onViewCreated(view, savedInstanceState);
+        mUnBinder = ButterKnife.bind(this, view);
+    }
+
+    @Override
+    @CallSuper
+    public void onDestroyView() {
+        super.onDestroyView();
+        mUnBinder.unbind();
+    }
+
+    @Override
+    @CallSuper
+    public void onDetach() {
+        super.onDetach();
+        mActivity = null;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+
+        if (null != mActivity) {
+            // dismiss the keyboard when swiping
+            final View view = mActivity.getCurrentFocus();
+            if (view != null) {
+                final InputMethodManager inputMethodManager = (InputMethodManager) mActivity.getSystemService(Context.INPUT_METHOD_SERVICE);
+                inputMethodManager.hideSoftInputFromWindow(view.getWindowToken(), 0);
+            }
+        }
+    }
+    /*
+     * *********************************************************************************************
+     * Abstract methods
+     * *********************************************************************************************
+     */
+
+    protected abstract void initViews();
+    public abstract void refreshViews();
+}
diff --git a/vector/src/main/java/im/vector/fragments/GroupDetailsHomeFragment.java b/vector/src/main/java/im/vector/fragments/GroupDetailsHomeFragment.java
new file mode 100755
index 0000000000..3d52c421cb
--- /dev/null
+++ b/vector/src/main/java/im/vector/fragments/GroupDetailsHomeFragment.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.fragments;
+
+import android.os.Bundle;
+
+import android.support.v4.content.ContextCompat;
+
+import android.text.Html;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import org.matrix.androidsdk.rest.model.group.Group;
+
+import butterknife.BindView;
+import im.vector.R;
+import im.vector.activity.CommonActivityUtils;
+import im.vector.util.VectorImageGetter;
+import im.vector.util.VectorUtils;
+
+public class GroupDetailsHomeFragment extends GroupDetailsBaseFragment {
+    private static final String LOG_TAG = GroupDetailsHomeFragment.class.getSimpleName();
+
+    @BindView(R.id.group_avatar)
+    ImageView mGroupAvatar;
+
+    @BindView(R.id.group_name_text_view)
+    TextView mGroupNameTextView;
+
+    @BindView(R.id.group_topic_text_view)
+    TextView mGroupTopicTextView;
+
+    @BindView(R.id.group_members_icon_view)
+    ImageView mGroupMembersIconView;
+
+    @BindView(R.id.group_members_text_view)
+    TextView mGroupMembersTextView;
+
+    @BindView(R.id.group_rooms_icon_view)
+    ImageView mGroupRoomsIconView;
+
+    @BindView(R.id.group_rooms_text_view)
+    TextView mGroupRoomsTextView;
+
+    @BindView(R.id.html_text_view)
+    TextView mGroupHtmlTextView;
+
+    @BindView(R.id.no_html_text_view)
+    TextView noLongDescriptionTextView;
+
+    private VectorImageGetter mImageGetter;
+
+    /*
+     * *********************************************************************************************
+     * Fragment lifecycle
+     * *********************************************************************************************
+     */
+
+    @Override
+    public void onActivityCreated(final Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        if (null == mImageGetter) {
+            mImageGetter = new VectorImageGetter(mSession);
+        }
+    }
+
+    @Override
+    public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_group_details_home, container, false);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mImageGetter.setListener(null);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refreshViews();
+
+        mImageGetter.setListener(new VectorImageGetter.OnImageDownloadListener() {
+            @Override
+            public void onImageDownloaded(String source) {
+                // invalidate the text
+                refreshLongDescription();
+            }
+        });
+    }
+
+    /*
+     * *********************************************************************************************
+     * UI management
+     * *********************************************************************************************
+     */
+    @Override
+    protected void initViews() {
+        mGroupMembersIconView.setImageDrawable(CommonActivityUtils.tintDrawableWithColor(ContextCompat.getDrawable(mActivity, R.drawable.riot_tab_groups), mGroupMembersTextView.getCurrentTextColor()));
+        mGroupRoomsIconView.setImageDrawable(CommonActivityUtils.tintDrawableWithColor(ContextCompat.getDrawable(mActivity, R.drawable.riot_tab_rooms), mGroupMembersTextView.getCurrentTextColor()));
+    }
+
+    /*
+     * *********************************************************************************************
+     * Data management
+     * *********************************************************************************************
+     */
+
+    @Override
+    public void refreshViews() {
+        Group group = mActivity.getGroup();
+
+        VectorUtils.loadGroupAvatar(mActivity, mSession, mGroupAvatar, group);
+
+        mGroupNameTextView.setText(group.getDisplayName());
+
+        mGroupTopicTextView.setText(group.getShortDescription());
+        mGroupTopicTextView.setVisibility(TextUtils.isEmpty(mGroupTopicTextView.getText()) ? View.GONE : View.VISIBLE);
+
+        int roomCount = (null != group.getGroupRooms()) ? group.getGroupRooms().getEstimatedRoomCount() : 0;
+        int memberCount = (null != group.getGroupUsers()) ? group.getGroupUsers().getEstimatedUsersCount() : 1;
+
+        mGroupRoomsTextView.setText((1 == roomCount) ? getString(R.string.group_one_room) : getString(R.string.group_rooms, roomCount));
+        mGroupMembersTextView.setText((1 == memberCount) ? getString(R.string.group_one_member) : getString(R.string.group_members, memberCount));
+
+        if (!TextUtils.isEmpty(group.getLongDescription())) {
+            mGroupHtmlTextView.setVisibility(View.VISIBLE);
+            refreshLongDescription();
+            noLongDescriptionTextView.setVisibility(View.GONE);
+        } else {
+            noLongDescriptionTextView.setVisibility(View.VISIBLE);
+            mGroupHtmlTextView.setVisibility(View.GONE);
+        }
+    }
+
+    /**
+     * Update the long description text
+     */
+    private void refreshLongDescription() {
+        if (null != mGroupHtmlTextView) {
+            Group group = mActivity.getGroup();
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.N) {
+                mGroupHtmlTextView.setText(Html.fromHtml(group.getLongDescription(), Html.FROM_HTML_MODE_LEGACY, mImageGetter, null));
+            } else {
+                mGroupHtmlTextView.setText(Html.fromHtml(group.getLongDescription(), mImageGetter, null));
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/fragments/GroupDetailsPeopleFragment.java b/vector/src/main/java/im/vector/fragments/GroupDetailsPeopleFragment.java
new file mode 100755
index 0000000000..fecfed1ecb
--- /dev/null
+++ b/vector/src/main/java/im/vector/fragments/GroupDetailsPeopleFragment.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright 2016 OpenMarket Ltd
+ * Copyright 2017 Vector Creations Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.fragments;
+
+import android.os.Bundle;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SearchView;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Filter;
+
+import org.matrix.androidsdk.rest.model.group.GroupUser;
+
+import butterknife.BindView;
+import im.vector.R;
+
+import im.vector.adapters.GroupDetailsPeopleAdapter;
+import im.vector.util.GroupUtils;
+import im.vector.view.EmptyViewItemDecoration;
+import im.vector.view.SimpleDividerItemDecoration;
+
+public class GroupDetailsPeopleFragment extends GroupDetailsBaseFragment {
+    @BindView(R.id.recyclerview)
+    RecyclerView mRecycler;
+
+    @BindView(R.id.search_view)
+    SearchView mSearchView;
+
+    private GroupDetailsPeopleAdapter mAdapter;
+    private String mCurrentFilter;
+
+    @Override
+    public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_group_details_people, container, false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refreshViews();
+    }
+
+    @Override
+    public void onActivityCreated(final Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mCurrentFilter = mSearchView.getQuery().toString();
+        mAdapter.onFilterDone(mCurrentFilter);
+    }
+    /*
+     * *********************************************************************************************
+     * UI management
+     * *********************************************************************************************
+     */
+
+    /**
+     * Prepare views
+     */
+    @Override
+    protected void initViews() {
+        int margin = (int) getResources().getDimension(R.dimen.item_decoration_left_margin);
+        mRecycler.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+        mRecycler.addItemDecoration(new SimpleDividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL, margin));
+        mRecycler.addItemDecoration(new EmptyViewItemDecoration(getActivity(), DividerItemDecoration.VERTICAL, 40, 16, 14));
+        mAdapter = new GroupDetailsPeopleAdapter(getActivity(), new GroupDetailsPeopleAdapter.OnSelectUserListener() {
+            @Override
+            public void onSelectItem(GroupUser user, int position) {
+                GroupUtils.openGroupUserPage(mActivity, mSession, user);
+            }
+        });
+        mRecycler.setAdapter(mAdapter);
+
+        mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(final String newText) {
+                if (!TextUtils.equals(mCurrentFilter, newText)) {
+                    mAdapter.getFilter().filter(newText, new Filter.FilterListener() {
+                        @Override
+                        public void onFilterComplete(int count) {
+                            mCurrentFilter = newText;
+                        }
+                    });
+                }
+                return true;
+            }
+        });
+
+        mSearchView.setMaxWidth(Integer.MAX_VALUE);
+        mSearchView.setQueryHint(getString(R.string.filter_group_members));
+        mSearchView.setFocusable(false);
+        mSearchView.setIconifiedByDefault(false);
+        mSearchView.clearFocus();
+    }
+
+    @Override
+    public void refreshViews() {
+        mAdapter.setJoinedGroupUsers(mActivity.getGroup().getGroupUsers().getUsers());
+        mAdapter.setInvitedGroupUsers(mActivity.getGroup().getInvitedGroupUsers().getUsers());
+    }
+}
diff --git a/vector/src/main/java/im/vector/fragments/GroupDetailsRoomsFragment.java b/vector/src/main/java/im/vector/fragments/GroupDetailsRoomsFragment.java
new file mode 100755
index 0000000000..1e032843f8
--- /dev/null
+++ b/vector/src/main/java/im/vector/fragments/GroupDetailsRoomsFragment.java
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2016 OpenMarket Ltd
+ * Copyright 2017 Vector Creations Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.fragments;
+
+import android.os.Bundle;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.SearchView;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Filter;
+
+import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
+import org.matrix.androidsdk.rest.model.group.GroupRoom;
+
+import butterknife.BindView;
+import im.vector.R;
+import im.vector.adapters.GroupDetailsRoomsAdapter;
+import im.vector.util.GroupUtils;
+import im.vector.view.EmptyViewItemDecoration;
+import im.vector.view.SimpleDividerItemDecoration;
+
+public class GroupDetailsRoomsFragment extends GroupDetailsBaseFragment {
+    @BindView(R.id.recyclerview)
+    RecyclerView mRecycler;
+
+    @BindView(R.id.search_view)
+    SearchView mSearchView;
+
+    private GroupDetailsRoomsAdapter mAdapter;
+    private String mCurrentFilter;
+
+    @Override
+    public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_group_details_rooms, container, false);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        refreshViews();
+    }
+
+    @Override
+    public void onActivityCreated(final Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+        mCurrentFilter = mSearchView.getQuery().toString();
+        mAdapter.onFilterDone(mCurrentFilter);
+    }
+
+    /*
+     * *********************************************************************************************
+     * UI management
+     * *********************************************************************************************
+     */
+
+    /**
+     * Prepare views
+     */
+    @Override
+    protected void initViews() {
+        int margin = (int) getResources().getDimension(R.dimen.item_decoration_left_margin);
+        mRecycler.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+        mRecycler.addItemDecoration(new SimpleDividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL, margin));
+        mRecycler.addItemDecoration(new EmptyViewItemDecoration(getActivity(), DividerItemDecoration.VERTICAL, 40, 16, 14));
+        mAdapter = new GroupDetailsRoomsAdapter(getActivity(), new GroupDetailsRoomsAdapter.OnSelectRoomListener() {
+            @Override
+            public void onSelectItem(GroupRoom groupRoom, int position) {
+                mActivity.showWaitingView();
+                GroupUtils.openGroupRoom(mActivity, mSession, groupRoom, new SimpleApiCallback<Void>() {
+                    @Override
+                    public void onSuccess(Void info) {
+                        mActivity.stopWaitingView();
+                    }
+                });
+            }
+        });
+        mRecycler.setAdapter(mAdapter);
+
+        mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
+            @Override
+            public boolean onQueryTextSubmit(String query) {
+                return true;
+            }
+
+            @Override
+            public boolean onQueryTextChange(final String newText) {
+                if (!TextUtils.equals(mCurrentFilter, newText)) {
+                    mAdapter.getFilter().filter(newText, new Filter.FilterListener() {
+                        @Override
+                        public void onFilterComplete(int count) {
+                            mCurrentFilter = newText;
+                        }
+                    });
+                }
+                return true;
+            }
+        });
+        mSearchView.setMaxWidth(Integer.MAX_VALUE);
+        mSearchView.setQueryHint(getString(R.string.filter_group_rooms));
+        mSearchView.setFocusable(false);
+        mSearchView.setIconifiedByDefault(false);
+        mSearchView.clearFocus();
+    }
+
+    @Override
+    public void refreshViews() {
+        mAdapter.setGroupRooms(mActivity.getGroup().getGroupRooms().getRoomsList());
+    }
+}
diff --git a/vector/src/main/java/im/vector/fragments/GroupsFragment.java b/vector/src/main/java/im/vector/fragments/GroupsFragment.java
new file mode 100644
index 0000000000..7db8db0e07
--- /dev/null
+++ b/vector/src/main/java/im/vector/fragments/GroupsFragment.java
@@ -0,0 +1,469 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.fragments;
+
+import android.annotation.SuppressLint;
+import android.app.AlertDialog;
+import android.content.Context;
+import android.content.DialogInterface;
+import android.content.Intent;
+import android.os.Build;
+import android.os.Bundle;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.widget.DividerItemDecoration;
+import android.support.v7.widget.LinearLayoutManager;
+import android.support.v7.widget.RecyclerView;
+import android.text.Editable;
+import android.text.TextWatcher;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.MenuItem;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
+import android.widget.EditText;
+import android.widget.Filter;
+import android.widget.PopupMenu;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.data.Room;
+import org.matrix.androidsdk.groups.GroupsManager;
+import org.matrix.androidsdk.listeners.MXEventListener;
+import org.matrix.androidsdk.rest.callback.ApiCallback;
+import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
+import org.matrix.androidsdk.rest.model.MatrixError;
+import org.matrix.androidsdk.rest.model.group.Group;
+import org.matrix.androidsdk.util.Log;
+
+import java.lang.reflect.Field;
+import java.lang.reflect.Method;
+import java.util.ArrayList;
+
+import java.util.List;
+
+import butterknife.BindView;
+import im.vector.R;
+import im.vector.activity.CommonActivityUtils;
+import im.vector.activity.VectorGroupDetailsActivity;
+import im.vector.adapters.AbsAdapter;
+import im.vector.adapters.GroupAdapter;
+import im.vector.util.ThemeUtils;
+import im.vector.util.VectorUtils;
+import im.vector.view.EmptyViewItemDecoration;
+import im.vector.view.SimpleDividerItemDecoration;
+
+public class GroupsFragment extends AbsHomeFragment {
+    private static final String LOG_TAG = GroupsFragment.class.getSimpleName();
+
+    @BindView(R.id.recyclerview)
+    RecyclerView mRecycler;
+
+    // groups management
+    private GroupAdapter mAdapter;
+    private GroupsManager mGroupsManager;
+
+    // rooms list
+    private final List<Group> mJoinedGroups = new ArrayList<>();
+    private final List<Group> mInvitedGroups = new ArrayList<>();
+
+    // refresh when there is a group event
+    private final MXEventListener mEventListener = new MXEventListener() {
+        @Override
+        public void onNewGroupInvitation(String groupId) {
+            refreshGroups();
+        }
+
+        @Override
+        public void onJoinGroup(String groupId) {
+            refreshGroups();
+        }
+
+        @Override
+        public void onLeaveGroup(String groupId) {
+            refreshGroups();
+        }
+    };
+
+    /*
+     * *********************************************************************************************
+     * Static methods
+     * *********************************************************************************************
+     */
+
+    public static GroupsFragment newInstance() {
+        return new GroupsFragment();
+    }
+
+    /*
+     * *********************************************************************************************
+     * Fragment lifecycle
+     * *********************************************************************************************
+     */
+
+    @Override
+    public View onCreateView(final LayoutInflater inflater, final ViewGroup container, final Bundle savedInstanceState) {
+        return inflater.inflate(R.layout.fragment_groups, container, false);
+    }
+
+    @Override
+    public void onActivityCreated(final Bundle savedInstanceState) {
+        super.onActivityCreated(savedInstanceState);
+
+        mGroupsManager = mSession.getGroupsManager();
+        mPrimaryColor = ContextCompat.getColor(getActivity(), R.color.tab_groups);
+        mSecondaryColor = ContextCompat.getColor(getActivity(), R.color.tab_groups_secondary);
+
+        initViews();
+
+        mAdapter.onFilterDone(mCurrentFilter);
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        mSession.getDataHandler().addListener(mEventListener);
+        mRecycler.addOnScrollListener(mScrollListener);
+        refreshGroupsAndProfiles();
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        mSession.getDataHandler().removeListener(mEventListener);
+        mRecycler.removeOnScrollListener(mScrollListener);
+    }
+
+    /*
+     * *********************************************************************************************
+     * Abstract methods implementation
+     * *********************************************************************************************
+     */
+
+    @Override
+    protected List<Room> getRooms() {
+        return new ArrayList<>();
+    }
+
+    @Override
+    protected void onFilter(String pattern, final OnFilterListener listener) {
+        mAdapter.getFilter().filter(pattern, new Filter.FilterListener() {
+            @Override
+            public void onFilterComplete(int count) {
+                Log.i(LOG_TAG, "onFilterComplete " + count);
+                if (listener != null) {
+                    listener.onFilterDone(count);
+                }
+            }
+        });
+    }
+
+    @Override
+    protected void onResetFilter() {
+        mAdapter.getFilter().filter("", new Filter.FilterListener() {
+            @Override
+            public void onFilterComplete(int count) {
+                Log.i(LOG_TAG, "onResetFilter " + count);
+            }
+        });
+    }
+
+    /*
+     * *********************************************************************************************
+     * UI management
+     * *********************************************************************************************
+     */
+
+    private void initViews() {
+        int margin = (int) getResources().getDimension(R.dimen.item_decoration_left_margin);
+        mRecycler.setLayoutManager(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false));
+        mRecycler.addItemDecoration(new SimpleDividerItemDecoration(getActivity(), DividerItemDecoration.VERTICAL, margin));
+        mRecycler.addItemDecoration(new EmptyViewItemDecoration(getActivity(), DividerItemDecoration.VERTICAL, 40, 16, 14));
+
+        mAdapter = new GroupAdapter(getActivity(), new GroupAdapter.OnGroupSelectItemListener() {
+            @Override
+            public void onSelectItem(final Group group, final int position) {
+                // display it
+                Intent intent = new Intent(getActivity(), VectorGroupDetailsActivity.class);
+                intent.putExtra(VectorGroupDetailsActivity.EXTRA_GROUP_ID, group.getGroupId());
+                intent.putExtra(VectorGroupDetailsActivity.EXTRA_MATRIX_ID, mSession.getCredentials().userId);
+                startActivity(intent);
+            }
+
+            @Override
+            public boolean onLongPressItem(Group item, int position) {
+                VectorUtils.copyToClipboard(getActivity(), item.getGroupId());
+                return true;
+            }
+        }, new AbsAdapter.GroupInvitationListener() {
+            @Override
+            public void onJoinGroup(MXSession session, String groupId) {
+                mActivity.showWaitingView();
+                mGroupsManager.joinGroup(groupId, new ApiCallback<Void>() {
+
+                    private void onDone(String errorMessage) {
+                        if ((null != errorMessage) && (null != getActivity())) {
+                            Toast.makeText(getActivity(), errorMessage, Toast.LENGTH_SHORT).show();
+                        }
+                        mActivity.stopWaitingView();
+                    }
+
+                    @Override
+                    public void onSuccess(Void info) {
+                        onDone(null);
+                    }
+
+                    @Override
+                    public void onNetworkError(Exception e) {
+                        onDone(e.getLocalizedMessage());
+                    }
+
+                    @Override
+                    public void onMatrixError(MatrixError e) {
+                        onDone(e.getLocalizedMessage());
+                    }
+
+                    @Override
+                    public void onUnexpectedError(Exception e) {
+                        onDone(e.getLocalizedMessage());
+                    }
+                });
+            }
+
+            @Override
+            public void onRejectInvitation(MXSession session, String groupId) {
+                leaveOrReject(groupId);
+            }
+        }, new AbsAdapter.MoreGroupActionListener() {
+            @Override
+            public void onMoreActionClick(View itemView, Group group) {
+                displayGroupPopupMenu(group, itemView);
+            }
+        });
+
+        mRecycler.setAdapter(mAdapter);
+    }
+
+    /**
+     * Refresh the groups list
+     */
+    private void refreshGroups() {
+        mJoinedGroups.clear();
+        mJoinedGroups.addAll(mGroupsManager.getJoinedGroups());
+        mAdapter.setGroups(mJoinedGroups);
+
+        mInvitedGroups.clear();
+        mInvitedGroups.addAll(mGroupsManager.getInvitedGroups());
+        mAdapter.setInvitedGroups(mInvitedGroups);
+    }
+
+    /**
+     * refresh the groups list and their profiles.
+     */
+    private void refreshGroupsAndProfiles() {
+        refreshGroups();
+        mSession.getGroupsManager().refreshGroupProfiles(new SimpleApiCallback<Void>() {
+            @Override
+            public void onSuccess(Void info) {
+                if ((null != mActivity) && !mActivity.isFinishing()) {
+                    mAdapter.notifyDataSetChanged();
+                }
+            }
+        });
+    }
+
+    /**
+     * Leave or reject a group invitation.
+     *
+     * @param groupId the group Id
+     */
+    private void leaveOrReject(String groupId) {
+        mActivity.showWaitingView();
+        mGroupsManager.leaveGroup(groupId, new ApiCallback<Void>() {
+
+            private void onDone(String errorMessage) {
+                if ((null != errorMessage) && (null != getActivity())) {
+                    Toast.makeText(getActivity(), errorMessage, Toast.LENGTH_SHORT).show();
+                }
+                mActivity.stopWaitingView();
+            }
+
+            @Override
+            public void onSuccess(Void info) {
+                onDone(null);
+            }
+
+            @Override
+            public void onNetworkError(Exception e) {
+                onDone(e.getLocalizedMessage());
+            }
+
+            @Override
+            public void onMatrixError(MatrixError e) {
+                onDone(e.getLocalizedMessage());
+            }
+
+            @Override
+            public void onUnexpectedError(Exception e) {
+                onDone(e.getLocalizedMessage());
+            }
+        });
+    }
+
+    @SuppressLint("NewApi")
+    private void displayGroupPopupMenu(final Group group, final View actionView) {
+        final Context context = getActivity();
+        final PopupMenu popup;
+
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
+            popup = new PopupMenu(context, actionView, Gravity.END);
+        } else {
+            popup = new PopupMenu(context, actionView);
+        }
+        popup.getMenuInflater().inflate(R.menu.vector_home_group_settings, popup.getMenu());
+        CommonActivityUtils.tintMenuIcons(popup.getMenu(), ThemeUtils.getColor(context, R.attr.settings_icon_tint_color));
+
+
+        popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
+            @Override
+            public boolean onMenuItemClick(final MenuItem item) {
+                switch (item.getItemId()) {
+                    case R.id.ic_action_select_remove_group: {
+                        leaveOrReject(group.getGroupId());
+                        break;
+                    }
+                }
+                return false;
+            }
+        });
+
+
+        // force to display the icon
+        try {
+            Field[] fields = popup.getClass().getDeclaredFields();
+            for (Field field : fields) {
+                if ("mPopup".equals(field.getName())) {
+                    field.setAccessible(true);
+                    Object menuPopupHelper = field.get(popup);
+                    Class<?> classPopupHelper = Class.forName(menuPopupHelper.getClass().getName());
+                    Method setForceIcons = classPopupHelper.getMethod("setForceShowIcon", boolean.class);
+                    setForceIcons.invoke(menuPopupHelper, true);
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "## displayGroupPopupMenu() : failed " + e.getMessage());
+        }
+
+        popup.show();
+    }
+
+    @Override
+    public boolean onFabClick() {
+        AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(getActivity());
+        View dialogView = getActivity().getLayoutInflater().inflate(R.layout.dialog_create_group, null);
+        alertDialogBuilder.setView(dialogView);
+
+        final EditText nameEditText = dialogView.findViewById(R.id.community_name_edit_text);
+        final EditText idEditText = dialogView.findViewById(R.id.community_id_edit_text);
+        final String hostName = mSession.getHomeServerConfig().getHomeserverUri().getHost();
+        TextView hsNameView = dialogView.findViewById(R.id.community_hs_name_text_view);
+        hsNameView.setText(":" + hostName);
+
+        // set dialog message
+        alertDialogBuilder
+                .setCancelable(false)
+                .setTitle(R.string.create_community)
+                .setPositiveButton(R.string.create, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(final DialogInterface dialog, final int which) {
+                        String localPart = idEditText.getText().toString().trim();
+                        String groupName = nameEditText.getText().toString().trim();
+
+                        mActivity.showWaitingView();
+
+                        mGroupsManager.createGroup(localPart, groupName, new ApiCallback<String>() {
+                            private void onDone(String errorMessage) {
+                                if (null != getActivity()) {
+                                    if (null != errorMessage) {
+                                        Toast.makeText(getActivity(), errorMessage, Toast.LENGTH_LONG).show();
+                                    }
+
+                                    mActivity.stopWaitingView();
+
+                                    refreshGroups();
+                                }
+                            }
+
+                            @Override
+                            public void onSuccess(String groupId) {
+                                onDone(null);
+                            }
+
+                            @Override
+                            public void onNetworkError(Exception e) {
+                                onDone(e.getLocalizedMessage());
+                            }
+
+                            @Override
+                            public void onMatrixError(MatrixError e) {
+                                onDone(e.getLocalizedMessage());
+                            }
+
+                            @Override
+                            public void onUnexpectedError(Exception e) {
+                                onDone(e.getLocalizedMessage());
+                            }
+                        });
+                    }
+                })
+                .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
+                    @Override
+                    public void onClick(DialogInterface dialog, int which) {
+                        dialog.dismiss();
+                    }
+                });
+
+        // create alert dialog
+        AlertDialog alertDialog = alertDialogBuilder.create();
+
+        // show it
+        alertDialog.show();
+
+        final Button createButton = alertDialog.getButton(AlertDialog.BUTTON_POSITIVE);
+
+        idEditText.addTextChangedListener(new TextWatcher() {
+            @Override
+            public void beforeTextChanged(CharSequence s, int start, int count, int after) {
+            }
+
+            @Override
+            public void onTextChanged(CharSequence s, int start, int before, int count) {
+                createButton.setEnabled(MXSession.isGroupId("+" + idEditText.getText().toString().trim() + ":" + hostName));
+            }
+
+            @Override
+            public void afterTextChanged(Editable s) {
+
+            }
+        });
+
+        createButton.setEnabled(false);
+        return true;
+    }
+}
diff --git a/vector/src/main/java/im/vector/fragments/HomeFragment.java b/vector/src/main/java/im/vector/fragments/HomeFragment.java
index 13ab98b08f..b3e0bfd9f3 100644
--- a/vector/src/main/java/im/vector/fragments/HomeFragment.java
+++ b/vector/src/main/java/im/vector/fragments/HomeFragment.java
@@ -51,7 +51,7 @@
 import im.vector.util.RoomUtils;
 import im.vector.view.HomeSectionView;
 
-public class HomeFragment extends AbsHomeFragment implements HomeRoomAdapter.OnSelectRoomListener {
+public class HomeFragment extends AbsHomeFragment implements HomeRoomAdapter.OnSelectRoomListener, AbsHomeFragment.OnRoomChangedListener {
     private static final String LOG_TAG = HomeFragment.class.getSimpleName();
 
     @BindView(R.id.nested_scrollview)
@@ -108,6 +108,8 @@ public void onActivityCreated(final Bundle savedInstanceState) {
 
         initViews();
 
+        mOnRoomChangedListener = this;
+
         // Eventually restore the pattern of adapter after orientation change
         for (HomeSectionView homeSectionView : mHomeSectionViews) {
             homeSectionView.setCurrentFilter(mCurrentFilter);
@@ -171,33 +173,33 @@ private void initViews() {
         mInvitationsSection.setTitle(R.string.invitations_header);
         mInvitationsSection.setHideIfEmpty(true);
         mInvitationsSection.setPlaceholders(null, getString(R.string.no_result_placeholder));
-        mInvitationsSection.setupRecyclerView(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false),
+        mInvitationsSection.setupRoomRecyclerView(new LinearLayoutManager(getActivity(), LinearLayoutManager.VERTICAL, false),
                 R.layout.adapter_item_room_invite, false, this, this, null);
 
         // Favourites
         mFavouritesSection.setTitle(R.string.bottom_action_favourites);
         mFavouritesSection.setHideIfEmpty(true);
         mFavouritesSection.setPlaceholders(null, getString(R.string.no_result_placeholder));
-        mFavouritesSection.setupRecyclerView(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false),
+        mFavouritesSection.setupRoomRecyclerView(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false),
                 R.layout.adapter_item_circular_room_view, true, this, null, null);
 
         // People
         mDirectChatsSection.setTitle(R.string.bottom_action_people);
         mDirectChatsSection.setPlaceholders(getString(R.string.no_conversation_placeholder), getString(R.string.no_result_placeholder));
-        mDirectChatsSection.setupRecyclerView(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false),
+        mDirectChatsSection.setupRoomRecyclerView(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false),
                 R.layout.adapter_item_circular_room_view, true, this, null, null);
 
         // Rooms
         mRoomsSection.setTitle(R.string.bottom_action_rooms);
         mRoomsSection.setPlaceholders(getString(R.string.no_room_placeholder), getString(R.string.no_result_placeholder));
-        mRoomsSection.setupRecyclerView(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false),
+        mRoomsSection.setupRoomRecyclerView(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false),
                 R.layout.adapter_item_circular_room_view, true, this, null, null);
 
         // Low priority
         mLowPrioritySection.setTitle(R.string.low_priority_header);
         mLowPrioritySection.setHideIfEmpty(true);
         mLowPrioritySection.setPlaceholders(null, getString(R.string.no_result_placeholder));
-        mLowPrioritySection.setupRecyclerView(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false),
+        mLowPrioritySection.setupRoomRecyclerView(new LinearLayoutManager(getActivity(), LinearLayoutManager.HORIZONTAL, false),
                 R.layout.adapter_item_circular_room_view, true, this, null, null);
 
         mHomeSectionViews = Arrays.asList(mInvitationsSection, mFavouritesSection, mDirectChatsSection, mRoomsSection, mLowPrioritySection);
@@ -352,4 +354,24 @@ public void onLongClickRoom(View v, Room room, int position) {
         RoomUtils.displayPopupMenu(getActivity(), mSession, room, v, isFavorite, isLowPriority, this);
     }
 
+
+    /*
+     * *********************************************************************************************
+     * Listeners
+     * *********************************************************************************************
+     */
+
+    @Override
+    public void onToggleDirectChat(String roomId, boolean isDirectChat) {
+    }
+
+    @Override
+    public void onRoomLeft(String roomId) {
+    }
+
+    @Override
+    public void onRoomForgot(String roomId) {
+        // there is no sync event when a room is forgotten
+        initData();
+    }
 }
diff --git a/vector/src/main/java/im/vector/fragments/PeopleFragment.java b/vector/src/main/java/im/vector/fragments/PeopleFragment.java
index a7a8850b31..6aeb732366 100644
--- a/vector/src/main/java/im/vector/fragments/PeopleFragment.java
+++ b/vector/src/main/java/im/vector/fragments/PeopleFragment.java
@@ -44,7 +44,7 @@
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.Event;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.Search.SearchUsersResponse;
+import org.matrix.androidsdk.rest.model.search.SearchUsersResponse;
 import org.matrix.androidsdk.rest.model.User;
 import org.matrix.androidsdk.util.Log;
 
@@ -68,7 +68,6 @@
 import im.vector.view.SimpleDividerItemDecoration;
 
 public class PeopleFragment extends AbsHomeFragment implements ContactsManager.ContactsManagerListener, AbsHomeFragment.OnRoomChangedListener {
-
     private static final String LOG_TAG = PeopleFragment.class.getSimpleName();
 
     private static final String MATRIX_USER_ONLY_PREF_KEY = "MATRIX_USER_ONLY_PREF_KEY";
@@ -610,4 +609,9 @@ public void onToggleDirectChat(String roomId, boolean isDirectChat) {
     public void onRoomLeft(String roomId) {
         mAdapter.removeDirectChat(roomId);
     }
+
+    @Override
+    public void onRoomForgot(String roomId) {
+        mAdapter.removeDirectChat(roomId);
+    }
 }
diff --git a/vector/src/main/java/im/vector/fragments/RoomsFragment.java b/vector/src/main/java/im/vector/fragments/RoomsFragment.java
index 5696f8e759..a9a070c3bf 100644
--- a/vector/src/main/java/im/vector/fragments/RoomsFragment.java
+++ b/vector/src/main/java/im/vector/fragments/RoomsFragment.java
@@ -41,7 +41,7 @@
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.client.EventsRestClient;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.PublicRoom;
+import org.matrix.androidsdk.rest.model.publicroom.PublicRoom;
 import org.matrix.androidsdk.util.Log;
 
 import java.util.ArrayList;
@@ -63,7 +63,7 @@
 import im.vector.view.SimpleDividerItemDecoration;
 
 public class RoomsFragment extends AbsHomeFragment implements AbsHomeFragment.OnRoomChangedListener {
-    private static final String LOG_TAG = PeopleFragment.class.getSimpleName();
+    private static final String LOG_TAG = RoomsFragment.class.getSimpleName();
 
     // activity result codes
     private static final int DIRECTORY_SOURCE_ACTIVITY_REQUEST_CODE = 314;
@@ -669,11 +669,15 @@ private void removePublicRoomsListener() {
 
     @Override
     public void onToggleDirectChat(String roomId, boolean isDirectChat) {
-
     }
 
     @Override
     public void onRoomLeft(String roomId) {
+    }
 
+    @Override
+    public void onRoomForgot(String roomId) {
+        // there is no sync event when a room is forgotten
+        refreshRooms();
     }
 }
diff --git a/vector/src/main/java/im/vector/fragments/VectorMessageListFragment.java b/vector/src/main/java/im/vector/fragments/VectorMessageListFragment.java
index fd0f4e3f18..d04b0193d0 100755
--- a/vector/src/main/java/im/vector/fragments/VectorMessageListFragment.java
+++ b/vector/src/main/java/im/vector/fragments/VectorMessageListFragment.java
@@ -54,23 +54,22 @@
 import org.matrix.androidsdk.listeners.MXMediaDownloadListener;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
-import org.matrix.androidsdk.rest.model.EncryptedEventContent;
-import org.matrix.androidsdk.rest.model.EncryptedFileInfo;
+import org.matrix.androidsdk.rest.model.crypto.EncryptedEventContent;
+import org.matrix.androidsdk.rest.model.crypto.EncryptedFileInfo;
 import org.matrix.androidsdk.rest.model.Event;
-import org.matrix.androidsdk.rest.model.FileMessage;
-import org.matrix.androidsdk.rest.model.ImageMessage;
+import org.matrix.androidsdk.rest.model.message.FileMessage;
+import org.matrix.androidsdk.rest.model.message.ImageMessage;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.Message;
-import org.matrix.androidsdk.rest.model.VideoMessage;
+import org.matrix.androidsdk.rest.model.message.Message;
+import org.matrix.androidsdk.rest.model.message.VideoMessage;
 import org.matrix.androidsdk.util.JsonUtils;
 import org.matrix.androidsdk.util.Log;
 
 import java.io.File;
-import java.io.FileInputStream;
-import java.io.InputStream;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 
 import im.vector.Matrix;
 import im.vector.R;
@@ -84,8 +83,10 @@
 import im.vector.db.VectorContentProvider;
 import im.vector.listeners.IMessagesAdapterActionsListener;
 import im.vector.receiver.VectorUniversalLinkReceiver;
+import im.vector.util.PreferencesManager;
 import im.vector.util.SlidableMediaInfo;
 import im.vector.util.ThemeUtils;
+import im.vector.util.VectorImageGetter;
 import im.vector.util.VectorUtils;
 import im.vector.widgets.WidgetsManager;
 
@@ -97,6 +98,8 @@ public interface IListFragmentEventListener {
     }
 
     private static final String TAG_FRAGMENT_RECEIPTS_DIALOG = "TAG_FRAGMENT_RECEIPTS_DIALOG";
+    private static final String TAG_FRAGMENT_USER_GROUPS_DIALOG = "TAG_FRAGMENT_USER_GROUPS_DIALOG";
+
     private IListFragmentEventListener mHostActivityListener;
 
     // onMediaAction actions
@@ -110,6 +113,8 @@ public interface IListFragmentEventListener {
     private View mForwardProgressView;
     private View mMainProgressView;
 
+    private VectorImageGetter mVectorImageGetter;
+
     public static VectorMessageListFragment newInstance(String matrixId, String roomId, String eventId, String previewMode, int layoutResId) {
         VectorMessageListFragment f = new VectorMessageListFragment();
         Bundle args = new Bundle();
@@ -146,6 +151,11 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
             ((VectorMessagesAdapter) mAdapter).mIsRoomEncrypted = mRoom.isEncrypted();
         }
 
+        if (null != mSession) {
+            mVectorImageGetter = new VectorImageGetter(mSession);
+            ((VectorMessagesAdapter) mAdapter).setImageGetter(mVectorImageGetter);
+        }
+
         mMessageListView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
@@ -202,6 +212,8 @@ public void onPause() {
             adapter.setVectorMessagesAdapterActionsListener(null);
             adapter.onPause();
         }
+
+        mVectorImageGetter.setListener(null);
     }
 
 
@@ -212,6 +224,13 @@ public void onResume() {
             VectorMessagesAdapter adapter = ((VectorMessagesAdapter) mAdapter);
             adapter.setVectorMessagesAdapterActionsListener(this);
         }
+
+        mVectorImageGetter.setListener(new VectorImageGetter.OnImageDownloadListener() {
+            @Override
+            public void onImageDownloaded(String source) {
+                mAdapter.notifyDataSetChanged();
+            }
+        });
     }
 
     /**
@@ -757,64 +776,65 @@ public void onClick(DialogInterface dialog, int which) {
      */
     void onMediaAction(final int menuAction, final String mediaUrl, final String mediaMimeType, final String filename, final EncryptedFileInfo encryptedFileInfo) {
         MXMediasCache mediasCache = Matrix.getInstance(getActivity()).getMediasCache();
-        File file = mediasCache.mediaCacheFile(mediaUrl, mediaMimeType);
-
         // check if the media has already been downloaded
-        if (null != file) {
-            // download
-            if ((menuAction == ACTION_VECTOR_SAVE) || (menuAction == ACTION_VECTOR_OPEN)) {
-                CommonActivityUtils.saveMediaIntoDownloads(getActivity(), file, filename, mediaMimeType, new SimpleApiCallback<String>() {
-                    @Override
-                    public void onSuccess(String savedMediaPath) {
-                        if (null != savedMediaPath) {
-                            if (menuAction == ACTION_VECTOR_SAVE) {
-                                Toast.makeText(getActivity(), getText(R.string.media_slider_saved), Toast.LENGTH_LONG).show();
-                            } else {
-                                CommonActivityUtils.openMedia(getActivity(), savedMediaPath, mediaMimeType);
-                            }
-                        }
+        if (mediasCache.isMediaCached(mediaUrl, mediaMimeType)) {
+            mediasCache.createTmpMediaFile(mediaUrl, mediaMimeType, encryptedFileInfo, new SimpleApiCallback<File>() {
+                @Override
+                public void onSuccess(File file) {
+                    // sanity check
+                    if (null == file) {
+                        return;
                     }
-                });
-            } else {
-                // shared / forward
-                Uri mediaUri = null;
 
-                File renamedFile = file;
+                    if ((menuAction == ACTION_VECTOR_SAVE) || (menuAction == ACTION_VECTOR_OPEN)) {
+                        CommonActivityUtils.saveMediaIntoDownloads(getActivity(), file, filename, mediaMimeType, new SimpleApiCallback<String>() {
+                            @Override
+                            public void onSuccess(String savedMediaPath) {
+                                if (null != savedMediaPath) {
+                                    if (menuAction == ACTION_VECTOR_SAVE) {
+                                        Toast.makeText(getActivity(), getText(R.string.media_slider_saved), Toast.LENGTH_LONG).show();
+                                    } else {
+                                        CommonActivityUtils.openMedia(getActivity(), savedMediaPath, mediaMimeType);
+                                    }
+                                }
+                            }
+                        });
+                    } else {
+                        if (null != filename) {
+                            File dstFile = new File(file.getParent(), filename);
 
-                if (!TextUtils.isEmpty(filename)) {
-                    try {
-                        InputStream fin = new FileInputStream(file);
-                        String tmpUrl = mediasCache.saveMedia(fin, filename, mediaMimeType);
+                            if (dstFile.exists()) {
+                                dstFile.delete();
+                            }
 
-                        if (null != tmpUrl) {
-                            renamedFile = mediasCache.mediaCacheFile(tmpUrl, mediaMimeType);
+                            file.renameTo(dstFile);
+                            file = dstFile;
                         }
-                    } catch (Exception e) {
-                        Log.e(LOG_TAG, "onMediaAction shared / forward failed : " + e.getLocalizedMessage());
-                    }
-                }
 
-                if (null != renamedFile) {
-                    try {
-                        mediaUri = VectorContentProvider.absolutePathToUri(getActivity(), renamedFile.getAbsolutePath());
-                    } catch (Exception e) {
-                        Log.e(LOG_TAG, "onMediaAction VectorContentProvider.absolutePathToUri: " + e.getLocalizedMessage());
-                    }
-                }
+                        // shared / forward
+                        Uri mediaUri = null;
+                        try {
+                            mediaUri = VectorContentProvider.absolutePathToUri(getActivity(), file.getAbsolutePath());
+                        } catch (Exception e) {
+                            Log.e(LOG_TAG, "onMediaAction VectorContentProvider.absolutePathToUri: " + e.getMessage());
+                        }
 
-                if (null != mediaUri) {
-                    final Intent sendIntent = new Intent();
-                    sendIntent.setAction(Intent.ACTION_SEND);
-                    sendIntent.setType(mediaMimeType);
-                    sendIntent.putExtra(Intent.EXTRA_STREAM, mediaUri);
 
-                    if (menuAction == ACTION_VECTOR_FORWARD) {
-                        CommonActivityUtils.sendFilesTo(getActivity(), sendIntent);
-                    } else {
-                        startActivity(sendIntent);
+                        if (null != mediaUri) {
+                            final Intent sendIntent = new Intent();
+                            sendIntent.setAction(Intent.ACTION_SEND);
+                            sendIntent.setType(mediaMimeType);
+                            sendIntent.putExtra(Intent.EXTRA_STREAM, mediaUri);
+
+                            if (menuAction == ACTION_VECTOR_FORWARD) {
+                                CommonActivityUtils.sendFilesTo(getActivity(), sendIntent);
+                            } else {
+                                startActivity(sendIntent);
+                            }
+                        }
                     }
                 }
-            }
+            });
         } else {
             // else download it
             final String downloadId = mediasCache.downloadMedia(getActivity().getApplicationContext(), mSession.getHomeServerConfig(), mediaUrl, mediaMimeType, encryptedFileInfo);
@@ -854,8 +874,7 @@ public void run() {
      */
     @Override
     public boolean isDisplayAllEvents() {
-        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(getActivity());
-        return preferences.getBoolean(getString(R.string.settings_key_display_all_events), false);
+        return  PreferencesManager.displayAllEvents(getActivity());
     }
 
     private void setViewVisibility(View view, int visibility) {
@@ -1101,6 +1120,22 @@ public void onMoreReadReceiptClick(String eventId) {
         }
     }
 
+    @Override
+    public void onGroupFlairClick(String userId, List<String> groupIds) {
+        try {
+            FragmentManager fm = getActivity().getSupportFragmentManager();
+
+            VectorUserGroupsDialogFragment fragment = (VectorUserGroupsDialogFragment) fm.findFragmentByTag(TAG_FRAGMENT_USER_GROUPS_DIALOG);
+            if (fragment != null) {
+                fragment.dismissAllowingStateLoss();
+            }
+            fragment = VectorUserGroupsDialogFragment.newInstance(mSession.getMyUserId(), userId, groupIds);
+            fragment.show(fm, TAG_FRAGMENT_USER_GROUPS_DIALOG);
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "## onGroupFlairClick() failed " + e.getMessage());
+        }
+    }
+
     @Override
     public void onURLClick(Uri uri) {
         try {
@@ -1173,6 +1208,15 @@ public void onMessageIdClick(String messageId) {
         }
     }
 
+    @Override
+    public void onGroupIdClick(String groupId) {
+        try {
+            onURLClick(Uri.parse(VectorUtils.getPermalink(groupId, null)));
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "onRoomIdClick failed " + e.getLocalizedMessage());
+        }
+    }
+
     private int mInvalidIndexesCount = 0;
 
     @Override
diff --git a/vector/src/main/java/im/vector/fragments/VectorPublicRoomsListFragment.java b/vector/src/main/java/im/vector/fragments/VectorPublicRoomsListFragment.java
index c6b9292fc7..2b811634ff 100755
--- a/vector/src/main/java/im/vector/fragments/VectorPublicRoomsListFragment.java
+++ b/vector/src/main/java/im/vector/fragments/VectorPublicRoomsListFragment.java
@@ -36,7 +36,7 @@
 import org.matrix.androidsdk.data.RoomPreviewData;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.PublicRoom;
+import org.matrix.androidsdk.rest.model.publicroom.PublicRoom;
 
 import im.vector.Matrix;
 import im.vector.PublicRoomsManager;
diff --git a/vector/src/main/java/im/vector/fragments/VectorReadReceiptsDialogFragment.java b/vector/src/main/java/im/vector/fragments/VectorReadReceiptsDialogFragment.java
index 1517f583f8..3274a881c9 100644
--- a/vector/src/main/java/im/vector/fragments/VectorReadReceiptsDialogFragment.java
+++ b/vector/src/main/java/im/vector/fragments/VectorReadReceiptsDialogFragment.java
@@ -20,7 +20,6 @@
 import android.os.Bundle;
 import android.support.v4.app.DialogFragment;
 import android.text.TextUtils;
-import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
@@ -29,6 +28,7 @@
 import org.matrix.androidsdk.MXSession;
 import org.matrix.androidsdk.data.Room;
 import org.matrix.androidsdk.db.MXMediasCache;
+import org.matrix.androidsdk.util.Log;
 
 import java.util.ArrayList;
 
diff --git a/vector/src/main/java/im/vector/fragments/VectorRecentsListFragment.java b/vector/src/main/java/im/vector/fragments/VectorRecentsListFragment.java
index 8f9499abf8..cca156979b 100644
--- a/vector/src/main/java/im/vector/fragments/VectorRecentsListFragment.java
+++ b/vector/src/main/java/im/vector/fragments/VectorRecentsListFragment.java
@@ -742,12 +742,69 @@ public void onClick(DialogInterface dialog, int which) {
     }
 
     @Override
-    public void onToggleRoomNotifications(MXSession session, String roomId) {
+    public void onForgetRoom(final MXSession session, final String roomId) {
+        Room room = session.getDataHandler().getRoom(roomId);
+
+        if (null != room) {
+            showWaitingView();
+
+            room.forget(new ApiCallback<Void>() {
+                @Override
+                public void onSuccess(Void info) {
+                    if (null != getActivity()) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                // clear any pending notification for this room
+                                EventStreamService.cancelNotificationsForRoomId(mSession.getMyUserId(), roomId);
+                                hideWaitingView();
+                            }
+                        });
+                    }
+                }
+
+                private void onError(final String message) {
+                    if (null != getActivity()) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                hideWaitingView();
+                                Toast.makeText(getActivity(), message, Toast.LENGTH_LONG).show();
+                            }
+                        });
+                    }
+                }
+
+                @Override
+                public void onNetworkError(Exception e) {
+                    onError(e.getLocalizedMessage());
+                }
+
+                @Override
+                public void onMatrixError(MatrixError e) {
+                    onError(e.getLocalizedMessage());
+                }
+
+                @Override
+                public void onUnexpectedError(Exception e) {
+                    onError(e.getLocalizedMessage());
+                }
+            });
+        }
+    }
+
+    @Override
+    public void addHomeScreenShortcut(MXSession session, String roomId) {
+        RoomUtils.addHomeScreenShortcut(getActivity(), session, roomId);
+    }
+
+    @Override
+    public void onUpdateRoomNotificationsState(MXSession session, String roomId, BingRulesManager.RoomNotificationState state) {
         BingRulesManager bingRulesManager = session.getDataHandler().getBingRulesManager();
 
         showWaitingView();
 
-        bingRulesManager.muteRoomNotifications(roomId, !bingRulesManager.isRoomNotificationsDisabled(roomId), new BingRulesManager.onBingRuleUpdateListener() {
+        bingRulesManager.updateRoomNotificationState(roomId, state, new BingRulesManager.onBingRuleUpdateListener() {
             @Override
             public void onBingRuleUpdateSuccess() {
                 if (null != getActivity()) {
@@ -773,7 +830,6 @@ public void run() {
                             }
                     );
                 }
-
             }
         });
     }
diff --git a/vector/src/main/java/im/vector/fragments/VectorRoomDetailsMembersFragment.java b/vector/src/main/java/im/vector/fragments/VectorRoomDetailsMembersFragment.java
index 731cd2eb1d..8feca35efe 100755
--- a/vector/src/main/java/im/vector/fragments/VectorRoomDetailsMembersFragment.java
+++ b/vector/src/main/java/im/vector/fragments/VectorRoomDetailsMembersFragment.java
@@ -66,7 +66,6 @@
 import java.util.TimerTask;
 
 import im.vector.R;
-import im.vector.VectorApp;
 import im.vector.activity.CommonActivityUtils;
 import im.vector.activity.MXCActionBarActivity;
 import im.vector.activity.VectorMemberDetailsActivity;
diff --git a/vector/src/main/java/im/vector/fragments/VectorRoomSettingsFragment.java b/vector/src/main/java/im/vector/fragments/VectorRoomSettingsFragment.java
index 58a381191d..e294f0ea76 100755
--- a/vector/src/main/java/im/vector/fragments/VectorRoomSettingsFragment.java
+++ b/vector/src/main/java/im/vector/fragments/VectorRoomSettingsFragment.java
@@ -73,9 +73,10 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
+import java.util.List;
 
 import im.vector.Matrix;
-import im.vector.R;
+import im.vector.R;;
 import im.vector.VectorApp;
 import im.vector.activity.CommonActivityUtils;
 import im.vector.activity.VectorMediasPickerActivity;
@@ -114,7 +115,7 @@ public class VectorRoomSettingsFragment extends PreferenceFragment implements Sh
     private static final String PREF_KEY_ROOM_TAG_LIST = "roomTagList";
     private static final String PREF_KEY_ROOM_ACCESS_RULES_LIST = "roomAccessRulesList";
     private static final String PREF_KEY_ROOM_HISTORY_READABILITY_LIST = "roomReadHistoryRulesList";
-    private static final String PREF_KEY_ROOM_MUTE_NOTIFICATIONS_SWITCH = "muteNotificationsSwitch";
+    private static final String PREF_KEY_ROOM_NOTIFICATIONS_LIST = "roomNotificationPreference";
     private static final String PREF_KEY_ROOM_LEAVE = "roomLeave";
     private static final String PREF_KEY_ROOM_INTERNAL_ID = "roomInternalId";
     private static final String PREF_KEY_ADDRESSES = "addresses";
@@ -124,12 +125,17 @@ public class VectorRoomSettingsFragment extends PreferenceFragment implements Sh
     private static final String PREF_KEY_BANNED_DIVIDER = "banned_divider";
     private static final String PREF_KEY_ENCRYPTION = "encryptionKey";
 
+    private static final String PREF_KEY_FLAIR = "flair";
+    private static final String PREF_KEY_FLAIR_DIVIDER = "flair_divider";
+
     private static final String ADDRESSES_PREFERENCE_KEY_BASE = "ADDRESSES_PREFERENCE_KEY_BASE";
     private static final String NO_LOCAL_ADDRESS_PREFERENCE_KEY = "NO_LOCAL_ADDRESS_PREFERENCE_KEY";
     private static final String ADD_ADDRESSES_PREFERENCE_KEY = "ADD_ADDRESSES_PREFERENCE_KEY";
 
     private static final String BANNED_PREFERENCE_KEY_BASE = "BANNED_PREFERENCE_KEY_BASE";
 
+    private static final String FLAIR_PREFERENCE_KEY_BASE = "FLAIR_PREFERENCE_KEY_BASE";
+
     private static final String UNKNOWN_VALUE = "UNKNOWN_VALUE";
 
     // business code
@@ -148,17 +154,20 @@ public class VectorRoomSettingsFragment extends PreferenceFragment implements Sh
     private PreferenceCategory mBannedMembersSettingsCategory;
     private PreferenceCategory mBannedMembersSettingsCategoryDivider;
 
+    // flair
+    private PreferenceCategory mFlairSettingsCategory;
+
     // UI elements
     private RoomAvatarPreference mRoomPhotoAvatar;
     private EditTextPreference mRoomNameEditTxt;
     private EditTextPreference mRoomTopicEditTxt;
     private CheckBoxPreference mRoomDirectoryVisibilitySwitch;
-    private CheckBoxPreference mRoomMuteNotificationsSwitch;
     private ListPreference mRoomTagListPreference;
     private VectorListPreference mRoomAccessRulesListPreference;
     private ListPreference mRoomHistoryReadabilityRulesListPreference;
     private View mParentLoadingView;
     private View mParentFragmentContainerView;
+    private ListPreference mRoomNotificationsPreference;
 
     // disable some updates if there is
     private final IMXNetworkEventListener mNetworkListener = new IMXNetworkEventListener() {
@@ -326,7 +335,6 @@ public void onCreate(Bundle savedInstanceState) {
         mRoomNameEditTxt = (EditTextPreference) findPreference(PREF_KEY_ROOM_NAME);
         mRoomTopicEditTxt = (EditTextPreference) findPreference(PREF_KEY_ROOM_TOPIC);
         mRoomDirectoryVisibilitySwitch = (CheckBoxPreference) findPreference(PREF_KEY_ROOM_DIRECTORY_VISIBILITY_SWITCH);
-        mRoomMuteNotificationsSwitch = (CheckBoxPreference) findPreference(PREF_KEY_ROOM_MUTE_NOTIFICATIONS_SWITCH);
         mRoomTagListPreference = (ListPreference) findPreference(PREF_KEY_ROOM_TAG_LIST);
         mRoomAccessRulesListPreference = (VectorListPreference) findPreference(PREF_KEY_ROOM_ACCESS_RULES_LIST);
         mRoomHistoryReadabilityRulesListPreference = (ListPreference) findPreference(PREF_KEY_ROOM_HISTORY_READABILITY_LIST);
@@ -334,6 +342,8 @@ public void onCreate(Bundle savedInstanceState) {
         mAdvandceSettingsCategory = (PreferenceCategory) getPreferenceManager().findPreference(PREF_KEY_ADVANCED);
         mBannedMembersSettingsCategory = (PreferenceCategory) getPreferenceManager().findPreference(PREF_KEY_BANNED);
         mBannedMembersSettingsCategoryDivider = (PreferenceCategory) getPreferenceManager().findPreference(PREF_KEY_BANNED_DIVIDER);
+        mFlairSettingsCategory = (PreferenceCategory) getPreferenceManager().findPreference(PREF_KEY_FLAIR);
+        mRoomNotificationsPreference = (ListPreference) getPreferenceManager().findPreference(PREF_KEY_ROOM_NOTIFICATIONS_LIST);
 
         mRoomAccessRulesListPreference.setOnPreferenceWarningIconClickListener(new VectorListPreference.OnPreferenceWarningIconClickListener() {
             @Override
@@ -518,6 +528,7 @@ public void onResume() {
             updateRoomDirectoryVisibilityAsync();
 
             refreshAddresses();
+            refreshFlair();
             refreshBannedMembersList();
             refreshEndToEnd();
         }
@@ -698,10 +709,6 @@ private void updatePreferenceAccessFromPowerLevel() {
         if (null != mRoomDirectoryVisibilitySwitch)
             mRoomDirectoryVisibilitySwitch.setEnabled(isAdmin && isConnected);
 
-        // room notification mute setting: no power condition
-        if (null != mRoomMuteNotificationsSwitch)
-            mRoomMuteNotificationsSwitch.setEnabled(isConnected);
-
         // room tagging: no power condition
         if (null != mRoomTagListPreference)
             mRoomTagListPreference.setEnabled(isConnected);
@@ -713,8 +720,13 @@ private void updatePreferenceAccessFromPowerLevel() {
         }
 
         // room read history: admin only
-        if (null != mRoomHistoryReadabilityRulesListPreference)
+        if (null != mRoomHistoryReadabilityRulesListPreference) {
             mRoomHistoryReadabilityRulesListPreference.setEnabled(isAdmin && isConnected);
+        }
+
+        if (null != mRoomNotificationsPreference) {
+            mRoomNotificationsPreference.setEnabled(isConnected);
+        }
     }
 
 
@@ -750,12 +762,6 @@ private void updatePreferenceUiValues() {
             mRoomTopicEditTxt.setText(value);
         }
 
-        // update the mute notifications preference
-        if (null != mRoomMuteNotificationsSwitch) {
-            boolean isChecked = mBingRulesManager.isRoomNotificationsDisabled(mRoom.getRoomId());
-            mRoomMuteNotificationsSwitch.setChecked(isChecked);
-        }
-
         // update room directory visibility
 //        if(null != mRoomDirectoryVisibilitySwitch) {
 //            boolean isRoomPublic = TextUtils.equals(mRoom.getVisibility()/*getLiveState().visibility ou .isPublic()*/, RoomState.DIRECTORY_VISIBILITY_PUBLIC);
@@ -812,6 +818,23 @@ private void updatePreferenceUiValues() {
             }
         }
 
+        if (null != mRoomNotificationsPreference) {
+            BingRulesManager.RoomNotificationState state = mSession.getDataHandler().getBingRulesManager().getRoomNotificationState(mRoom.getRoomId());
+
+            if (state == BingRulesManager.RoomNotificationState.ALL_MESSAGES_NOISY) {
+                value = getString(R.string.room_settings_all_messages_noisy);
+            } else if (state == BingRulesManager.RoomNotificationState.ALL_MESSAGES) {
+                value = getString(R.string.room_settings_all_messages);
+            } else if (state == BingRulesManager.RoomNotificationState.MENTIONS_ONLY) {
+                value = getString(R.string.room_settings_mention_only);
+            } else {
+                value = getString(R.string.room_settings_mute);
+            }
+
+            mRoomNotificationsPreference.setValue(value);
+            mRoomNotificationsPreference.setSummary(value);
+        }
+
         // update the room tag preference
         if (null != mRoomTagListPreference) {
 
@@ -901,8 +924,8 @@ public void onSharedPreferenceChanged(SharedPreferences aSharedPreferences, Stri
             onRoomNamePreferenceChanged();
         } else if (aKey.equals(PREF_KEY_ROOM_TOPIC)) {
             onRoomTopicPreferenceChanged();
-        } else if (aKey.equals(PREF_KEY_ROOM_MUTE_NOTIFICATIONS_SWITCH)) {
-            onRoomMuteNotificationsPreferenceChanged();
+        } else if (aKey.equals(PREF_KEY_ROOM_NOTIFICATIONS_LIST)) {
+            onRoomNotificationsPreferenceChanged();
         } else if (aKey.equals(PREF_KEY_ROOM_DIRECTORY_VISIBILITY_SWITCH)) {
             onRoomDirectoryVisibilityPreferenceChanged(); // TBT
         } else if (aKey.equals(PREF_KEY_ROOM_TAG_LIST)) {
@@ -1062,34 +1085,43 @@ private void onRoomDirectoryVisibilityPreferenceChanged() {
     }
 
     /**
-     * Action when enabling / disabling the rooms notifications.
      */
-    private void onRoomMuteNotificationsPreferenceChanged() {
+    private void onRoomNotificationsPreferenceChanged() {
         // sanity check
-        if ((null == mRoom) || (null == mBingRulesManager) || (null == mRoomMuteNotificationsSwitch)) {
+        if ((null == mRoom) || (null == mBingRulesManager)) {
             return;
         }
 
-        // get new and previous values
-        boolean isNotificationsMuted = mRoomMuteNotificationsSwitch.isChecked();
-        boolean previousValue = mBingRulesManager.isRoomNotificationsDisabled(mRoom.getRoomId());
+        String value = mRoomNotificationsPreference.getValue();
+        BingRulesManager.RoomNotificationState updatedState;
+
+        if (TextUtils.equals(value, getString(R.string.room_settings_all_messages_noisy))) {
+            updatedState = BingRulesManager.RoomNotificationState.ALL_MESSAGES_NOISY;
+        } else if (TextUtils.equals(value, getString(R.string.room_settings_all_messages))) {
+            updatedState = BingRulesManager.RoomNotificationState.ALL_MESSAGES;
+        } else if (TextUtils.equals(value, getString(R.string.room_settings_mention_only))) {
+            updatedState = BingRulesManager.RoomNotificationState.MENTIONS_ONLY;
+        } else {
+            updatedState = BingRulesManager.RoomNotificationState.MUTE;
+        }
 
         // update only, if values are different
-        if (isNotificationsMuted != previousValue) {
+        if (mBingRulesManager.getRoomNotificationState(mRoom.getRoomId()) != updatedState) {
             displayLoadingView();
-            mBingRulesManager.muteRoomNotifications(mRoom.getRoomId(), isNotificationsMuted, new BingRulesManager.onBingRuleUpdateListener() {
-                @Override
-                public void onBingRuleUpdateSuccess() {
-                    Log.d(LOG_TAG, "##onRoomMuteNotificationsPreferenceChanged(): update succeed");
-                    hideLoadingView(UPDATE_UI);
-                }
+            mBingRulesManager.updateRoomNotificationState(mRoom.getRoomId(), updatedState,
+                    new BingRulesManager.onBingRuleUpdateListener() {
+                        @Override
+                        public void onBingRuleUpdateSuccess() {
+                            Log.d(LOG_TAG, "##onRoomNotificationsPreferenceChanged(): update succeed");
+                            hideLoadingView(UPDATE_UI);
+                        }
 
-                @Override
-                public void onBingRuleUpdateFailure(String errorMessage) {
-                    Log.w(LOG_TAG, "##onRoomMuteNotificationsPreferenceChanged(): BingRuleUpdateFailure");
-                    hideLoadingView(DO_NOT_UPDATE_UI);
-                }
-            });
+                        @Override
+                        public void onBingRuleUpdateFailure(String errorMessage) {
+                            Log.w(LOG_TAG, "##onRoomNotificationsPreferenceChanged(): BingRuleUpdateFailure");
+                            hideLoadingView(DO_NOT_UPDATE_UI);
+                        }
+                    });
         }
     }
 
@@ -1290,7 +1322,7 @@ private void refreshBannedMembersList() {
         Collections.sort(bannedMembers, new Comparator<RoomMember>() {
             @Override
             public int compare(RoomMember m1, RoomMember m2) {
-                return m1.getUserId().toLowerCase().compareTo(m2.getUserId().toLowerCase());
+                return m1.getUserId().toLowerCase(VectorApp.getApplicationLocale()).compareTo(m2.getUserId().toLowerCase(VectorApp.getApplicationLocale()));
             }
         });
 
@@ -1329,6 +1361,151 @@ public boolean onPreferenceClick(Preference preference) {
         }
     }
 
+    //================================================================================
+    // flair management
+    //================================================================================
+
+    private final ApiCallback mFlairUpdatesCallback = new ApiCallback<Void>() {
+        @Override
+        public void onSuccess(Void info) {
+            getActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    hideLoadingView(false);
+                    refreshFlair();
+                }
+            });
+        }
+
+        /**
+         * Error management.
+         * @param errorMessage the error message
+         */
+        private void onError(final String errorMessage) {
+            getActivity().runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    Toast.makeText(getActivity(), errorMessage, Toast.LENGTH_SHORT).show();
+                    hideLoadingView(false);
+                    refreshFlair();
+                }
+            });
+        }
+
+        @Override
+        public void onNetworkError(Exception e) {
+            onError(e.getLocalizedMessage());
+        }
+
+        @Override
+        public void onMatrixError(MatrixError e) {
+            onError(e.getLocalizedMessage());
+        }
+
+        @Override
+        public void onUnexpectedError(Exception e) {
+            onError(e.getLocalizedMessage());
+        }
+    };
+
+    /**
+     * Tells if the current user can updates the related group aka flairs
+     *
+     * @return true if the user is allowed.
+     */
+    private boolean canUpdateFlair() {
+        boolean canUpdateAliases = false;
+
+        PowerLevels powerLevels = mRoom.getLiveState().getPowerLevels();
+
+        if (null != powerLevels) {
+            int powerLevel = powerLevels.getUserPowerLevel(mSession.getMyUserId());
+            canUpdateAliases = powerLevel >= powerLevels.minimumPowerLevelForSendingEventAsStateEvent(Event.EVENT_TYPE_STATE_RELATED_GROUPS);
+        }
+
+        return canUpdateAliases;
+    }
+
+    /**
+     * Refresh the flair list
+     */
+    private void refreshFlair() {
+        final List<String> groups = mRoom.getLiveState().getRelatedGroups();
+        Collections.sort(groups, String.CASE_INSENSITIVE_ORDER);
+
+        mFlairSettingsCategory.removeAll();
+
+        if (!groups.isEmpty()) {
+            for (final String groupId : groups) {
+                VectorCustomActionEditTextPreference preference = new VectorCustomActionEditTextPreference(getActivity());
+                preference.setTitle(groupId);
+                preference.setKey(FLAIR_PREFERENCE_KEY_BASE + groupId);
+
+                preference.setOnPreferenceLongClickListener(new VectorCustomActionEditTextPreference.OnPreferenceLongClickListener() {
+                    @Override
+                    public boolean onPreferenceLongClick(Preference preference) {
+                        getActivity().runOnUiThread(new Runnable() {
+                            @Override
+                            public void run() {
+                                displayLoadingView();
+                                mRoom.removeRelatedGroup(groupId, mFlairUpdatesCallback);
+                            }
+                        });
+
+                        return true;
+                    }
+                });
+                mFlairSettingsCategory.addPreference(preference);
+            }
+        } else {
+            VectorCustomActionEditTextPreference preference = new VectorCustomActionEditTextPreference(getActivity());
+            preference.setTitle(getString(R.string.room_settings_no_flair));
+            preference.setKey(FLAIR_PREFERENCE_KEY_BASE + "no_flair");
+
+            mFlairSettingsCategory.addPreference(preference);
+        }
+
+        if (canUpdateFlair()) {
+            // display the "add addresses" entry
+            EditTextPreference addAddressPreference = new EditTextPreference(getActivity());
+            addAddressPreference.setTitle(R.string.room_settings_add_new_group);
+            addAddressPreference.setDialogTitle(R.string.room_settings_add_new_group);
+            addAddressPreference.setKey(FLAIR_PREFERENCE_KEY_BASE + "__add");
+            addAddressPreference.setIcon(CommonActivityUtils.tintDrawable(getActivity(), ContextCompat.getDrawable(getActivity(), R.drawable.ic_add_black), R.attr.settings_icon_tint_color));
+
+            addAddressPreference.setOnPreferenceChangeListener(
+                    new Preference.OnPreferenceChangeListener() {
+                        @Override
+                        public boolean onPreferenceChange(Preference preference, Object newValue) {
+                            final String groupId = ((String) newValue).trim();
+
+                            // ignore empty alias
+                            if (!TextUtils.isEmpty(groupId)) {
+                                if (!MXSession.isGroupId(groupId)) {
+                                    AlertDialog.Builder builder = new AlertDialog.Builder(getActivity());
+                                    builder.setTitle(R.string.room_settings_invalid_group_format_dialog_title);
+                                    builder.setMessage(getString(R.string.room_settings_invalid_group_format_dialog_body, groupId));
+                                    builder.setPositiveButton(R.string.ok, null);
+                                    AlertDialog dialog = builder.create();
+                                    dialog.show();
+                                } else if (!groups.contains(groupId)) {
+                                    getActivity().runOnUiThread(new Runnable() {
+                                        @Override
+                                        public void run() {
+                                            displayLoadingView();
+                                            mRoom.addRelatedGroup(groupId, mFlairUpdatesCallback);
+                                        }
+                                    });
+                                }
+                            }
+                            return false;
+                        }
+                    });
+
+            mFlairSettingsCategory.addPreference(addAddressPreference);
+        }
+    }
+
     //================================================================================
     // Aliases management
     //================================================================================
diff --git a/vector/src/main/java/im/vector/fragments/VectorSearchRoomFilesListFragment.java b/vector/src/main/java/im/vector/fragments/VectorSearchRoomFilesListFragment.java
index ce4550838e..50b594efe8 100644
--- a/vector/src/main/java/im/vector/fragments/VectorSearchRoomFilesListFragment.java
+++ b/vector/src/main/java/im/vector/fragments/VectorSearchRoomFilesListFragment.java
@@ -28,7 +28,7 @@
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.Event;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.message.Message;
 import org.matrix.androidsdk.rest.model.TokensChunkResponse;
 import org.matrix.androidsdk.util.JsonUtils;
 import org.matrix.androidsdk.util.Log;
diff --git a/vector/src/main/java/im/vector/fragments/VectorSearchRoomsFilesListFragment.java b/vector/src/main/java/im/vector/fragments/VectorSearchRoomsFilesListFragment.java
index 9431cb7928..2608d81b6d 100644
--- a/vector/src/main/java/im/vector/fragments/VectorSearchRoomsFilesListFragment.java
+++ b/vector/src/main/java/im/vector/fragments/VectorSearchRoomsFilesListFragment.java
@@ -27,8 +27,8 @@
 import org.matrix.androidsdk.adapters.MessageRow;
 import org.matrix.androidsdk.adapters.AbstractMessagesAdapter;
 import org.matrix.androidsdk.rest.model.Event;
-import org.matrix.androidsdk.rest.model.FileMessage;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.message.FileMessage;
+import org.matrix.androidsdk.rest.model.message.Message;
 import org.matrix.androidsdk.util.JsonUtils;
 
 import java.util.ArrayList;
diff --git a/vector/src/main/java/im/vector/fragments/VectorSearchRoomsListFragment.java b/vector/src/main/java/im/vector/fragments/VectorSearchRoomsListFragment.java
index 4c6faa496c..80681c05ae 100644
--- a/vector/src/main/java/im/vector/fragments/VectorSearchRoomsListFragment.java
+++ b/vector/src/main/java/im/vector/fragments/VectorSearchRoomsListFragment.java
@@ -32,7 +32,7 @@
 import org.matrix.androidsdk.fragments.MatrixMessageListFragment;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.PublicRoom;
+import org.matrix.androidsdk.rest.model.publicroom.PublicRoom;
 
 import java.util.List;
 
@@ -43,7 +43,6 @@
 import im.vector.activity.VectorPublicRoomsActivity;
 import im.vector.activity.VectorRoomActivity;
 import im.vector.adapters.VectorRoomSummaryAdapter;
-import im.vector.view.RecentsExpandableListView;
 
 public class VectorSearchRoomsListFragment extends VectorRecentsListFragment {
     // the session
diff --git a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.java b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.java
index e47303ea09..8f319aacbc 100755
--- a/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.java
+++ b/vector/src/main/java/im/vector/fragments/VectorSettingsPreferencesFragment.java
@@ -24,6 +24,7 @@
 import android.content.DialogInterface;
 import android.content.Intent;
 import android.content.SharedPreferences;
+import android.graphics.Bitmap;
 import android.graphics.Typeface;
 import android.media.RingtoneManager;
 import android.net.Uri;
@@ -38,6 +39,7 @@
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
 import android.preference.PreferenceScreen;
+import android.preference.SwitchPreference;
 import android.provider.Settings;
 import android.support.design.widget.TextInputEditText;
 import android.support.v4.content.ContextCompat;
@@ -57,7 +59,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.google.gson.JsonElement;
 import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.Phonenumber;
@@ -73,11 +74,13 @@
 import org.matrix.androidsdk.listeners.MXMediaUploadListener;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
-import org.matrix.androidsdk.rest.model.DeviceInfo;
-import org.matrix.androidsdk.rest.model.DevicesListResponse;
+import org.matrix.androidsdk.rest.model.group.Group;
+import org.matrix.androidsdk.rest.model.search.SearchGroup;
+import org.matrix.androidsdk.rest.model.sync.DeviceInfo;
+import org.matrix.androidsdk.rest.model.sync.DevicesListResponse;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.ThirdPartyIdentifier;
-import org.matrix.androidsdk.rest.model.ThreePid;
+import org.matrix.androidsdk.rest.model.pid.ThirdPartyIdentifier;
+import org.matrix.androidsdk.rest.model.pid.ThreePid;
 import org.matrix.androidsdk.rest.model.bingrules.BingRule;
 import org.matrix.androidsdk.rest.model.bingrules.BingRuleSet;
 import org.matrix.androidsdk.util.BingRulesManager;
@@ -87,12 +90,14 @@
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Locale;
+import java.util.Set;
 
 import im.vector.Matrix;
 import im.vector.R;
@@ -108,6 +113,8 @@
 import im.vector.preference.ProgressBarPreference;
 import im.vector.preference.UserAvatarPreference;
 import im.vector.preference.VectorCustomActionEditTextPreference;
+import im.vector.preference.VectorGroupPreference;
+import im.vector.preference.VectorSwitchPreference;
 import im.vector.util.PhoneNumberUtils;
 import im.vector.util.PreferencesManager;
 import im.vector.util.ThemeUtils;
@@ -200,6 +207,8 @@ public void onAccountInfoUpdate(MyUser myUser) {
     private EditTextPreference mSyncRequestDelayPreference;
     private PreferenceCategory mLabsCategory;
 
+    private PreferenceCategory mGroupsFlairCategory;
+
     // static constructor
     public static VectorSettingsPreferencesFragment newInstance(String matrixId) {
         VectorSettingsPreferencesFragment f = new VectorSettingsPreferencesFragment();
@@ -497,6 +506,50 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
             }
         });
 
+        final VectorSwitchPreference urlPreviewPreference = (VectorSwitchPreference)findPreference(PreferencesManager.SETTINGS_SHOW_URL_PREVIEW_KEY);
+        urlPreviewPreference.setChecked(mSession.isURLPreviewEnabled());
+
+        urlPreviewPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+            @Override
+            public boolean onPreferenceChange(Preference preference, Object newValue) {
+
+                if ((null != newValue) && ((boolean)newValue != mSession.isURLPreviewEnabled())) {
+                    displayLoadingView();
+                    mSession.setURLPreviewStatus((boolean) newValue, new ApiCallback<Void>() {
+                        @Override
+                        public void onSuccess(Void info) {
+                            urlPreviewPreference.setChecked(mSession.isURLPreviewEnabled());
+                            hideLoadingView();
+                        }
+
+                        private void onError(String errorMessage) {
+                            if (null != getActivity()) {
+                                Toast.makeText(getActivity(), errorMessage, Toast.LENGTH_SHORT).show();
+                            }
+                            onSuccess(null);
+                        }
+
+                        @Override
+                        public void onNetworkError(Exception e) {
+                            onError(e.getLocalizedMessage());
+                        }
+
+                        @Override
+                        public void onMatrixError(MatrixError e) {
+                            onError(e.getLocalizedMessage());
+                        }
+
+                        @Override
+                        public void onUnexpectedError(Exception e) {
+                            onError(e.getLocalizedMessage());
+                        }
+                    });
+                }
+
+                return false;
+            }
+        });
+
         // push rules
         for (String resourceText : mPushesRuleByResourceId.keySet()) {
             final Preference preference = findPreference(resourceText);
@@ -514,7 +567,7 @@ public boolean onPreferenceChange(Preference preference, Object newValueAsVoid)
                         }
                     });
                 } else if (preference instanceof BingRulePreference) {
-                    final BingRulePreference bingRulePreference = (BingRulePreference)preference;
+                    final BingRulePreference bingRulePreference = (BingRulePreference) preference;
                     bingRulePreference.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
                         @Override
                         public boolean onPreferenceClick(Preference preference) {
@@ -614,6 +667,7 @@ public void onThirdPartyUnregistrationFailed() {
         mCryptographyCategory = (PreferenceCategory) findPreference(PreferencesManager.SETTINGS_CRYPTOGRAPHY_PREFERENCE_KEY);
         mCryptographyCategoryDivider = (PreferenceCategory) findPreference(PreferencesManager.SETTINGS_CRYPTOGRAPHY_DIVIDER_PREFERENCE_KEY);
         mLabsCategory = (PreferenceCategory) findPreference(PreferencesManager.SETTINGS_LABS_PREFERENCE_KEY);
+        mGroupsFlairCategory = (PreferenceCategory) findPreference(PreferencesManager.SETTINGS_GROUPS_FLAIR_KEY);
 
         // preference to start the App info screen, to facilitate App permissions access
         Preference applicationInfoLInkPref = findPreference(APP_INFO_LINK_PREFERENCE_KEY);
@@ -757,6 +811,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
         refreshPhoneNumbersList();
         refreshIgnoredUsersList();
         refreshDevicesList();
+        refreshGroupFlairsList();
     }
 
     @Override
@@ -922,11 +977,11 @@ private void refreshDisplay() {
 
             if (null != preference) {
                 if (preference instanceof BingRulePreference) {
-                    BingRulePreference bingRulePreference = (BingRulePreference)preference;
+                    BingRulePreference bingRulePreference = (BingRulePreference) preference;
                     bingRulePreference.setEnabled((null != rules) && isConnected);
                     bingRulePreference.setBingRule(mSession.getDataHandler().pushRules().findDefaultRule(mPushesRuleByResourceId.get(resourceText)));
                 } else {
-                    CheckBoxPreference switchPreference = (CheckBoxPreference)preference;
+                    CheckBoxPreference switchPreference = (CheckBoxPreference) preference;
                     if (resourceText.equals(PreferencesManager.SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY)) {
                         switchPreference.setChecked(gcmMgr.areDeviceNotificationsAllowed());
                     } else if (resourceText.equals(PreferencesManager.SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY)) {
@@ -1298,6 +1353,12 @@ public void onActivityResult(int requestCode, int resultCode, final Intent data)
             switch (requestCode) {
                 case REQUEST_NOTIFICATION_RINGTONE: {
                     PreferencesManager.setNotificationRingTone(getActivity(), (Uri) data.getParcelableExtra(RingtoneManager.EXTRA_RINGTONE_PICKED_URI));
+
+                    // test if the selected ring tone can be played
+                    if (null == PreferencesManager.getNotificationRingToneName(getActivity())) {
+                        PreferencesManager.setNotificationRingTone(getActivity(), PreferencesManager.getNotificationRingTone(getActivity()));
+                    }
+
                     refreshNotificationRingTone();
                     break;
                 }
@@ -1388,7 +1449,7 @@ private void refreshPreferences() {
             for (String resourceText : mPushesRuleByResourceId.keySet()) {
                 Preference preference = findPreference(resourceText);
 
-                if ((null != preference) &&  (preference instanceof CheckBoxPreference)) {
+                if ((null != preference) && (preference instanceof CheckBoxPreference)) {
                     String ruleId = mPushesRuleByResourceId.get(resourceText);
 
                     BingRule rule = mBingRuleSet.findDefaultRule(ruleId);
@@ -1406,7 +1467,7 @@ else if (isEnabled) {
                             isEnabled = false;
                         } else if (1 == actions.size()) {
                             try {
-                                isEnabled = !TextUtils.equals((String)(actions.get(0)), BingRule.ACTION_DONT_NOTIFY);
+                                isEnabled = !TextUtils.equals((String) (actions.get(0)), BingRule.ACTION_DONT_NOTIFY);
                             } catch (Exception e) {
                                 Log.e(LOG_TAG, "## refreshPreferences failed " + e.getMessage());
                             }
@@ -1428,7 +1489,7 @@ else if (isEnabled) {
      * @param preferenceSummary the displayed 3pid
      */
     private void displayDelete3PIDConfirmationDialog(final ThirdPartyIdentifier pid, final CharSequence preferenceSummary) {
-        final String mediumFriendlyName = ThreePid.getMediumFriendlyName(pid.medium, getActivity()).toLowerCase();
+        final String mediumFriendlyName = ThreePid.getMediumFriendlyName(pid.medium, getActivity()).toLowerCase(VectorApp.getApplicationLocale());
         final String dialogMessage = getString(R.string.settings_delete_threepid_confirmation, mediumFriendlyName, preferenceSummary);
 
         new AlertDialog.Builder(getActivity())
@@ -1495,7 +1556,7 @@ private void refreshIgnoredUsersList() {
         Collections.sort(ignoredUsersList, new Comparator<String>() {
             @Override
             public int compare(String u1, String u2) {
-                return u1.toLowerCase().compareTo(u2.toLowerCase());
+                return u1.toLowerCase(VectorApp.getApplicationLocale()).compareTo(u2.toLowerCase(VectorApp.getApplicationLocale()));
             }
         });
 
@@ -2915,5 +2976,134 @@ public void onUnexpectedError(Exception e) {
         }
     }
 
+    //==============================================================================================================
+    // Group flairs management
+    //==============================================================================================================
+
+    /**
+     * Force the refresh of the devices list.<br>
+     * The devices list is the list of the devices where the user as looged in.
+     * It can be any mobile device, as any browser.
+     */
+    private void refreshGroupFlairsList() {
+        if (null != mSession) {
+            // display a spinner while refreshing
+            if (0 == mGroupsFlairCategory.getPreferenceCount()) {
+                ProgressBarPreference preference = new ProgressBarPreference(getActivity());
+                mGroupsFlairCategory.addPreference(preference);
+            }
+
+            mSession.getGroupsManager().getUserPublicisedGroups(mSession.getMyUserId(), true, new ApiCallback<Set<String>>() {
+                @Override
+                public void onSuccess(Set<String> publicisedGroups) {
+                    buildGroupsList(publicisedGroups);
+                }
+
+                @Override
+                public void onNetworkError(Exception e) {
+                    // NOP
+                }
 
+                @Override
+                public void onMatrixError(MatrixError e) {
+                    // NOP
+                }
+
+                @Override
+                public void onUnexpectedError(Exception e) {
+                    // NOP
+                }
+            });
+        }
+    }
+
+    // current publicised group list
+    private Set<String> mPublicisedGroups = null;
+
+    /**
+     * Build the groups list.
+     *
+     * @param publicisedGroups the publicised groups list.
+     */
+    private void buildGroupsList(final Set<String> publicisedGroups) {
+        boolean isNewList = true;
+
+        if ((null != mPublicisedGroups) && (mPublicisedGroups.size() == publicisedGroups.size())) {
+            isNewList = !mPublicisedGroups.containsAll(publicisedGroups);
+        }
+
+        if (isNewList) {
+            List<Group> joinedGroups = new ArrayList<>(mSession.getGroupsManager().getJoinedGroups());
+            Collections.sort(joinedGroups, Group.mGroupsComparator);
+
+            int prefIndex = 0;
+            mPublicisedGroups = publicisedGroups;
+
+            // clear everything
+            mGroupsFlairCategory.removeAll();
+
+            for (final Group group : joinedGroups) {
+                final VectorGroupPreference vectorGroupPreference = new VectorGroupPreference(getActivity());
+                vectorGroupPreference.setKey(DEVICES_PREFERENCE_KEY_BASE + prefIndex);
+                prefIndex++;
+
+                vectorGroupPreference.setGroup(group, mSession);
+                vectorGroupPreference.setTitle(group.getDisplayName());
+                vectorGroupPreference.setSummary(group.getGroupId());
+
+                vectorGroupPreference.setChecked(publicisedGroups.contains(group.getGroupId()));
+                mGroupsFlairCategory.addPreference(vectorGroupPreference);
+
+                vectorGroupPreference.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
+                    @Override
+                    public boolean onPreferenceChange(Preference preference, Object newValueAsVoid) {
+                        if (newValueAsVoid instanceof Boolean) {
+                            final boolean newValue = (boolean) newValueAsVoid;
+                            boolean isFlaired = mPublicisedGroups.contains(group.getGroupId());
+
+                            if (newValue != isFlaired) {
+                                displayLoadingView();
+                                mSession.getGroupsManager().updateGroupPublicity(group.getGroupId(), newValue, new ApiCallback<Void>() {
+                                    @Override
+                                    public void onSuccess(Void info) {
+                                        hideLoadingView();
+                                        if (newValue) {
+                                            mPublicisedGroups.add(group.getGroupId());
+                                        } else {
+                                            mPublicisedGroups.remove(group.getGroupId());
+                                        }
+                                    }
+
+                                    private void onError() {
+                                        hideLoadingView();
+                                        // restore default value
+                                        vectorGroupPreference.setChecked(publicisedGroups.contains(group.getGroupId()));
+                                    }
+
+                                    @Override
+                                    public void onNetworkError(Exception e) {
+                                        onError();
+                                    }
+
+                                    @Override
+                                    public void onMatrixError(MatrixError e) {
+                                        onError();
+                                    }
+
+                                    @Override
+                                    public void onUnexpectedError(Exception e) {
+                                        onError();
+                                    }
+                                });
+                            }
+                        }
+                        return true;
+                    }
+                });
+
+            }
+
+            refreshCryptographyPreference(mMyDeviceInfo);
+        }
+    }
 }
diff --git a/vector/src/main/java/im/vector/fragments/VectorUserGroupsDialogFragment.java b/vector/src/main/java/im/vector/fragments/VectorUserGroupsDialogFragment.java
new file mode 100644
index 0000000000..5c0604cd3f
--- /dev/null
+++ b/vector/src/main/java/im/vector/fragments/VectorUserGroupsDialogFragment.java
@@ -0,0 +1,96 @@
+/*
+ * Copyright 2015 OpenMarket Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.fragments;
+
+import android.app.Dialog;
+import android.os.Bundle;
+import android.support.v4.app.DialogFragment;
+import android.text.TextUtils;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.ListView;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.util.Log;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import im.vector.Matrix;
+import im.vector.R;
+import im.vector.adapters.VectorGroupsListAdapter;
+
+/**
+ * A dialog fragment showing the group ids list
+ */
+public class VectorUserGroupsDialogFragment extends DialogFragment {
+    private static final String LOG_TAG = VectorUserGroupsDialogFragment.class.getSimpleName();
+
+    private static final String ARG_SESSION_ID = "ARG_SESSION_ID";
+    private static final String ARG_USER_ID = "ARG_USER_ID";
+    private static final String ARG_GROUPS_ID = "ARG_GROUPS_ID";
+
+    public static VectorUserGroupsDialogFragment newInstance(String sessionId, String userId, List<String> groupIds) {
+        VectorUserGroupsDialogFragment f = new VectorUserGroupsDialogFragment();
+        Bundle args = new Bundle();
+        args.putString(ARG_SESSION_ID, sessionId);
+        args.putString(ARG_USER_ID, userId);
+        args.putStringArrayList(ARG_GROUPS_ID, new ArrayList<>(groupIds));
+        f.setArguments(args);
+        return f;
+    }
+
+    private MXSession mSession;
+    private String mUserId;
+    private ArrayList<String> mGroupIds;
+
+    @Override
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        mSession = Matrix.getInstance(getContext()).getSession(getArguments().getString(ARG_SESSION_ID));
+        mUserId = getArguments().getString(ARG_USER_ID);
+        mGroupIds = getArguments().getStringArrayList(ARG_GROUPS_ID);
+
+        // sanity check
+        if ((mSession == null) || TextUtils.isEmpty(mUserId)) {
+            Log.e(LOG_TAG, "## onCreate() : invalid parameters");
+            dismiss();
+        }
+    }
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState) {
+        super.onCreateView(inflater, container, savedInstanceState);
+        View v = inflater.inflate(R.layout.fragment_dialog_groups_list, container, false);
+        ListView listView = v.findViewById(R.id.listView_groups);
+
+        final VectorGroupsListAdapter adapter = new VectorGroupsListAdapter(getActivity(), R.layout.adapter_item_group_view, mSession);
+        adapter.addAll(mGroupIds);
+        listView.setAdapter(adapter);
+
+        return v;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        Dialog d = super.onCreateDialog(savedInstanceState);
+        d.setTitle(getString(R.string.groups_list));
+        return d;
+    }
+}
diff --git a/vector/src/main/java/im/vector/gcm/GcmRegistrationManager.java b/vector/src/main/java/im/vector/gcm/GcmRegistrationManager.java
index 6b8de7c922..244e3d0c5c 100755
--- a/vector/src/main/java/im/vector/gcm/GcmRegistrationManager.java
+++ b/vector/src/main/java/im/vector/gcm/GcmRegistrationManager.java
@@ -20,13 +20,16 @@
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.pm.PackageInfo;
+import android.net.Uri;
 import android.os.AsyncTask;
 import android.os.Build;
 import android.os.Handler;
 import android.os.Looper;
 import android.text.TextUtils;
 
+import org.matrix.androidsdk.HomeServerConnectionConfig;
 import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
+import org.matrix.androidsdk.rest.client.PushersRestClient;
 import org.matrix.androidsdk.util.Log;
 
 import org.matrix.androidsdk.MXSession;
@@ -42,7 +45,9 @@
 import im.vector.util.PreferencesManager;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Timer;
 import java.util.TimerTask;
 
@@ -133,8 +138,8 @@ private enum RegistrationState {
     // 3 states : null not initialized (retrieved by flavor)
     private static Boolean mUseGCM;
 
-    //
-    private boolean mLastBatteryOptimizationStatus;
+    // pusher rest client
+    private Map<String, PushersRestClient> mPushersRestClients = new HashMap<>();
 
     /**
      * Constructor
@@ -173,10 +178,40 @@ public void onNetworkConnectionUpdate(boolean isConnected) {
         });
 
         mRegistrationState = getStoredRegistrationState();
-        mLastBatteryOptimizationStatus = PreferencesManager.canStartBackgroundService(mContext);
         mRegistrationToken = getStoredRegistrationToken();
     }
 
+    /**
+     * Retrieves the pushers rest client.
+     *
+     * @param session the session
+     * @return the pushers rest client.
+     */
+    private PushersRestClient getPushersRestClient(MXSession session) {
+        PushersRestClient pushersRestClient = mPushersRestClients.get(session.getMyUserId());
+
+        if (null == pushersRestClient) {
+            // pusher uses a custom server
+            if (!TextUtils.isEmpty(mContext.getString(R.string.push_server_url))) {
+                try {
+                    HomeServerConnectionConfig hsConfig = new HomeServerConnectionConfig(Uri.parse(mContext.getString(R.string.push_server_url)));
+                    hsConfig.setCredentials(session.getCredentials());
+                    pushersRestClient = new PushersRestClient(hsConfig);
+                } catch (Exception e) {
+                    Log.e(LOG_TAG, "## getPushersRestClient() failed " + e.getMessage());
+                }
+            }
+
+            if (null == pushersRestClient) {
+                pushersRestClient = session.getPushersRestClient();
+            }
+
+            mPushersRestClients.put(session.getMyUserId(), pushersRestClient);
+        }
+
+        return pushersRestClient;
+    }
+
     /**
      * Check if the GCM registration has been broken with a new token ID.
      * The GCM could have cleared it (onTokenRefresh).
@@ -496,8 +531,7 @@ public void onThirdPartyUnregistrationFailed() {
      * @return true if the registration was done with event Id only
      */
     public void onAppResume() {
-        if ((mRegistrationState == RegistrationState.SERVER_REGISTERED) &&
-                (mLastBatteryOptimizationStatus != PreferencesManager.canStartBackgroundService(mContext))) {
+        if (mRegistrationState == RegistrationState.SERVER_REGISTERED) {
             Log.d(LOG_TAG, "## onAppResume() : force the GCM registration");
 
             forceSessionsRegistration(new ThirdPartyRegistrationListener() {
@@ -558,9 +592,9 @@ private void registerToThirdPartyServer(final MXSession session, final boolean a
 
         Log.d(LOG_TAG, "registerToThirdPartyServer of " + session.getMyUserId());
 
-        boolean eventIdOnlyPushes = isBackgroundSyncAllowed() && PreferencesManager.canStartBackgroundService(mContext);
+        boolean eventIdOnlyPushes = isBackgroundSyncAllowed();
 
-        session.getPushersRestClient()
+        getPushersRestClient(session)
                 .addHttpPusher(mRegistrationToken, DEFAULT_PUSHER_APP_ID, computePushTag(session),
                         mPusherLang, mPusherAppName, mBasePusherDeviceName,
                         DEFAULT_PUSHER_URL, append, eventIdOnlyPushes, new ApiCallback<Void>() {
@@ -633,7 +667,7 @@ public void onUnexpectedError(Exception e) {
      */
     public void refreshPushersList(List<MXSession> sessions, final ApiCallback<Void> callback) {
         if ((null != sessions) && (sessions.size() > 0)) {
-            sessions.get(0).getPushersRestClient().getPushers(new ApiCallback<PushersResponse>() {
+            getPushersRestClient(sessions.get(0)).getPushers(new ApiCallback<PushersResponse>() {
 
                 @Override
                 public void onSuccess(PushersResponse pushersResponse) {
@@ -880,9 +914,10 @@ public void onThirdPartyUnregistrationFailed() {
      * @param callback the asynchronous callback
      */
     public void unregister(final MXSession session, final Pusher pusher, final ApiCallback<Void> callback) {
-        session.getPushersRestClient().removeHttpPusher(pusher.pushkey, pusher.appId, pusher.profileTag, pusher.lang, pusher.appDisplayName, pusher.deviceDisplayName, pusher.data.get("url"), new ApiCallback<Void>() {
+        getPushersRestClient(session).removeHttpPusher(pusher.pushkey, pusher.appId, pusher.profileTag, pusher.lang, pusher.appDisplayName, pusher.deviceDisplayName, pusher.data.get("url"), new ApiCallback<Void>() {
             @Override
             public void onSuccess(Void info) {
+                mPushersRestClients.remove(session.getMyUserId());
                 refreshPushersList(new ArrayList<>(Matrix.getInstance(mContext).getSessions()), callback);
             }
 
@@ -896,6 +931,7 @@ public void onNetworkError(Exception e) {
             @Override
             public void onMatrixError(MatrixError e) {
                 if (e.mStatus == 404) {
+                    mPushersRestClients.remove(session.getMyUserId());
                     // httpPusher is not available on server side anymore so assume the removal was successful
                     onSuccess(null);
                     return;
@@ -923,7 +959,7 @@ public void onUnexpectedError(Exception e) {
     public void unregister(final MXSession session, final ThirdPartyRegistrationListener listener) {
         Log.d(LOG_TAG, "unregister " + session.getMyUserId());
 
-        session.getPushersRestClient()
+        getPushersRestClient(session)
                 .removeHttpPusher(mRegistrationToken, DEFAULT_PUSHER_APP_ID, computePushTag(session),
                         mPusherLang, mPusherAppName, mBasePusherDeviceName,
                         DEFAULT_PUSHER_URL, new ApiCallback<Void>() {
@@ -1128,7 +1164,7 @@ public void setBackgroundSyncAllowed(boolean isAllowed) {
      * @return the sync timeout in ms.
      */
     public int getBackgroundSyncTimeOut() {
-        return getGcmSharedPreferences().getInt(PREFS_SYNC_TIMEOUT, 30000);
+        return getGcmSharedPreferences().getInt(PREFS_SYNC_TIMEOUT, 6000);
     }
 
     /**
@@ -1146,10 +1182,10 @@ public void setBackgroundSyncTimeOut(int syncDelay) {
      * @return the delay between two syncs in ms.
      */
     public int getBackgroundSyncDelay() {
-        // on fdroid version, the default sync delay is about 10 minutes
+        // on fdroid version, the default sync delay is about 1 minutes
         // set a large value because many users don't know it can be defined from the settings page
         if ((null == mRegistrationToken) && (null == getStoredRegistrationToken()) && !getGcmSharedPreferences().contains(PREFS_SYNC_DELAY)) {
-            return 10 * 60 * 1000;
+            return 60 * 1000;
         } else {
             int currentValue = 0;
             MXSession session = Matrix.getInstance(mContext).getDefaultSession();
diff --git a/vector/src/main/java/im/vector/listeners/IMessagesAdapterActionsListener.java b/vector/src/main/java/im/vector/listeners/IMessagesAdapterActionsListener.java
index 1f81493279..0a36786640 100755
--- a/vector/src/main/java/im/vector/listeners/IMessagesAdapterActionsListener.java
+++ b/vector/src/main/java/im/vector/listeners/IMessagesAdapterActionsListener.java
@@ -21,6 +21,8 @@
 import org.matrix.androidsdk.crypto.data.MXDeviceInfo;
 import org.matrix.androidsdk.rest.model.Event;
 
+import java.util.List;
+
 /**
  * Actions listeners
  */
@@ -92,6 +94,14 @@ public interface IMessagesAdapterActionsListener {
      */
     void onMoreReadReceiptClick(String eventId);
 
+    /**
+     * Define the action to perform when the group flairs is clicked.
+     *
+     * @param userId the user id
+     * @param groupIds the group ids list
+     */
+    void onGroupFlairClick(String userId, List<String> groupIds);
+
     /**
      * An url has been clicked in a message text.
      *
@@ -135,6 +145,13 @@ public interface IMessagesAdapterActionsListener {
      */
     void onMessageIdClick(String messageId);
 
+    /**
+     * A group id has been clicked in a message body.
+     *
+     * @param groupId the group id.
+     */
+    void onGroupIdClick(String groupId);
+
     /**
      * The required indexes are not anymore valid.
      */
diff --git a/vector/src/main/java/im/vector/util/NotificationUtils.java b/vector/src/main/java/im/vector/notifications/NotificationUtils.java
similarity index 62%
rename from vector/src/main/java/im/vector/util/NotificationUtils.java
rename to vector/src/main/java/im/vector/notifications/NotificationUtils.java
index 88c371bbfd..7824c14b66 100755
--- a/vector/src/main/java/im/vector/util/NotificationUtils.java
+++ b/vector/src/main/java/im/vector/notifications/NotificationUtils.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package im.vector.util;
+package im.vector.notifications;
 
 import android.annotation.SuppressLint;
 import android.app.Notification;
@@ -38,16 +38,7 @@
 import android.text.SpannableString;
 import android.text.TextUtils;
 import android.text.style.StyleSpan;
-import android.widget.ImageView;
-
-import org.matrix.androidsdk.MXSession;
-import org.matrix.androidsdk.data.Room;
-import org.matrix.androidsdk.data.store.IMXStore;
-import org.matrix.androidsdk.rest.model.Event;
-import org.matrix.androidsdk.rest.model.RoomMember;
-import org.matrix.androidsdk.rest.model.User;
 import org.matrix.androidsdk.rest.model.bingrules.BingRule;
-import org.matrix.androidsdk.util.EventDisplay;
 import org.matrix.androidsdk.util.Log;
 
 import im.vector.Matrix;
@@ -60,11 +51,8 @@
 import im.vector.activity.VectorHomeActivity;
 import im.vector.activity.VectorRoomActivity;
 import im.vector.receiver.DismissNotificationReceiver;
+import im.vector.util.PreferencesManager;
 
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
 import java.util.List;
 import java.util.Map;
 import java.util.Random;
@@ -82,37 +70,6 @@ public class NotificationUtils {
     public static final String ACTION_MESSAGE_REPLY = "ACTION_MESSAGE_REPLY";
     public static final String EXTRA_ROOM_ID = "EXTRA_ROOM_ID";
 
-    /**
-     * Retrieve the room name.
-     *
-     * @param session the session
-     * @param room    the room
-     * @param event   the event
-     * @return the room name
-     */
-    public static String getRoomName(Context context, MXSession session, Room room, Event event) {
-        String roomName = VectorUtils.getRoomDisplayName(context, session, room);
-
-        // avoid displaying the room Id
-        // try to find the sender display name
-        if (TextUtils.equals(roomName, room.getRoomId())) {
-            roomName = room.getName(session.getMyUserId());
-
-            // avoid room Id as name
-            if (TextUtils.equals(roomName, room.getRoomId()) && (null != event)) {
-                User user = session.getDataHandler().getStore().getUser(event.sender);
-
-                if (null != user) {
-                    roomName = user.displayname;
-                } else {
-                    roomName = event.sender;
-                }
-            }
-        }
-
-        return roomName;
-    }
-
     // on devices >= android O, we need to define a channel for each notifications
     public static final String LISTEN_FOR_EVENTS_NOTIFICATION_CHANNEL_ID = "LISTEN_FOR_EVENTS_NOTIFICATION_CHANNEL_ID";
 
@@ -357,159 +314,41 @@ else if (width > height) {
         return resizedBitmap;
     }
 
-    /**
-     * This class manages the notification display.
-     * It contains the message to display and its timestamp
-     */
-    static class NotificationDisplay {
-        final long mEventTs;
-        final SpannableString mMessage;
-
-        NotificationDisplay(long ts, SpannableString message) {
-            mEventTs = ts;
-            mMessage = message;
-        }
-    }
-
-    /**
-     * NotificationDisplay comparator
-     */
-    private static final Comparator<NotificationDisplay> mNotificationDisplaySort = new Comparator<NotificationDisplay>() {
-        @Override
-        public int compare(NotificationDisplay lhs, NotificationDisplay rhs) {
-            long t0 = lhs.mEventTs;
-            long t1 = rhs.mEventTs;
-
-            if (t0 > t1) {
-                return -1;
-            } else if (t0 < t1) {
-                return +1;
-            }
-            return 0;
-        }
-    };
-
-    /**
-     * Define a notified event
-     * i.e the matched bing rules
-     */
-    public static class NotifiedEvent {
-        public final BingRule mBingRule;
-        public final String mRoomId;
-        public final String mEventId;
-        public final long mOriginServerTs;
-
-        public NotifiedEvent(String roomId, String eventId, BingRule bingRule, long originServerTs) {
-            mRoomId = roomId;
-            mEventId = eventId;
-            mBingRule = bingRule;
-            mOriginServerTs = originServerTs;
-        }
-    }
-
-    // max number of lines to display the notification text styles
-    private static final int MAX_NUMBER_NOTIFICATION_LINES = 10;
-
     /**
      * Add a text style to a notification when there are several notified rooms.
      *
-     * @param context                the context
-     * @param builder                the notification builder
-     * @param notifiedEventsByRoomId the notified events by room ids
+     * @param context            the context
+     * @param builder            the notification builder
+     * @param roomsNotifications the rooms notifications
      */
     private static void addTextStyleWithSeveralRooms(Context context,
                                                      NotificationCompat.Builder builder,
-                                                     NotifiedEvent eventToNotify,
-                                                     boolean isInvitationEvent,
-                                                     Map<String, List<NotifiedEvent>> notifiedEventsByRoomId) {
-        // TODO manage multi accounts
-        MXSession session = Matrix.getInstance(context).getDefaultSession();
-        IMXStore store = session.getDataHandler().getStore();
+                                                     RoomsNotifications roomsNotifications) {
         NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle();
 
-        int sum = 0;
-        int roomsCount = 0;
-
-
-        List<NotificationDisplay> notificationsList = new ArrayList<>();
-
-        for (String roomId : notifiedEventsByRoomId.keySet()) {
-            Room room = session.getDataHandler().getRoom(roomId);
-            String roomName = getRoomName(context, session, room, null);
-
-            List<NotifiedEvent> notifiedEvents = notifiedEventsByRoomId.get(roomId);
-            Event latestEvent = store.getEvent(notifiedEvents.get(notifiedEvents.size() - 1).mEventId, roomId);
-
-            String text;
-            String header;
-
-            EventDisplay eventDisplay = new RiotEventDisplay(context, latestEvent, room.getLiveState());
-            eventDisplay.setPrependMessagesWithAuthor(false);
-
-            if (room.isInvited()) {
-                header = roomName + ": ";
-                CharSequence textualDisplay = eventDisplay.getTextualDisplay();
-                text = !TextUtils.isEmpty(textualDisplay) ? textualDisplay.toString() : "";
-            } else if (1 == notifiedEvents.size()) {
-                eventDisplay = new RiotEventDisplay(context, latestEvent, room.getLiveState());
-                eventDisplay.setPrependMessagesWithAuthor(false);
-
-                header = roomName + ": " + room.getLiveState().getMemberName(latestEvent.getSender()) + " ";
-
-                CharSequence textualDisplay = eventDisplay.getTextualDisplay();
 
-                // the event might have been redacted
-                if (!TextUtils.isEmpty(textualDisplay)) {
-                    text = textualDisplay.toString();
-                } else {
-                    text = "";
-                }
-            } else {
-                header = roomName + ": ";
-                text = context.getString(R.string.notification_unread_notified_messages, notifiedEvents.size());
-            }
-
-            // ad the line if it makes sense
-            if (!TextUtils.isEmpty(text)) {
-                SpannableString notifiedLine = new SpannableString(header + text);
-                notifiedLine.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 0, header.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-                notificationsList.add(new NotificationDisplay(latestEvent.getOriginServerTs(), notifiedLine));
-                sum += notifiedEvents.size();
-                roomsCount++;
-            }
-        }
-
-        Collections.sort(notificationsList, mNotificationDisplaySort);
-
-        if (notificationsList.size() > MAX_NUMBER_NOTIFICATION_LINES) {
-            notificationsList = notificationsList.subList(0, MAX_NUMBER_NOTIFICATION_LINES);
-        }
-
-        for (NotificationDisplay notificationDisplay : notificationsList) {
-            inboxStyle.addLine(notificationDisplay.mMessage);
+        for (RoomNotifications roomNotifications : roomsNotifications.mRoomNotifications) {
+            SpannableString notifiedLine = new SpannableString(roomNotifications.mMessagesSummary);
+            notifiedLine.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 0, roomNotifications.mMessageHeader.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            inboxStyle.addLine(notifiedLine);
         }
 
         inboxStyle.setBigContentTitle(context.getString(R.string.riot_app_name));
-        inboxStyle.setSummaryText(context.getString(R.string.notification_unread_notified_messages_in_room, sum, roomsCount));
+        inboxStyle.setSummaryText(roomsNotifications.mSummaryText);
         builder.setStyle(inboxStyle);
 
         TaskStackBuilder stackBuilderTap = TaskStackBuilder.create(context);
         Intent roomIntentTap;
-        // sanity check
-        if ((null == eventToNotify) || TextUtils.isEmpty(eventToNotify.mRoomId)) {
-            // Build the pending intent for when the notification is clicked
-            roomIntentTap = new Intent(context, VectorHomeActivity.class);
-        } else {
-            // add the home page the activity stack
-            stackBuilderTap.addNextIntentWithParentStack(new Intent(context, VectorHomeActivity.class));
 
-            if (isInvitationEvent) {
-                // for invitation the room preview must be displayed
-                roomIntentTap = CommonActivityUtils.buildIntentPreviewRoom(session.getMyUserId(), eventToNotify.mRoomId, context, VectorFakeRoomPreviewActivity.class);
-            } else {
-                roomIntentTap = new Intent(context, VectorRoomActivity.class);
-                roomIntentTap.putExtra(VectorRoomActivity.EXTRA_ROOM_ID, eventToNotify.mRoomId);
-            }
+        // add the home page the activity stack
+        stackBuilderTap.addNextIntentWithParentStack(new Intent(context, VectorHomeActivity.class));
+
+        if (roomsNotifications.mIsInvitationEvent) {
+            // for invitation the room preview must be displayed
+            roomIntentTap = CommonActivityUtils.buildIntentPreviewRoom(roomsNotifications.mSessionId, roomsNotifications.mRoomId, context, VectorFakeRoomPreviewActivity.class);
+        } else {
+            roomIntentTap = new Intent(context, VectorRoomActivity.class);
+            roomIntentTap.putExtra(VectorRoomActivity.EXTRA_ROOM_ID, roomsNotifications.mRoomId);
         }
 
         // the action must be unique else the parameters are ignored
@@ -530,54 +369,6 @@ private static void addTextStyleWithSeveralRooms(Context context,
                     context.getString(R.string.bottom_action_home),
                     viewAllTask.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT));
         }
-
-        // wearable
-        try {
-            long ts = 0;
-            Event latestEvent = null;
-
-            // search the oldest message
-            for (String roomId : notifiedEventsByRoomId.keySet()) {
-                List<NotifiedEvent> notifiedEvents = notifiedEventsByRoomId.get(roomId);
-                Event event = store.getEvent(notifiedEvents.get(notifiedEvents.size() - 1).mEventId, roomId);
-
-                if ((null != event) && (event.getOriginServerTs() > ts)) {
-                    ts = event.getOriginServerTs();
-                    latestEvent = event;
-                }
-            }
-
-            // if there is a valid latest message
-            if (null != latestEvent) {
-                Room room = store.getRoom(latestEvent.roomId);
-
-                if (null != room) {
-                    EventDisplay eventDisplay = new RiotEventDisplay(context, latestEvent, room.getLiveState());
-                    eventDisplay.setPrependMessagesWithAuthor(false);
-                    String roomName = getRoomName(context, session, room, null);
-
-                    String message = roomName + ": " + room.getLiveState().getMemberName(latestEvent.getSender()) + " ";
-
-                    CharSequence textualDisplay = eventDisplay.getTextualDisplay();
-
-                    // the event might have been redacted
-                    if (!TextUtils.isEmpty(textualDisplay)) {
-                        message += textualDisplay.toString();
-                    }
-
-                    NotificationCompat.WearableExtender wearableExtender = new NotificationCompat.WearableExtender();
-                    NotificationCompat.Action action =
-                            new NotificationCompat.Action.Builder(R.drawable.message_notification_transparent,
-                                    message,
-                                    stackBuilderTap.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT))
-                                    .build();
-                    wearableExtender.addAction(action);
-                    builder.extend(wearableExtender);
-                }
-            }
-        } catch (Exception e) {
-            Log.e(LOG_TAG, "## addTextStyleWithSeveralRooms() : WearableExtender failed " + e.getMessage());
-        }
     }
 
     /**
@@ -595,91 +386,53 @@ private static void addTextStyleWithSeveralRooms(Context context,
      * - "Room Name : XX unread messages" if there are many unread messages
      * - 'Room Name : Sender   - Message body" if there is only one unread message.
      *
-     * @param context                the context
-     * @param builder                the notification builder
-     * @param eventToNotify          the latest notified event
-     * @param isInvitationEvent      true if the notified event is an invitation
-     * @param notifiedEventsByRoomId the notified events by room ids
+     * @param context            the context
+     * @param builder            the notification builder
+     * @param roomsNotifications the rooms notifications
      */
     private static void addTextStyle(Context context,
                                      NotificationCompat.Builder builder,
-                                     NotifiedEvent eventToNotify,
-                                     boolean isInvitationEvent,
-                                     Map<String, List<NotifiedEvent>> notifiedEventsByRoomId) {
+                                     RoomsNotifications roomsNotifications) {
 
         // nothing to do
-        if (0 == notifiedEventsByRoomId.size()) {
+        if (0 == roomsNotifications.mRoomNotifications.size()) {
             return;
         }
 
         // when there are several rooms, the text style is not the same
-        if (notifiedEventsByRoomId.size() > 1) {
-            addTextStyleWithSeveralRooms(context, builder, eventToNotify, isInvitationEvent, notifiedEventsByRoomId);
+        if (roomsNotifications.mRoomNotifications.size() > 1) {
+            addTextStyleWithSeveralRooms(context, builder, roomsNotifications);
             return;
         }
 
-        // TODO manage multi accounts
-        MXSession session = Matrix.getInstance(context).getDefaultSession();
-        IMXStore store = session.getDataHandler().getStore();
+        SpannableString latestText = null;
         NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle();
 
-        String roomId = notifiedEventsByRoomId.keySet().iterator().next();
-
-        Room room = session.getDataHandler().getRoom(roomId);
-        String roomName = getRoomName(context, session, room, null);
-
-        List<NotifiedEvent> notifiedEvents = notifiedEventsByRoomId.get(roomId);
-        int unreadCount = notifiedEvents.size();
-
-        // the messages are sorted from the oldest to the latest
-        Collections.reverse(notifiedEvents);
-
-        if (notifiedEvents.size() > MAX_NUMBER_NOTIFICATION_LINES) {
-            notifiedEvents = notifiedEvents.subList(0, MAX_NUMBER_NOTIFICATION_LINES);
+        for (CharSequence sequence : roomsNotifications.mReversedMessagesList) {
+            inboxStyle.addLine(latestText = new SpannableString(sequence));
         }
 
-        SpannableString latestText = null;
-
-        for (NotifiedEvent notifiedEvent : notifiedEvents) {
-            Event event = store.getEvent(notifiedEvent.mEventId, notifiedEvent.mRoomId);
-            EventDisplay eventDisplay = new RiotEventDisplay(context, event, room.getLiveState());
-            eventDisplay.setPrependMessagesWithAuthor(true);
-            CharSequence textualDisplay = eventDisplay.getTextualDisplay();
-
-            if (!TextUtils.isEmpty(textualDisplay)) {
-                inboxStyle.addLine(latestText = new SpannableString(textualDisplay));
-            }
-        }
-        inboxStyle.setBigContentTitle(roomName);
+        inboxStyle.setBigContentTitle(roomsNotifications.mContentTitle);
 
         // adapt the notification display to the number of notified messages
-        if ((1 == notifiedEvents.size()) && (null != latestText)) {
+        if ((1 == roomsNotifications.mReversedMessagesList.size()) && (null != latestText)) {
             builder.setStyle(new NotificationCompat.BigTextStyle().bigText(latestText));
         } else {
-            if (unreadCount > MAX_NUMBER_NOTIFICATION_LINES) {
-                inboxStyle.setSummaryText(context.getString(R.string.notification_unread_notified_messages, unreadCount));
+            if (!TextUtils.isEmpty(roomsNotifications.mSummaryText)) {
+                inboxStyle.setSummaryText(roomsNotifications.mSummaryText);
             }
-
             builder.setStyle(inboxStyle);
         }
 
         // do not offer to quick respond if the user did not dismiss the previous one
         if (!LockScreenActivity.isDisplayingALockScreenActivity()) {
-            if (!isInvitationEvent) {
-                Event event = store.getEvent(eventToNotify.mEventId, eventToNotify.mRoomId);
-                RoomMember member = room.getMember(event.getSender());
+            if (!roomsNotifications.mIsInvitationEvent) {
 
                 // offer to type a quick answer (i.e. without launching the application)
                 Intent quickReplyIntent = new Intent(context, LockScreenActivity.class);
-                quickReplyIntent.putExtra(LockScreenActivity.EXTRA_ROOM_ID, roomId);
-                quickReplyIntent.putExtra(LockScreenActivity.EXTRA_SENDER_NAME, (null == member) ? event.getSender() : member.getName());
-
-                EventDisplay eventDisplay = new RiotEventDisplay(context, event, room.getLiveState());
-                eventDisplay.setPrependMessagesWithAuthor(false);
-                CharSequence textualDisplay = eventDisplay.getTextualDisplay();
-                String body = !TextUtils.isEmpty(textualDisplay) ? textualDisplay.toString() : "";
-
-                quickReplyIntent.putExtra(LockScreenActivity.EXTRA_MESSAGE_BODY, body);
+                quickReplyIntent.putExtra(LockScreenActivity.EXTRA_ROOM_ID, roomsNotifications.mRoomId);
+                quickReplyIntent.putExtra(LockScreenActivity.EXTRA_SENDER_NAME, roomsNotifications.mSenderName);
+                quickReplyIntent.putExtra(LockScreenActivity.EXTRA_MESSAGE_BODY, roomsNotifications.mQuickReplyBody);
 
                 // the action must be unique else the parameters are ignored
                 quickReplyIntent.setAction(QUICK_LAUNCH_ACTION + ((int) (System.currentTimeMillis())));
@@ -692,8 +445,8 @@ private static void addTextStyle(Context context,
                 {
                     // offer to type a quick reject button
                     Intent leaveIntent = new Intent(context, JoinScreenActivity.class);
-                    leaveIntent.putExtra(JoinScreenActivity.EXTRA_ROOM_ID, roomId);
-                    leaveIntent.putExtra(JoinScreenActivity.EXTRA_MATRIX_ID, session.getMyUserId());
+                    leaveIntent.putExtra(JoinScreenActivity.EXTRA_ROOM_ID, roomsNotifications.mRoomId);
+                    leaveIntent.putExtra(JoinScreenActivity.EXTRA_MATRIX_ID, roomsNotifications.mSessionId);
                     leaveIntent.putExtra(JoinScreenActivity.EXTRA_REJECT, true);
 
                     // the action must be unique else the parameters are ignored
@@ -708,8 +461,8 @@ private static void addTextStyle(Context context,
                 {
                     // offer to type a quick accept button
                     Intent acceptIntent = new Intent(context, JoinScreenActivity.class);
-                    acceptIntent.putExtra(JoinScreenActivity.EXTRA_ROOM_ID, roomId);
-                    acceptIntent.putExtra(JoinScreenActivity.EXTRA_MATRIX_ID, session.getMyUserId());
+                    acceptIntent.putExtra(JoinScreenActivity.EXTRA_ROOM_ID, roomsNotifications.mRoomId);
+                    acceptIntent.putExtra(JoinScreenActivity.EXTRA_MATRIX_ID, roomsNotifications.mSessionId);
                     acceptIntent.putExtra(JoinScreenActivity.EXTRA_JOIN, true);
 
                     // the action must be unique else the parameters are ignored
@@ -725,12 +478,12 @@ private static void addTextStyle(Context context,
             // Build the pending intent for when the notification is clicked
             Intent roomIntentTap;
 
-            if (isInvitationEvent) {
+            if (roomsNotifications.mIsInvitationEvent) {
                 // for invitation the room preview must be displayed
-                roomIntentTap = CommonActivityUtils.buildIntentPreviewRoom(session.getMyUserId(), roomId, context, VectorFakeRoomPreviewActivity.class);
+                roomIntentTap = CommonActivityUtils.buildIntentPreviewRoom(roomsNotifications.mSessionId, roomsNotifications.mRoomId, context, VectorFakeRoomPreviewActivity.class);
             } else {
                 roomIntentTap = new Intent(context, VectorRoomActivity.class);
-                roomIntentTap.putExtra(VectorRoomActivity.EXTRA_ROOM_ID, roomId);
+                roomIntentTap.putExtra(VectorRoomActivity.EXTRA_ROOM_ID, roomsNotifications.mRoomId);
             }
             // the action must be unique else the parameters are ignored
             roomIntentTap.setAction(TAP_TO_VIEW_ACTION + ((int) (System.currentTimeMillis())));
@@ -748,33 +501,16 @@ private static void addTextStyle(Context context,
                     stackBuilderTap.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT));
 
             // wearable
-            if (!isInvitationEvent) {
+            if (!roomsNotifications.mIsInvitationEvent) {
                 try {
-                    Event latestEvent = store.getEvent(notifiedEvents.get(notifiedEvents.size() - 1).mEventId, roomId);
-
-                    // if there is a valid latest message
-                    if (null != latestEvent) {
-                        EventDisplay eventDisplay = new RiotEventDisplay(context, latestEvent, room.getLiveState());
-                        eventDisplay.setPrependMessagesWithAuthor(false);
-
-                        String message = roomName + ": " + room.getLiveState().getMemberName(latestEvent.getSender()) + " ";
-
-                        CharSequence textualDisplay = eventDisplay.getTextualDisplay();
-
-                        // the event might have been redacted
-                        if (!TextUtils.isEmpty(textualDisplay)) {
-                            message += textualDisplay.toString();
-                        }
-
-                        NotificationCompat.WearableExtender wearableExtender = new NotificationCompat.WearableExtender();
-                        NotificationCompat.Action action =
-                                new NotificationCompat.Action.Builder(R.drawable.message_notification_transparent,
-                                        message,
-                                        stackBuilderTap.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT))
-                                        .build();
-                        wearableExtender.addAction(action);
-                        builder.extend(wearableExtender);
-                    }
+                    NotificationCompat.WearableExtender wearableExtender = new NotificationCompat.WearableExtender();
+                    NotificationCompat.Action action =
+                            new NotificationCompat.Action.Builder(R.drawable.message_notification_transparent,
+                                    roomsNotifications.mWearableMessage,
+                                    stackBuilderTap.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT))
+                                    .build();
+                    wearableExtender.addAction(action);
+                    builder.extend(wearableExtender);
                 } catch (Exception e) {
                     Log.e(LOG_TAG, "## addTextStyleWithSeveralRooms() : WearableExtender failed " + e.getMessage());
                 }
@@ -827,6 +563,30 @@ private static void manageNotificationSound(Context context, NotificationCompat.
         }
     }
 
+    /**
+     * Build a notification from the cached RoomsNotifications instance.
+     *
+     * @param context                the context
+     * @param isBackground           true if it is background notification
+     * @return the notification
+     */
+    public static Notification buildMessageNotification(Context context, boolean isBackground) {
+
+        Notification notification = null;
+        try {
+            RoomsNotifications roomsNotifications = RoomsNotifications.loadRoomsNotifications(context);
+
+            if (null != roomsNotifications) {
+                notification = buildMessageNotification(context, roomsNotifications, new BingRule(), isBackground);
+            }
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "## buildMessageNotification() : failed " +  e.getMessage());
+        }
+
+        return notification;
+    }
+
+
     /**
      * Build a notification
      *
@@ -840,81 +600,60 @@ public static Notification buildMessageNotification(Context context,
                                                         Map<String, List<NotifiedEvent>> notifiedEventsByRoomId,
                                                         NotifiedEvent eventToNotify,
                                                         boolean isBackground) {
-        try {
-            // TODO manage multi accounts
-            MXSession session = Matrix.getInstance(context).getDefaultSession();
-            IMXStore store = session.getDataHandler().getStore();
 
-            if (null == store) {
-                Log.e(LOG_TAG, "## buildMessageNotification() : null store");
-                return null;
-            }
-
-            Room room = store.getRoom(eventToNotify.mRoomId);
-            Event event = store.getEvent(eventToNotify.mEventId, eventToNotify.mRoomId);
-
-            // sanity check
-            if ((null == room) || (null == event)) {
-                if (null == room) {
-                    Log.e(LOG_TAG, "## buildMessageNotification() : null room " + eventToNotify.mRoomId);
-                } else {
-                    Log.e(LOG_TAG, "## buildMessageNotification() : null event " + eventToNotify.mEventId + " " + eventToNotify.mRoomId);
-                }
-                return null;
-            }
-
-            BingRule bingRule = eventToNotify.mBingRule;
-
-            boolean isInvitationEvent = false;
+        Notification notification = null;
+        try {
+            RoomsNotifications roomsNotifications = new RoomsNotifications(eventToNotify, notifiedEventsByRoomId);
+            notification = buildMessageNotification(context, roomsNotifications, eventToNotify.mBingRule, isBackground);
+            // cache the value
+            RoomsNotifications.saveRoomNotifications(context, roomsNotifications);
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "## buildMessageNotification() : failed " +  e.getMessage());
+        }
 
-            EventDisplay eventDisplay = new RiotEventDisplay(context, event, room.getLiveState());
-            eventDisplay.setPrependMessagesWithAuthor(true);
-            CharSequence textualDisplay = eventDisplay.getTextualDisplay();
-            String body = !TextUtils.isEmpty(textualDisplay) ? textualDisplay.toString() : "";
+        return notification;
+    }
 
-            if (Event.EVENT_TYPE_STATE_ROOM_MEMBER.equals(event.getType())) {
-                try {
-                    isInvitationEvent = "invite".equals(event.getContentAsJsonObject().getAsJsonPrimitive("membership").getAsString());
-                } catch (Exception e) {
-                    Log.e(LOG_TAG, "prepareNotification : invitation parsing failed");
-                }
-            }
 
+    /**
+     * Build a notification
+     *
+     * @param context                the context
+     * @param roomsNotifications the rooms notifications
+     * @param bingRule          the bing rule
+     * @param isBackground           true if it is background notification
+     * @return the notification
+     */
+    private static Notification buildMessageNotification(Context context,
+                                                        RoomsNotifications roomsNotifications,
+                                                        BingRule bingRule,
+                                                        boolean isBackground) {
+        try {
             Bitmap largeBitmap = null;
 
             // when the event is an invitation one
             // don't check if the sender ID is known because the members list are not yet downloaded
-            if (!isInvitationEvent) {
+            if (!roomsNotifications.mIsInvitationEvent) {
                 // is there any avatar url
-                if (!TextUtils.isEmpty(room.getAvatarUrl())) {
-                    int size = context.getResources().getDimensionPixelSize(R.dimen.profile_avatar_size);
-
-                    // check if the thumbnail is already downloaded
-                    File f = session.getMediasCache().thumbnailCacheFile(room.getAvatarUrl(), size);
-
-                    if (null != f) {
-                        BitmapFactory.Options options = new BitmapFactory.Options();
-                        options.inPreferredConfig = Bitmap.Config.ARGB_8888;
-                        try {
-                            largeBitmap = BitmapFactory.decodeFile(f.getPath(), options);
-                        } catch (OutOfMemoryError oom) {
-                            Log.e(LOG_TAG, "decodeFile failed with an oom");
-                        }
-                    } else {
-                        session.getMediasCache().loadAvatarThumbnail(session.getHomeServerConfig(), new ImageView(context), room.getAvatarUrl(), size);
+                if (!TextUtils.isEmpty(roomsNotifications.mRoomAvatarPath)) {
+                    BitmapFactory.Options options = new BitmapFactory.Options();
+                    options.inPreferredConfig = Bitmap.Config.ARGB_8888;
+                    try {
+                        largeBitmap = BitmapFactory.decodeFile(roomsNotifications.mRoomAvatarPath, options);
+                    } catch (OutOfMemoryError oom) {
+                        Log.e(LOG_TAG, "decodeFile failed with an oom");
                     }
                 }
             }
 
             Log.d(LOG_TAG, "prepareNotification : with sound " + bingRule.isDefaultNotificationSound(bingRule.getNotificationSound()));
 
-            String roomName = getRoomName(context, session, room, event);
-
             addNotificationChannels(context);
+
             NotificationCompat.Builder builder = new NotificationCompat.Builder(context, SILENT_NOTIFICATION_CHANNEL_ID);
-            builder.setWhen(event.getOriginServerTs());
-            builder.setContentTitle(roomName);
-            builder.setContentText(body);
+            builder.setWhen(roomsNotifications.mContentTs);
+            builder.setContentTitle(roomsNotifications.mContentTitle);
+            builder.setContentText(roomsNotifications.mContentText);
 
             builder.setGroup(context.getString(R.string.riot_app_name));
             builder.setGroupSummary(true);
@@ -922,14 +661,14 @@ public static Notification buildMessageNotification(Context context,
             builder.setDeleteIntent(PendingIntent.getBroadcast(context.getApplicationContext(), 0, new Intent(context.getApplicationContext(), DismissNotificationReceiver.class), PendingIntent.FLAG_UPDATE_CURRENT));
 
             try {
-                addTextStyle(context, builder, eventToNotify, isInvitationEvent, notifiedEventsByRoomId);
+                addTextStyle(context, builder, roomsNotifications);
             } catch (Exception e) {
                 Log.e(LOG_TAG, "## buildMessageNotification() : addTextStyle failed " + e.getMessage());
             }
 
             // only one room : display the large bitmap (it should be the room avatar
             // several rooms : display the Riot avatar
-            if (notifiedEventsByRoomId.keySet().size() == 1) {
+            if (roomsNotifications.mRoomNotifications.size() == 1) {
                 if (null != largeBitmap) {
                     largeBitmap = NotificationUtils.createSquareBitmap(largeBitmap);
                     builder.setLargeIcon(largeBitmap);
@@ -967,7 +706,7 @@ public static Notification buildMessagesListNotification(Context context, List<C
 
             NotificationCompat.InboxStyle inboxStyle = new NotificationCompat.InboxStyle();
 
-            for (int i = 0; i < Math.min(MAX_NUMBER_NOTIFICATION_LINES, messagesStrings.size()); i++) {
+            for (int i = 0; i < Math.min(RoomsNotifications.MAX_NUMBER_NOTIFICATION_LINES, messagesStrings.size()); i++) {
                 inboxStyle.addLine(messagesStrings.get(i));
             }
 
diff --git a/vector/src/main/java/im/vector/notifications/NotifiedEvent.java b/vector/src/main/java/im/vector/notifications/NotifiedEvent.java
new file mode 100755
index 0000000000..9012bb3f98
--- /dev/null
+++ b/vector/src/main/java/im/vector/notifications/NotifiedEvent.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.notifications;
+
+import org.matrix.androidsdk.rest.model.bingrules.BingRule;
+
+/**
+ * Define a notified event
+ * i.e the matched bing rules
+ */
+public class NotifiedEvent {
+    public final BingRule mBingRule;
+    public final String mRoomId;
+    public final String mEventId;
+    public final long mOriginServerTs;
+
+    public NotifiedEvent(String roomId, String eventId, BingRule bingRule, long originServerTs) {
+        mRoomId = roomId;
+        mEventId = eventId;
+        mBingRule = bingRule;
+        mOriginServerTs = originServerTs;
+    }
+}
diff --git a/vector/src/main/java/im/vector/notifications/RoomNotifications.java b/vector/src/main/java/im/vector/notifications/RoomNotifications.java
new file mode 100755
index 0000000000..6bcbb63bd4
--- /dev/null
+++ b/vector/src/main/java/im/vector/notifications/RoomNotifications.java
@@ -0,0 +1,110 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.notifications;
+
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.TextUtils;
+
+import java.util.Comparator;
+
+/**
+ * RoomNotifications
+ */
+public class RoomNotifications implements Parcelable {
+    private static final String LOG_TAG = RoomNotifications.class.getSimpleName();
+
+    String mRoomId = "";
+    String mRoomName = "";
+    String mMessageHeader = "";
+    CharSequence mMessagesSummary = "";
+    long mLatestEventTs = -1;
+
+    String mSenderName = "";
+    int mUnreadMessagesCount = -1;
+
+    /**
+     * NotificationDisplay comparator
+     */
+    static final Comparator<RoomNotifications> mRoomNotificationsComparator = new Comparator<RoomNotifications>() {
+        @Override
+        public int compare(RoomNotifications lhs, RoomNotifications rhs) {
+            long t0 = lhs.mLatestEventTs;
+            long t1 = rhs.mLatestEventTs;
+
+            if (t0 > t1) {
+                return -1;
+            } else if (t0 < t1) {
+                return +1;
+            }
+            return 0;
+        }
+    };
+
+    // empty constructor
+    public RoomNotifications() {
+    }
+
+    /*
+     * *********************************************************************************************
+     * Parcelable
+     * *********************************************************************************************
+     */
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        out.writeString(mRoomId);
+        out.writeString(mRoomName);
+        out.writeString(mMessageHeader);
+        TextUtils.writeToParcel(mMessagesSummary, out, 0);
+        out.writeLong(mLatestEventTs);
+
+        out.writeString(mSenderName);
+        out.writeInt(mUnreadMessagesCount);
+    }
+
+    /**
+     * Creator from a parcel
+     *
+     * @param in the parcel
+     */
+    private RoomNotifications(Parcel in) {
+        mRoomId = in.readString();
+        mRoomName = in.readString();
+        mMessageHeader = in.readString();
+        mMessagesSummary = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in);
+        mLatestEventTs = in.readLong();
+        mSenderName = in.readString();
+        mUnreadMessagesCount = in.readInt();
+    }
+
+    public final static Parcelable.Creator<RoomNotifications> CREATOR
+            = new Parcelable.Creator<RoomNotifications>() {
+
+        public RoomNotifications createFromParcel(Parcel p) {
+            return new RoomNotifications(p);
+        }
+
+        public RoomNotifications[] newArray(int size) {
+            return new RoomNotifications[size];
+        }
+    };
+}
diff --git a/vector/src/main/java/im/vector/notifications/RoomsNotifications.java b/vector/src/main/java/im/vector/notifications/RoomsNotifications.java
new file mode 100755
index 0000000000..d4876f8841
--- /dev/null
+++ b/vector/src/main/java/im/vector/notifications/RoomsNotifications.java
@@ -0,0 +1,613 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.notifications;
+
+import android.content.Context;
+import android.os.Parcel;
+import android.os.Parcelable;
+import android.text.SpannableString;
+import android.text.TextUtils;
+import android.widget.ImageView;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.data.Room;
+import org.matrix.androidsdk.data.store.IMXStore;
+import org.matrix.androidsdk.rest.model.Event;
+import org.matrix.androidsdk.rest.model.RoomMember;
+import org.matrix.androidsdk.rest.model.User;
+import org.matrix.androidsdk.util.EventDisplay;
+import org.matrix.androidsdk.util.Log;
+
+import java.io.ByteArrayInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Map;
+
+import im.vector.Matrix;
+import im.vector.R;
+import im.vector.VectorApp;
+import im.vector.activity.LockScreenActivity;
+import im.vector.util.RiotEventDisplay;
+import im.vector.util.VectorUtils;
+
+/**
+ * RoomsNotifications
+ */
+public class RoomsNotifications implements Parcelable {
+    private static final String LOG_TAG = RoomsNotifications.class.getSimpleName();
+
+    // max number of lines to display the notification text styles
+    static final int MAX_NUMBER_NOTIFICATION_LINES = 10;
+
+    /****** Parcelable items ********/
+    // the session id
+    String mSessionId = "";
+
+    // the notified event room Id
+    String mRoomId = "";
+
+    // the notification summary
+    String mSummaryText = "";
+
+    // latest message with sender header
+    String mQuickReplyBody = "";
+
+    // wearable notification message
+    String mWearableMessage = "";
+
+    // true when the notified event is an invitation one
+    boolean mIsInvitationEvent = false;
+
+    // the room avatar
+    String mRoomAvatarPath = "";
+
+    // notified message TS
+    long mContentTs = -1;
+
+    // content title
+    String mContentTitle = "";
+
+    // the context text
+    String mContentText = "";
+
+    String mSenderName = "";
+
+    // the notifications list
+    List<RoomNotifications> mRoomNotifications = new ArrayList<>();
+
+    // messages list
+    List<CharSequence> mReversedMessagesList = new ArrayList<>();
+
+    /****** others items ********/
+    // notified event
+    private NotifiedEvent mEventToNotify;
+
+    // notified events by room id
+    private Map<String, List<NotifiedEvent>> mNotifiedEventsByRoomId;
+
+    // notification details
+    private Context mContext;
+    private MXSession mSession;
+    private Room mRoom;
+    private Event mEvent;
+
+    /**
+     * Empty constructor
+     */
+    public RoomsNotifications() {
+    }
+
+    /**
+     * Constructor
+     *
+     * @param anEventToNotify            the event to notify
+     * @param someNotifiedEventsByRoomId the notified events
+     */
+    public RoomsNotifications(NotifiedEvent anEventToNotify,
+                              Map<String, List<NotifiedEvent>> someNotifiedEventsByRoomId) {
+        mContext = VectorApp.getInstance();
+        mSession = Matrix.getInstance(mContext).getDefaultSession();
+        IMXStore store = mSession.getDataHandler().getStore();
+
+        mEventToNotify = anEventToNotify;
+        mNotifiedEventsByRoomId = someNotifiedEventsByRoomId;
+
+        // the session id
+        mSessionId = mSession.getMyUserId();
+        mRoomId = anEventToNotify.mRoomId;
+        mRoom = store.getRoom(mEventToNotify.mRoomId);
+        mEvent = store.getEvent(mEventToNotify.mEventId, mEventToNotify.mRoomId);
+
+        // sanity check
+        if ((null == mRoom) || (null == mEvent)) {
+            if (null == mRoom) {
+                Log.e(LOG_TAG, "## RoomsNotifications() : null room " + mEventToNotify.mRoomId);
+            } else {
+                Log.e(LOG_TAG, "## RoomsNotifications() : null event " + mEventToNotify.mEventId + " " + mEventToNotify.mRoomId);
+            }
+            return;
+        }
+
+        mIsInvitationEvent = false;
+
+        EventDisplay eventDisplay = new RiotEventDisplay(mContext, mEvent, mRoom.getLiveState());
+        eventDisplay.setPrependMessagesWithAuthor(true);
+        CharSequence textualDisplay = eventDisplay.getTextualDisplay();
+        String body = !TextUtils.isEmpty(textualDisplay) ? textualDisplay.toString() : "";
+
+        if (Event.EVENT_TYPE_STATE_ROOM_MEMBER.equals(mEvent.getType())) {
+            try {
+                mIsInvitationEvent = "invite".equals(mEvent.getContentAsJsonObject().getAsJsonPrimitive("membership").getAsString());
+            } catch (Exception e) {
+                Log.e(LOG_TAG, "RoomsNotifications : invitation parsing failed");
+            }
+        }
+        // when the event is an invitation one
+        // don't check if the sender ID is known because the members list are not yet downloaded
+        if (!mIsInvitationEvent) {
+            int size = mContext.getResources().getDimensionPixelSize(R.dimen.profile_avatar_size);
+
+            File f = mSession.getMediasCache().thumbnailCacheFile(mRoom.getAvatarUrl(), size);
+
+            if (null != f) {
+                mRoomAvatarPath = f.getPath();
+            } else {
+                // prepare for the next time
+                mSession.getMediasCache().loadAvatarThumbnail(mSession.getHomeServerConfig(), new ImageView(mContext), mRoom.getAvatarUrl(), size);
+            }
+        }
+
+        String roomName = getRoomName(mContext, mSession, mRoom, mEvent);
+
+        mContentTs = mEvent.getOriginServerTs();
+        mContentTitle = roomName;
+        mContentText = body;
+
+        RoomMember member = mRoom.getMember(mEvent.getSender());
+        mSenderName = (null == member) ? mEvent.getSender() : member.getName();
+
+        boolean singleRoom = (mNotifiedEventsByRoomId.size() == 1);
+
+        if (singleRoom) {
+            initSingleRoom();
+        } else {
+            initMultiRooms();
+        }
+    }
+
+    /**
+     * Init for a single room notifications
+     */
+    private void initSingleRoom() {
+        RoomNotifications roomNotifications = new RoomNotifications();
+        mRoomNotifications.add(roomNotifications);
+        roomNotifications.mRoomId = mEvent.roomId;
+        roomNotifications.mRoomName = mContentTitle;
+
+        List<NotifiedEvent> notifiedEvents = mNotifiedEventsByRoomId.get(roomNotifications.mRoomId);
+        int unreadCount = notifiedEvents.size();
+
+        // the messages are sorted from the oldest to the latest
+        Collections.reverse(notifiedEvents);
+
+        if (notifiedEvents.size() > MAX_NUMBER_NOTIFICATION_LINES) {
+            notifiedEvents = notifiedEvents.subList(0, MAX_NUMBER_NOTIFICATION_LINES);
+        }
+
+        SpannableString latestText = null;
+        IMXStore store = mSession.getDataHandler().getStore();
+
+        for (NotifiedEvent notifiedEvent : notifiedEvents) {
+            Event event = store.getEvent(notifiedEvent.mEventId, notifiedEvent.mRoomId);
+            EventDisplay eventDisplay = new RiotEventDisplay(mContext, event, mRoom.getLiveState());
+            eventDisplay.setPrependMessagesWithAuthor(true);
+            CharSequence textualDisplay = eventDisplay.getTextualDisplay();
+
+            if (!TextUtils.isEmpty(textualDisplay)) {
+                mReversedMessagesList.add(textualDisplay);
+            }
+        }
+
+        // adapt the notification display to the number of notified messages
+        if ((1 == notifiedEvents.size()) && (null != latestText)) {
+            roomNotifications.mMessagesSummary = latestText;
+        } else {
+            if (unreadCount > MAX_NUMBER_NOTIFICATION_LINES) {
+                mSummaryText = mContext.getString(R.string.notification_unread_notified_messages, unreadCount);
+            }
+        }
+
+        // do not offer to quick respond if the user did not dismiss the previous one
+        if (!LockScreenActivity.isDisplayingALockScreenActivity()) {
+            if (!mIsInvitationEvent) {
+                Event event = store.getEvent(mEventToNotify.mEventId, mEventToNotify.mRoomId);
+                RoomMember member = mRoom.getMember(event.getSender());
+                roomNotifications.mSenderName = (null == member) ? event.getSender() : member.getName();
+
+                EventDisplay eventDisplay = new RiotEventDisplay(mContext, event, mRoom.getLiveState());
+                eventDisplay.setPrependMessagesWithAuthor(false);
+                CharSequence textualDisplay = eventDisplay.getTextualDisplay();
+                mQuickReplyBody = !TextUtils.isEmpty(textualDisplay) ? textualDisplay.toString() : "";
+            }
+        }
+
+        initWearableMessage(mContext, mRoom, store.getEvent(notifiedEvents.get(notifiedEvents.size() - 1).mEventId, roomNotifications.mRoomId), mIsInvitationEvent);
+    }
+
+    /**
+     * Init for multi rooms notifications
+     */
+    private void initMultiRooms() {
+        IMXStore store = mSession.getDataHandler().getStore();
+
+        int sum = 0;
+        int roomsCount = 0;
+
+        for (String roomId : mNotifiedEventsByRoomId.keySet()) {
+            Room room = mSession.getDataHandler().getRoom(roomId);
+            String roomName = getRoomName(mContext, mSession, room, null);
+
+            List<NotifiedEvent> notifiedEvents = mNotifiedEventsByRoomId.get(roomId);
+            Event latestEvent = store.getEvent(notifiedEvents.get(notifiedEvents.size() - 1).mEventId, roomId);
+
+            String text;
+            String header;
+
+            EventDisplay eventDisplay = new RiotEventDisplay(mContext, latestEvent, room.getLiveState());
+            eventDisplay.setPrependMessagesWithAuthor(false);
+
+            if (room.isInvited()) {
+                header = roomName + ": ";
+                CharSequence textualDisplay = eventDisplay.getTextualDisplay();
+                text = !TextUtils.isEmpty(textualDisplay) ? textualDisplay.toString() : "";
+            } else if (1 == notifiedEvents.size()) {
+                eventDisplay = new RiotEventDisplay(mContext, latestEvent, room.getLiveState());
+                eventDisplay.setPrependMessagesWithAuthor(false);
+
+                header = roomName + ": " + room.getLiveState().getMemberName(latestEvent.getSender()) + " ";
+
+                CharSequence textualDisplay = eventDisplay.getTextualDisplay();
+
+                // the event might have been redacted
+                if (!TextUtils.isEmpty(textualDisplay)) {
+                    text = textualDisplay.toString();
+                } else {
+                    text = "";
+                }
+            } else {
+                header = roomName + ": ";
+                text = mContext.getString(R.string.notification_unread_notified_messages, notifiedEvents.size());
+            }
+
+            // ad the line if it makes sense
+            if (!TextUtils.isEmpty(text)) {
+                RoomNotifications roomNotifications = new RoomNotifications();
+                mRoomNotifications.add(roomNotifications);
+
+                roomNotifications.mRoomId = roomId;
+                roomNotifications.mLatestEventTs = latestEvent.getOriginServerTs();
+                roomNotifications.mMessageHeader = header;
+                roomNotifications.mMessagesSummary = header + text;
+                sum += notifiedEvents.size();
+                roomsCount++;
+            }
+        }
+
+        Collections.sort(mRoomNotifications, RoomNotifications.mRoomNotificationsComparator);
+
+        if (mRoomNotifications.size() > MAX_NUMBER_NOTIFICATION_LINES) {
+            mRoomNotifications = mRoomNotifications.subList(0, MAX_NUMBER_NOTIFICATION_LINES);
+        }
+
+        mSummaryText = mContext.getString(R.string.notification_unread_notified_messages_in_room, sum, roomsCount);
+    }
+
+    /**
+     * Compute the wearable message
+     *
+     * @param context           the context
+     * @param room              the room
+     * @param latestEvent       the latest event
+     * @param isInvitationEvent true if it is an invitaion
+     */
+    private void initWearableMessage(Context context, Room room, Event latestEvent, boolean isInvitationEvent) {
+        if (!isInvitationEvent) {
+            // if there is a valid latest message
+            if ((null != latestEvent) && (null != room)) {
+                MXSession session = Matrix.getInstance(context).getDefaultSession();
+                String roomName = getRoomName(context, session, room, null);
+
+                EventDisplay eventDisplay = new RiotEventDisplay(context, latestEvent, room.getLiveState());
+                eventDisplay.setPrependMessagesWithAuthor(false);
+
+                mWearableMessage = roomName + ": " + room.getLiveState().getMemberName(latestEvent.getSender()) + " ";
+                CharSequence textualDisplay = eventDisplay.getTextualDisplay();
+
+                // the event might have been redacted
+                if (!TextUtils.isEmpty(textualDisplay)) {
+                    mWearableMessage += textualDisplay.toString();
+                }
+            }
+        }
+    }
+
+    /*
+     * *********************************************************************************************
+     * Parcelable
+     * *********************************************************************************************
+     */
+
+    @Override
+    public void writeToParcel(Parcel out, int flags) {
+        out.writeString(mSessionId);
+        out.writeString(mRoomId);
+        out.writeString(mSummaryText);
+        out.writeString(mQuickReplyBody);
+        out.writeString(mWearableMessage);
+        out.writeInt(mIsInvitationEvent ? 1 : 0);
+        out.writeString(mRoomAvatarPath);
+        out.writeLong(mContentTs);
+
+        out.writeString(mContentTitle);
+        out.writeString(mContentText);
+        out.writeString(mSenderName);
+
+        RoomNotifications[] roomNotifications = new RoomNotifications[mRoomNotifications.size()];
+        mRoomNotifications.toArray(roomNotifications);
+        out.writeArray(roomNotifications);
+
+        out.writeInt(mReversedMessagesList.size());
+        for (CharSequence sequence : mReversedMessagesList) {
+            TextUtils.writeToParcel(sequence, out, 0);
+        }
+    }
+
+    /**
+     * Constructor from the parcel.
+     *
+     * @param in the parcel
+     */
+    private void init(Parcel in) {
+        mSessionId = in.readString();
+        mRoomId = in.readString();
+        mSummaryText = in.readString();
+        mQuickReplyBody = in.readString();
+        mWearableMessage = in.readString();
+        mIsInvitationEvent = (1 == in.readInt()) ? true : false;
+        mRoomAvatarPath = in.readString();
+        mContentTs = in.readLong();
+
+        mContentTitle = in.readString();
+        mContentText = in.readString();
+        mSenderName = in.readString();
+
+        Object[] roomNotificationsAasVoid = in.readArray(RoomNotifications.class.getClassLoader());
+        for (Object object : roomNotificationsAasVoid) {
+            mRoomNotifications.add((RoomNotifications) object);
+        }
+
+        int count = in.readInt();
+        mReversedMessagesList = new ArrayList<>();
+
+        for (int i = 0; i < count; i++) {
+            mReversedMessagesList.add(TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in));
+        }
+    }
+
+    /**
+     * Parcelable creator
+     */
+    public final static Parcelable.Creator<RoomsNotifications> CREATOR = new Parcelable.Creator<RoomsNotifications>() {
+        public RoomsNotifications createFromParcel(Parcel p) {
+            RoomsNotifications res = new RoomsNotifications();
+            res.init(p);
+            return res;
+        }
+
+        public RoomsNotifications[] newArray(int size) {
+            return new RoomsNotifications[size];
+        }
+    };
+
+    @Override
+    public int describeContents() {
+        return 0;
+    }
+
+    /*
+     * *********************************************************************************************
+     * Serialisation
+     * *********************************************************************************************
+     */
+
+    private static final String ROOMS_NOTIFICATIONS_FILE_NAME = "ROOMS_NOTIFICATIONS_FILE_NAME";
+
+
+    /**
+     * @return byte[] from the class
+     */
+    private byte[] marshall() {
+        Parcel parcel = Parcel.obtain();
+        writeToParcel(parcel, 0);
+        byte[] bytes = parcel.marshall();
+        parcel.recycle();
+        return bytes;
+    }
+
+    /**
+     * Create a RoomsNotifications instance from a bytes[].
+     *
+     * @param bytes the bytes array
+     */
+    private RoomsNotifications(byte[] bytes) {
+        Parcel parcel = Parcel.obtain();
+        parcel.unmarshall(bytes, 0, bytes.length);
+        parcel.setDataPosition(0);
+
+        init(parcel);
+        parcel.recycle();
+    }
+
+    /**
+     * Delete the cached RoomNotifications
+     *
+     * @param context the context
+     */
+    public static void deleteCachedRoomNotifications(Context context) {
+        File file = new File(context.getApplicationContext().getCacheDir(), ROOMS_NOTIFICATIONS_FILE_NAME);
+
+        if (file.exists()) {
+            file.delete();
+        }
+    }
+
+    /**
+     * Save the roomsNotifications instance into the file system.
+     *
+     * @param context            the context
+     * @param roomsNotifications the roomsNotifications instance
+     */
+    public static void saveRoomNotifications(Context context, RoomsNotifications roomsNotifications) {
+        deleteCachedRoomNotifications(context);
+
+        // no notified messages
+        if (roomsNotifications.mRoomNotifications.isEmpty()) {
+            return;
+        }
+
+        ByteArrayInputStream fis = null;
+        FileOutputStream fos = null;
+
+        try {
+            fis = new ByteArrayInputStream(roomsNotifications.marshall());
+            fos = new FileOutputStream(new File(context.getApplicationContext().getCacheDir(), ROOMS_NOTIFICATIONS_FILE_NAME));
+
+            byte[] readData = new byte[1024];
+            int len;
+
+            while ((len = fis.read(readData, 0, 1024)) > 0) {
+                fos.write(readData, 0, len);
+            }
+        } catch (Throwable t) {
+            Log.e(LOG_TAG, "## saveRoomNotifications() failed " + t.getMessage());
+        }
+
+        try {
+            if (null != fis) {
+                fis.close();
+            }
+
+            if (null != fos) {
+                fos.close();
+            }
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "## saveRoomNotifications() failed " + e.getMessage());
+        }
+    }
+
+    /**
+     * Load a saved RoomsNotifications from the file system
+     *
+     * @param context the context
+     * @return a RoomsNotifications instance if found
+     */
+    public static RoomsNotifications loadRoomsNotifications(Context context) {
+        File file = new File(context.getApplicationContext().getCacheDir(), ROOMS_NOTIFICATIONS_FILE_NAME);
+
+        // test if the file exits
+        if (!file.exists()) {
+            return null;
+        }
+
+        RoomsNotifications roomsNotifications = null;
+        FileInputStream fis = null;
+        ByteArrayOutputStream fos = null;
+
+        try {
+            fis = new FileInputStream(file);
+            fos = new ByteArrayOutputStream();
+
+
+            byte[] readData = new byte[1024];
+            int len;
+
+            while ((len = fis.read(readData, 0, 1024)) > 0) {
+                fos.write(readData, 0, len);
+            }
+
+            roomsNotifications = new RoomsNotifications(fos.toByteArray());
+        } catch (Throwable t) {
+            Log.e(LOG_TAG, "## loadRoomsNotifications() failed " + t.getMessage());
+        }
+
+        try {
+            if (null != fis) {
+                fis.close();
+            }
+
+            if (null != fos) {
+                fos.close();
+            }
+        } catch (Exception e) {
+            Log.e(LOG_TAG, "## loadRoomsNotifications() failed " + e.getMessage());
+        }
+
+        return roomsNotifications;
+    }
+
+    /*
+     * *********************************************************************************************
+     * Utils
+     * *********************************************************************************************
+     */
+
+    /**
+     * Retrieve the room name.
+     *
+     * @param session the session
+     * @param room    the room
+     * @param event   the event
+     * @return the room name
+     */
+    public static String getRoomName(Context context, MXSession session, Room room, Event event) {
+        String roomName = VectorUtils.getRoomDisplayName(context, session, room);
+
+        // avoid displaying the room Id
+        // try to find the sender display name
+        if (TextUtils.equals(roomName, room.getRoomId())) {
+            roomName = room.getName(session.getMyUserId());
+
+            // avoid room Id as name
+            if (TextUtils.equals(roomName, room.getRoomId()) && (null != event)) {
+                User user = session.getDataHandler().getStore().getUser(event.sender);
+
+                if (null != user) {
+                    roomName = user.displayname;
+                } else {
+                    roomName = event.sender;
+                }
+            }
+        }
+
+        return roomName;
+    }
+}
diff --git a/vector/src/main/java/im/vector/preference/UserAvatarPreference.java b/vector/src/main/java/im/vector/preference/UserAvatarPreference.java
index dd62d5b63e..8ee4e50ca0 100755
--- a/vector/src/main/java/im/vector/preference/UserAvatarPreference.java
+++ b/vector/src/main/java/im/vector/preference/UserAvatarPreference.java
@@ -17,8 +17,8 @@
 package im.vector.preference;
 
 import android.content.Context;
+import android.os.Bundle;
 import android.preference.EditTextPreference;
-import android.preference.PreferenceScreen;
 import android.util.AttributeSet;
 import android.view.View;
 import android.view.ViewGroup;
@@ -74,4 +74,9 @@ public void setSession(MXSession session) {
         mSession = session;
         refreshAvatar();
     }
+
+    @Override
+    protected void showDialog(Bundle state) {
+        // do nothing
+    }
 }
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/preference/VectorGroupPreference.java b/vector/src/main/java/im/vector/preference/VectorGroupPreference.java
new file mode 100644
index 0000000000..810956e0bd
--- /dev/null
+++ b/vector/src/main/java/im/vector/preference/VectorGroupPreference.java
@@ -0,0 +1,151 @@
+/*
+ * Copyright 2016 OpenMarket Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.preference;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.os.Build;
+import android.util.AttributeSet;
+import android.view.Gravity;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.view.ViewParent;
+import android.widget.FrameLayout;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.data.MyUser;
+import org.matrix.androidsdk.rest.model.group.Group;
+
+import im.vector.R;
+import im.vector.util.VectorUtils;
+
+public class VectorGroupPreference extends VectorSwitchPreference {
+    private static final String LOG_TAG = VectorGroupPreference.class.getSimpleName();
+
+    private Context mContext;
+    private ImageView mAvatarView;
+
+    private Group mGroup;
+    private MXSession mSession;
+
+    /**
+     * Construct a new SwitchPreference with the given style options.
+     *
+     * @param context  The Context that will style this preference
+     * @param attrs    Style attributes that differ from the default
+     * @param defStyle Theme attribute defining the default style options
+     */
+    public VectorGroupPreference(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        init(context);
+    }
+
+    /**
+     * Construct a new SwitchPreference with the given style options.
+     *
+     * @param context The Context that will style this preference
+     * @param attrs   Style attributes that differ from the default
+     */
+    public VectorGroupPreference(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        init(context);
+    }
+
+    @TargetApi(Build.VERSION_CODES.LOLLIPOP)
+    public VectorGroupPreference(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        init(context);
+    }
+
+    /**
+     * Construct a new SwitchPreference with default style options.
+     *
+     * @param context The Context that will style this preference
+     */
+    public VectorGroupPreference(Context context) {
+        super(context, null);
+        init(context);
+    }
+
+    @Override
+    protected View onCreateView(ViewGroup parent) {
+        View createdView = super.onCreateView(parent);
+
+        try {
+            // insert the group avatar to the left
+            final ImageView iconView = createdView.findViewById(android.R.id.icon);
+
+            ViewParent iconViewParent = iconView.getParent();
+
+            while (null != iconViewParent.getParent()) {
+                iconViewParent = iconViewParent.getParent();
+            }
+
+            LayoutInflater inflater = LayoutInflater.from(mContext);
+            FrameLayout layout = (FrameLayout) inflater.inflate(R.layout.vector_settings_round_group_avatar, null, false);
+            mAvatarView = layout.findViewById(R.id.avatar_img);
+
+            LinearLayout.LayoutParams params = new LinearLayout.LayoutParams(
+                    ViewGroup.LayoutParams.WRAP_CONTENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+            params.gravity = Gravity.CENTER;
+            layout.setLayoutParams(params);
+            ((LinearLayout)iconViewParent).addView(layout, 0);
+
+            refreshAvatar();
+        } catch (Exception e) {
+            mAvatarView = null;
+        }
+
+        return createdView;
+    }
+
+    /**
+     * Init the group information
+     *
+     * @param group the group
+     * @param session the session
+     */
+    public void setGroup(Group group, MXSession session) {
+        mGroup = group;
+        mSession = session;
+
+        refreshAvatar();
+    }
+
+    /**
+     * Refresh the avatar
+     */
+    public void refreshAvatar() {
+        if ((null != mAvatarView) && (null != mSession) && (null != mGroup)) {
+            VectorUtils.loadGroupAvatar(mContext, mSession, mAvatarView ,mGroup);
+        }
+    }
+
+    /**
+     * Common init method.
+     *
+     * @param context the context
+     */
+    private void init(Context context) {
+        // Force the use of SwitchCompat component
+        setWidgetLayoutResource(R.layout.preference_switch_layout);
+        mContext = context;
+    }
+}
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/receiver/VectorUniversalLinkReceiver.java b/vector/src/main/java/im/vector/receiver/VectorUniversalLinkReceiver.java
index 3ac9972fa6..2ebb32c112 100644
--- a/vector/src/main/java/im/vector/receiver/VectorUniversalLinkReceiver.java
+++ b/vector/src/main/java/im/vector/receiver/VectorUniversalLinkReceiver.java
@@ -46,6 +46,7 @@
 import im.vector.VectorApp;
 import im.vector.activity.CommonActivityUtils;
 import im.vector.activity.LoginActivity;
+import im.vector.activity.VectorGroupDetailsActivity;
 import im.vector.activity.VectorHomeActivity;
 import im.vector.activity.VectorMemberDetailsActivity;
 import im.vector.activity.VectorRoomActivity;
@@ -81,6 +82,7 @@ public class VectorUniversalLinkReceiver extends BroadcastReceiver {
     // index of each item in path
     public static final String ULINK_ROOM_ID_OR_ALIAS_KEY = "ULINK_ROOM_ID_OR_ALIAS_KEY";
     public static final String ULINK_MATRIX_USER_ID_KEY = "ULINK_MATRIX_USER_ID_KEY";
+    public static final String ULINK_GROUP_ID_KEY = "ULINK_GROUP_ID_KEY";
     private static final String ULINK_EVENT_ID_KEY = "ULINK_EVENT_ID_KEY";
     /*public static final String ULINK_EMAIL_ID_KEY = "email";
     public static final String ULINK_SIGN_URL_KEY = "signurl";
@@ -181,6 +183,8 @@ public void onReceive(final Context aContext, final Intent aIntent) {
                             manageRoomOnActivity(aContext);
                         } else if (mParameters.containsKey(ULINK_MATRIX_USER_ID_KEY)) {
                             manageMemberDetailsActivity(aContext);
+                        } else if (mParameters.containsKey(ULINK_GROUP_ID_KEY)) {
+                            manageGroupDetailsActivity(aContext);
                         } else {
                             Log.e(LOG_TAG, "## onReceive() : nothing to do");
                         }
@@ -255,6 +259,32 @@ public void run() {
         }
     }
 
+    /**
+     * Start the universal link management when the login process is done.
+     * If there is no active activity, launch the home activity
+     *
+     * @param aContext the context.
+     */
+    private void manageGroupDetailsActivity(final Context aContext) {
+        Log.d(LOG_TAG, "## manageMemberDetailsActivity() : open the group" + mParameters.get(ULINK_GROUP_ID_KEY));
+
+        final Activity currentActivity = VectorApp.getCurrentActivity();
+
+        if (null != currentActivity) {
+            Intent startRoomInfoIntent = new Intent(currentActivity, VectorGroupDetailsActivity.class);
+            startRoomInfoIntent.putExtra(VectorGroupDetailsActivity.EXTRA_GROUP_ID, mParameters.get(ULINK_GROUP_ID_KEY));
+            startRoomInfoIntent.putExtra(VectorGroupDetailsActivity.EXTRA_MATRIX_ID, mSession.getCredentials().userId);
+            currentActivity.startActivity(startRoomInfoIntent);
+        } else {
+            // clear the activity stack to home activity
+            Intent intent = new Intent(aContext, VectorHomeActivity.class);
+            intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
+            intent.putExtra(VectorHomeActivity.EXTRA_GROUP_ID, mParameters.get(ULINK_GROUP_ID_KEY));
+            aContext.startActivity(intent);
+        }
+    }
+
+
     /**
      * Manage the room presence.
      * Check the URL room ID format: if room ID is provided as an alias, we translate it
@@ -430,6 +460,8 @@ public static HashMap<String, String> parseUniversalLink(Uri uri) {
                 map.put(ULINK_MATRIX_USER_ID_KEY, firstParam);
             } else if (MXSession.isRoomAlias(firstParam) || MXSession.isRoomId(firstParam)) {
                 map.put(ULINK_ROOM_ID_OR_ALIAS_KEY, firstParam);
+            } else if (MXSession.isGroupId(firstParam)) {
+                map.put(ULINK_GROUP_ID_KEY, firstParam);
             }
 
             // room id only ?
diff --git a/vector/src/main/java/im/vector/services/EventStreamService.java b/vector/src/main/java/im/vector/services/EventStreamService.java
index cc7862397a..edc37f231e 100755
--- a/vector/src/main/java/im/vector/services/EventStreamService.java
+++ b/vector/src/main/java/im/vector/services/EventStreamService.java
@@ -70,9 +70,12 @@
 import im.vector.ViewedRoomTracker;
 import im.vector.activity.VectorHomeActivity;
 import im.vector.gcm.GcmRegistrationManager;
+import im.vector.notifications.NotificationUtils;
+import im.vector.notifications.NotifiedEvent;
+import im.vector.notifications.RoomsNotifications;
 import im.vector.receiver.DismissNotificationReceiver;
 import im.vector.util.CallsManager;
-import im.vector.util.NotificationUtils;
+import im.vector.util.PreferencesManager;
 import im.vector.util.RiotEventDisplay;
 
 /**
@@ -105,19 +108,30 @@ public enum StreamAction {
      */
     public static final String EXTRA_STREAM_ACTION = "EventStreamService.EXTRA_STREAM_ACTION";
     public static final String EXTRA_MATRIX_IDS = "EventStreamService.EXTRA_MATRIX_IDS";
-    private static final String EXTRA_AUTO_RESTART_ACTION = "EventStreamService.EXTRA_AUTO_RESTART_ACTION";
+    public static final String EXTRA_AUTO_RESTART_ACTION = "EventStreamService.EXTRA_AUTO_RESTART_ACTION";
 
     /**
      * Notification identifiers
      */
-    private static final int NOTIF_ID_MESSAGE = 60;
-    private static final int NOTIF_ID_FOREGROUND_SERVICE = 61;
+    private static final int NOTIFICATION_ID = 123;
+
+    public enum NotificationState {
+        // no notifications are displayed
+        NONE,
+        // initial sync in progress
+        INITIAL_SYNCING,
+        // fdroid mode or GCM registration failed
+        // put this service in foreground to keep it in life
+        LISTENING_FOR_EVENTS,
+        // display events notifications
+        DISPLAYING_EVENTS_NOTIFICATIONS,
+        // there is a pending incoming call
+        INCOMING_CALL,
+        // a call is in progress
+        CALL_IN_PROGRESS,
+    }
 
-    private static final int FOREGROUND_INITIAL_SYNCING = 41;
-    private static final int FOREGROUND_LISTENING_FOR_EVENTS = 42;
-    private static final int FOREGROUND_NOTIF_ID_PENDING_CALL = 44;
-    private static final int FOREGROUND_ID_INCOMING_CALL = 45;
-    private int mForegroundServiceIdentifier = -1;
+    private static NotificationState mNotificationState = NotificationState.NONE;
 
     /**
      * Default bing rule
@@ -142,8 +156,8 @@ public enum StreamAction {
     /**
      * store the notifications description
      */
-    private final LinkedHashMap<String, NotificationUtils.NotifiedEvent> mPendingNotifications = new LinkedHashMap<>();
-    private Map<String, List<NotificationUtils.NotifiedEvent>> mNotifiedEventsByRoomId = null;
+    private final LinkedHashMap<String, NotifiedEvent> mPendingNotifications = new LinkedHashMap<>();
+    private Map<String, List<NotifiedEvent>> mNotifiedEventsByRoomId = null;
     private static HandlerThread mNotificationHandlerThread = null;
     private static android.os.Handler mNotificationsHandler = null;
 
@@ -426,7 +440,7 @@ private void autoRestart() {
         Log.d(LOG_TAG, "## autoRestart() : restarts after " + delay + " ms");
 
         // reset the service identifier
-        mForegroundServiceIdentifier = -1;
+        mNotificationState = NotificationState.NONE;
 
         // restart the services after 3 seconds
         Intent restartServiceIntent = new Intent(getApplicationContext(), this.getClass());
@@ -457,11 +471,23 @@ public void onTaskRemoved(Intent rootIntent) {
     @Override
     public void onDestroy() {
         if (!mIsSelfDestroyed) {
-            Log.d(LOG_TAG, "## onDestroy() : restart it");
             setServiceState(StreamAction.STOP);
+
+            // stop the foreground service on devices which uses the battery optimisation
+            // during the initial syncing
+            // and if the GCM registration was done
+            if (PreferencesManager.useBatteryOptimisation(getApplicationContext()) &&
+                    (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) &&
+                    (mNotificationState == NotificationState.INITIAL_SYNCING)
+                    && Matrix.getInstance(getApplicationContext()).getSharedGCMRegistrationManager().hasRegistrationToken()) {
+                stopForeground(true);
+                mIsForeground = false;
+            }
+
+            Log.d(LOG_TAG, "## onDestroy() : restart it");
             autoRestart();
         } else {
-            Log.d(LOG_TAG, "## onDestroy()");
+            Log.d(LOG_TAG, "## onDestroy() : do nothing");
             stop();
             super.onDestroy();
         }
@@ -536,7 +562,7 @@ public void run() {
                         (new Handler(getMainLooper())).post(new Runnable() {
                             @Override
                             public void run() {
-                                updateServiceForegroundState();
+                                refreshStatusNotification();
                             }
                         });
                     }
@@ -647,13 +673,20 @@ private void start() {
             monitorSession(session);
         }
 
-        if (!mGcmRegistrationManager.useGCM()) {
-            updateServiceForegroundState();
-        }
+        refreshStatusNotification();
 
         setServiceState(StreamAction.START);
     }
 
+    /**
+     * Stop the service without delay
+     */
+    public void stopNow() {
+        stop();
+        mIsSelfDestroyed = true;
+        stopSelf();
+    }
+
     /**
      * internal stop.
      */
@@ -761,24 +794,33 @@ private void gcmStatusUpdate() {
         Log.d(LOG_TAG, "## gcmStatusUpdate");
 
         if (mIsForeground) {
-            Log.d(LOG_TAG, "## gcmStatusUpdate : gcm status succeeds so stopForeground");
-            if (FOREGROUND_LISTENING_FOR_EVENTS == mForegroundServiceIdentifier) {
+            Log.d(LOG_TAG, "## gcmStatusUpdate : gcm status succeeds so stopForeground (" + mNotificationState + ")");
+
+            if (NotificationState.LISTENING_FOR_EVENTS == mNotificationState) {
                 stopForeground(true);
-                mForegroundServiceIdentifier = -1;
+                mNotificationState = NotificationState.NONE;
                 mIsForeground = false;
             }
         }
 
-        updateServiceForegroundState();
+        refreshStatusNotification();
     }
 
     /**
-     * Enable/disable the service foreground status.
-     * The service is put in foreground ("Foreground process priority") when a sync polling is used,
-     * to strongly reduce the likelihood of the App being killed.
+     * @return true if the "listen for events" notification should be displayed
      */
-    private void updateServiceForegroundState() {
-        Log.d(LOG_TAG, "## updateServiceForegroundState");
+    private boolean shouldDisplayListenForEventsNotification() {
+        // fdroid
+        return (!mGcmRegistrationManager.useGCM() ||
+                // the GCM registration was not done
+                TextUtils.isEmpty(mGcmRegistrationManager.getCurrentRegistrationToken()) && !mGcmRegistrationManager.isServerRegistred()) && mGcmRegistrationManager.isBackgroundSyncAllowed() && mGcmRegistrationManager.areDeviceNotificationsAllowed();
+    }
+
+    /**
+     * Manages the "listen for events" and "synchronising" notifications
+     */
+    public void refreshStatusNotification() {
+        Log.d(LOG_TAG, "## refreshStatusNotification from state " + mNotificationState);
 
         MXSession session = Matrix.getInstance(getApplicationContext()).getDefaultSession();
 
@@ -787,43 +829,70 @@ private void updateServiceForegroundState() {
             return;
         }
 
+        // call in progress notifications
+        if ((mNotificationState == NotificationState.INCOMING_CALL) || (mNotificationState == NotificationState.CALL_IN_PROGRESS)) {
+            Log.d(LOG_TAG, "## refreshStatusNotification : does nothing as there is a pending call");
+            return;
+        }
+
+        if (mNotificationState == NotificationState.DISPLAYING_EVENTS_NOTIFICATIONS) {
+            if (PreferencesManager.useBatteryOptimisation(getApplicationContext()) &&
+                    ((mServiceState == StreamAction.CATCHUP) || isStopped()) && !mIsForeground) {
+                if (mServiceState == StreamAction.CATCHUP) {
+                    Log.d(LOG_TAG, "## refreshStatusNotification : events notif is displayed but the application is catchup up");
+                } else {
+                    Log.d(LOG_TAG, "## refreshStatusNotification : events notif is displayed but the service was stopped");
+                }
+                mNotificationState = NotificationState.NONE;
+            } else {
+                Log.d(LOG_TAG, "## refreshStatusNotification : displaying events notification");
+            }
+            return;
+        }
+
+        if (mNotificationState == NotificationState.NONE) {
+            Notification notification = NotificationUtils.buildMessageNotification(getApplicationContext(), true);
+
+            if (null != notification) {
+                mNotificationState = NotificationState.DISPLAYING_EVENTS_NOTIFICATIONS;
+                startForeground(NOTIFICATION_ID, notification);
+                mIsForeground = true;
+                Log.d(LOG_TAG, "## refreshStatusNotification : restore the events notification");
+                return;
+            }
+        }
+
         // GA issue
         if (null == mGcmRegistrationManager) {
             return;
         }
 
-        boolean isInitialSyncInProgress = !session.getDataHandler().isInitialSyncComplete();
+        boolean isInitialSyncInProgress = !session.getDataHandler().isInitialSyncComplete() || isStopped() || (mServiceState == StreamAction.CATCHUP);
 
         if (isInitialSyncInProgress) {
-            Log.d(LOG_TAG, "## updateServiceForegroundState : put the service in foreground because of an initial sync");
+            Log.d(LOG_TAG, "## refreshStatusNotification : put the service in foreground because of an initial sync " + mNotificationState);
 
-            if (FOREGROUND_INITIAL_SYNCING != mForegroundServiceIdentifier) {
-                Notification notification = buildForegroundServiceNotification(getString(R.string.notification_sync_in_progress));
-                startForeground(NOTIF_ID_FOREGROUND_SERVICE, notification);
-                mForegroundServiceIdentifier = FOREGROUND_INITIAL_SYNCING;
+            if (mNotificationState != NotificationState.INITIAL_SYNCING) {
+                startForeground(NOTIFICATION_ID, buildForegroundServiceNotification(getString(R.string.notification_sync_in_progress)));
+                mNotificationState = NotificationState.INITIAL_SYNCING;
             }
-
             mIsForeground = true;
-        } else if (
-            // fdroid
-                (!mGcmRegistrationManager.useGCM() ||
-                        // the GCM registration was not done
-                        TextUtils.isEmpty(mGcmRegistrationManager.getCurrentRegistrationToken()) && !mGcmRegistrationManager.isServerRegistred()) && mGcmRegistrationManager.isBackgroundSyncAllowed() && mGcmRegistrationManager.areDeviceNotificationsAllowed()) {
-            Log.d(LOG_TAG, "## updateServiceForegroundState : put the service in foreground because of GCM registration");
-
-            if (FOREGROUND_LISTENING_FOR_EVENTS != mForegroundServiceIdentifier) {
-                Notification notification = buildForegroundServiceNotification(getString(R.string.notification_listen_for_events));
-                startForeground(NOTIF_ID_FOREGROUND_SERVICE, notification);
-                mForegroundServiceIdentifier = FOREGROUND_LISTENING_FOR_EVENTS;
+        } else if (shouldDisplayListenForEventsNotification()) {
+            Log.d(LOG_TAG, "## refreshStatusNotification : put the service in foreground because of GCM registration");
+
+            if (mNotificationState != NotificationState.LISTENING_FOR_EVENTS) {
+                startForeground(NOTIFICATION_ID, buildForegroundServiceNotification(getString(R.string.notification_listen_for_events)));
+                mNotificationState = NotificationState.LISTENING_FOR_EVENTS;
             }
 
             mIsForeground = true;
         } else {
-            Log.d(LOG_TAG, "## updateServiceForegroundState : put the service in background");
-
-            if ((FOREGROUND_LISTENING_FOR_EVENTS == mForegroundServiceIdentifier) || (FOREGROUND_INITIAL_SYNCING == mForegroundServiceIdentifier)) {
+            if ((mNotificationState == NotificationState.LISTENING_FOR_EVENTS) || (mNotificationState == NotificationState.INITIAL_SYNCING)) {
+                Log.d(LOG_TAG, "## refreshStatusNotification : put the service in background from state " + mNotificationState);
                 stopForeground(true);
-                mForegroundServiceIdentifier = -1;
+                mNotificationState = NotificationState.NONE;
+            } else {
+                Log.d(LOG_TAG, "## refreshStatusNotification : nothing to do");
             }
             mIsForeground = false;
         }
@@ -987,7 +1056,7 @@ private void prepareNotification(Event event, BingRule bingRule) {
             bingRule = mDefaultBingRule;
         }
 
-        mPendingNotifications.put(event.eventId, new NotificationUtils.NotifiedEvent(event.roomId, event.eventId, bingRule, event.getOriginServerTs()));
+        mPendingNotifications.put(event.eventId, new NotifiedEvent(event.roomId, event.eventId, bingRule, event.getOriginServerTs()));
     }
 
     /**
@@ -1070,6 +1139,8 @@ public void run() {
                 if (null != mNotifiedEventsByRoomId) {
                     mNotifiedEventsByRoomId.clear();
                 }
+
+                RoomsNotifications.deleteCachedRoomNotifications(VectorApp.getInstance());
             }
         });
     }
@@ -1132,18 +1203,27 @@ public static void onStaticNotifiedEvent(Context context, Event event, String ro
 
         if ((null != event) && !mBackgroundNotificationEventIds.contains(event.eventId)) {
             mBackgroundNotificationEventIds.add(event.eventId);
-
-            String header = (TextUtils.isEmpty(roomName) ? event.roomId : roomName) + ": " +
-                    (TextUtils.isEmpty(senderDisplayName) ? event.sender : senderDisplayName) + " ";
-
+            String header = "";
             String text;
 
-            if (event.isEncrypted()) {
-                text = context.getString(R.string.encrypted_message);
+            if (null == event.content) {
+                if (1 == mBackgroundNotificationEventIds.size()) {
+                    text = context.getString(R.string.one_new_message);
+                } else {
+                    text = context.getString(R.string.new_messages, mBackgroundNotificationEventIds.size());
+                }
+                mBackgroundNotificationStrings.clear();
             } else {
-                EventDisplay eventDisplay = new RiotEventDisplay(context, event, null);
-                eventDisplay.setPrependMessagesWithAuthor(false);
-                text = eventDisplay.getTextualDisplay().toString();
+                header = (TextUtils.isEmpty(roomName) ? event.roomId : roomName) + ": " +
+                        (TextUtils.isEmpty(senderDisplayName) ? event.sender : senderDisplayName) + " ";
+
+                if (event.isEncrypted()) {
+                    text = context.getString(R.string.encrypted_message);
+                } else {
+                    EventDisplay eventDisplay = new RiotEventDisplay(context, event, null);
+                    eventDisplay.setPrependMessagesWithAuthor(false);
+                    text = eventDisplay.getTextualDisplay().toString();
+                }
             }
 
             if (!TextUtils.isEmpty(text)) {
@@ -1154,117 +1234,38 @@ public static void onStaticNotifiedEvent(Context context, Event event, String ro
                 Notification notification = NotificationUtils.buildMessagesListNotification(context, mBackgroundNotificationStrings, new BingRule(null, null, true, true, true));
 
                 if (null != notification) {
-                    nm.notify(NOTIF_ID_MESSAGE, notification);
+                    nm.notify(NOTIFICATION_ID, notification);
+                    mNotificationState = NotificationState.DISPLAYING_EVENTS_NOTIFICATIONS;
                 } else {
-                    nm.cancel(NOTIF_ID_MESSAGE);
+                    nm.cancel(NOTIFICATION_ID);
+                    mNotificationState = NotificationState.NONE;
                 }
             }
         } else if (0 == unreadMessagesCount) {
             mBackgroundNotificationStrings.clear();
-            nm.cancel(NOTIF_ID_MESSAGE);
+            nm.cancel(NOTIFICATION_ID);
+            mNotificationState = NotificationState.NONE;
         }
     }
 
     /**
-     * Notify that a notification for even has been received.
+     * Dismiss the messages notifications.
      *
-     * @param event               the notified event
-     * @param roomName            the room name
-     * @param senderDisplayName   the sender display name
-     * @param unreadMessagesCount the unread messages count
+     * @param nm the notifications manager
      */
-    public void onNotifiedEventWithBackgroundSyncDisabled(Event event, String roomName, String senderDisplayName, int unreadMessagesCount) {
-        if ((null != event) && !mBackgroundNotificationEventIds.contains(event.eventId)) {
-            mBackgroundNotificationEventIds.add(event.eventId);
-
-            // TODO the session id should be provided by the server
-            MXSession session = Matrix.getInstance(getApplicationContext()).getDefaultSession();
-
-            if (null != session) {
-                RoomState roomState = null;
-
-                try {
-                    roomState = session.getDataHandler().getRoom(event.roomId).getLiveState();
-                } catch (Exception e) {
-                    Log.e(LOG_TAG, "Fail to retrieve the roomState of " + event.roomId);
-                }
-
-                if (TextUtils.equals(event.getType(), Event.EVENT_TYPE_MESSAGE_ENCRYPTED) && session.isCryptoEnabled()) {
-                    session.getDataHandler().decryptEvent(event, null);
-                }
-
-                // test if the message is displayable
-                EventDisplay eventDisplay = new RiotEventDisplay(getApplicationContext(), event, roomState);
-                eventDisplay.setPrependMessagesWithAuthor(false);
-                String text = eventDisplay.getTextualDisplay().toString();
-
-                // display a dedicated message in decryption error cases
-                if (null != event.getCryptoError()) {
-                    text = getApplicationContext().getString(R.string.encrypted_message);
-                }
-
-                // sanity check
-                if (!TextUtils.isEmpty(text) && (null != roomState)) {
-
-                    if (TextUtils.isEmpty(roomName)) {
-                        roomName = roomState.getDisplayName(session.getMyUserId());
-                    }
-
-                    if (TextUtils.isEmpty(senderDisplayName)) {
-                        senderDisplayName = roomState.getMemberName(event.sender);
-                    }
-
-                    String header = roomName + ": " + senderDisplayName + " ";
-
-                    SpannableString notifiedLine = new SpannableString(header + text);
-                    notifiedLine.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), 0, header.length(), Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
-
-                    Log.d(LOG_TAG, "## onMessageReceivedInternal() : trigger a notification " + notifiedLine);
-
-                    mBackgroundNotificationStrings.add(0, notifiedLine);
-                    BingRulesManager bingRulesManager = session.getDataHandler().getBingRulesManager();
-                    BingRule rule = bingRulesManager.isReady() ? bingRulesManager.fulfilledBingRule(event) : new BingRule(false);
-
-                    displayMessagesNotification(mBackgroundNotificationStrings, rule);
-                }
+    private void dismissMessagesNotification(NotificationManagerCompat nm) {
+        if (mNotificationState == NotificationState.DISPLAYING_EVENTS_NOTIFICATIONS) {
+            Log.d(LOG_TAG, "## dismissMessagesNotification() : clear notification");
+            if (mIsForeground) {
+                stopForeground(true);
+                mIsForeground = false;
+            } else {
+                nm.cancel(NOTIFICATION_ID);
             }
-        } else if (0 == unreadMessagesCount) {
-            mBackgroundNotificationStrings.clear();
-            displayMessagesNotification(mBackgroundNotificationStrings, null);
-        }
-    }
-
-    /**
-     * Display a list of events as string.
-     *
-     * @param messages the messages list
-     * @param rule     the bing rule to use
-     */
-    private void displayMessagesNotification(final List<CharSequence> messages, final BingRule rule) {
-        NotificationUtils.addNotificationChannels(this);
-        final NotificationManagerCompat nm = NotificationManagerCompat.from(EventStreamService.this);
-
-        if (!mGcmRegistrationManager.areDeviceNotificationsAllowed() || (null == messages) || (0 == messages.size())) {
-            new Handler(getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    nm.cancel(NOTIF_ID_MESSAGE);
-                }
-            });
-        } else {
-            new Handler(getMainLooper()).post(new Runnable() {
-                @Override
-                public void run() {
-                    Notification notif = NotificationUtils.buildMessagesListNotification(getApplicationContext(), messages, rule);
 
-                    if (null != notif) {
-                        nm.notify(NOTIF_ID_MESSAGE, notif);
-
-                    } else {
-                        nm.cancel(NOTIF_ID_MESSAGE);
-                    }
-                }
-            });
+            mNotificationState = NotificationState.NONE;
+            RoomsNotifications.deleteCachedRoomNotifications(getApplicationContext());
+            refreshStatusNotification();
         }
     }
 
@@ -1279,13 +1280,13 @@ private void refreshMessagesNotification() {
 
         final NotificationManagerCompat nm = NotificationManagerCompat.from(EventStreamService.this);
 
-        NotificationUtils.NotifiedEvent eventToNotify = getEventToNotify();
+        NotifiedEvent eventToNotify = getEventToNotify();
         if (!mGcmRegistrationManager.areDeviceNotificationsAllowed()) {
             mNotifiedEventsByRoomId = null;
             new Handler(getMainLooper()).post(new Runnable() {
                 @Override
                 public void run() {
-                    nm.cancel(NOTIF_ID_MESSAGE);
+                    dismissMessagesNotification(nm);
                 }
             });
         } else if (refreshNotifiedMessagesList()) {
@@ -1294,7 +1295,7 @@ public void run() {
                 new Handler(getMainLooper()).post(new Runnable() {
                     @Override
                     public void run() {
-                        nm.cancel(NOTIF_ID_MESSAGE);
+                        dismissMessagesNotification(nm);
                     }
                 });
             } else {
@@ -1316,8 +1317,8 @@ public void run() {
 
                     // search the latest message to refresh the notification
                     for (String roomId : roomIds) {
-                        List<NotificationUtils.NotifiedEvent> events = mNotifiedEventsByRoomId.get(roomId);
-                        NotificationUtils.NotifiedEvent notifiedEvent = events.get(events.size() - 1);
+                        List<NotifiedEvent> events = mNotifiedEventsByRoomId.get(roomId);
+                        NotifiedEvent notifiedEvent = events.get(events.size() - 1);
 
                         Event event = store.getEvent(notifiedEvent.mEventId, notifiedEvent.mRoomId);
 
@@ -1332,8 +1333,8 @@ public void run() {
                     }
                 }
 
-                final NotificationUtils.NotifiedEvent fEventToNotify = eventToNotify;
-                final Map<String, List<NotificationUtils.NotifiedEvent>> fNotifiedEventsByRoomId = new HashMap<>(mNotifiedEventsByRoomId);
+                final NotifiedEvent fEventToNotify = eventToNotify;
+                final Map<String, List<NotifiedEvent>> fNotifiedEventsByRoomId = new HashMap<>(mNotifiedEventsByRoomId);
 
                 if (null != fEventToNotify) {
                     DismissNotificationReceiver.setLatestNotifiedMessageTs(this, fEventToNotify.mOriginServerTs);
@@ -1351,13 +1352,25 @@ public void run() {
 
                             // the notification cannot be built
                             if (null != notif) {
-                                nm.notify(NOTIF_ID_MESSAGE, notif);
+                                if (shouldDisplayListenForEventsNotification()) {
+                                    mIsForeground = true;
+                                    startForeground(NOTIFICATION_ID, notif);
+                                } else {
+                                    if (mIsForeground) {
+                                        stopForeground(true);
+                                        mIsForeground = false;
+                                    }
+                                    nm.notify(NOTIFICATION_ID, notif);
+                                }
+                                mNotificationState = NotificationState.DISPLAYING_EVENTS_NOTIFICATIONS;
+                                Log.d(LOG_TAG, "## refreshMessagesNotification() : display the notification");
                             } else {
-                                nm.cancel(NOTIF_ID_MESSAGE);
+                                Log.d(LOG_TAG, "## refreshMessagesNotification() : nothing to display");
+                                dismissMessagesNotification(nm);
                             }
                         } else {
                             Log.e(LOG_TAG, "## refreshMessagesNotification() : mNotifiedEventsByRoomId is empty");
-                            nm.cancel(NOTIF_ID_MESSAGE);
+                            dismissMessagesNotification(nm);
                         }
                     }
                 });
@@ -1369,18 +1382,18 @@ public void run() {
      * Check if the current displayed notification must be cleared
      * because it doesn't make sense anymore.
      */
-    private NotificationUtils.NotifiedEvent getEventToNotify() {
+    private NotifiedEvent getEventToNotify() {
         if (mPendingNotifications.size() > 0) {
             // TODO add multi sessions
             MXSession session = Matrix.getInstance(getBaseContext()).getDefaultSession();
             IMXStore store = session.getDataHandler().getStore();
 
             // notified only the latest unread message
-            List<NotificationUtils.NotifiedEvent> eventsToNotify = new ArrayList<>(mPendingNotifications.values());
+            List<NotifiedEvent> eventsToNotify = new ArrayList<>(mPendingNotifications.values());
 
             Collections.reverse(eventsToNotify);
 
-            for (NotificationUtils.NotifiedEvent eventToNotify : eventsToNotify) {
+            for (NotifiedEvent eventToNotify : eventsToNotify) {
                 Room room = store.getRoom(eventToNotify.mRoomId);
 
                 // test if the message has not been read
@@ -1467,8 +1480,8 @@ private boolean refreshNotifiedMessagesList() {
                                         BingRule rule = session.fulfillRule(event);
 
                                         if ((null != rule) && rule.isEnabled && rule.shouldNotify()) {
-                                            List<NotificationUtils.NotifiedEvent> list = new ArrayList<>();
-                                            list.add(new NotificationUtils.NotifiedEvent(event.roomId, event.eventId, rule, event.getOriginServerTs()));
+                                            List<NotifiedEvent> list = new ArrayList<>();
+                                            list.add(new NotifiedEvent(event.roomId, event.eventId, rule, event.getOriginServerTs()));
                                             mNotifiedEventsByRoomId.put(room.getRoomId(), list);
                                         }
                                     }
@@ -1483,14 +1496,14 @@ private boolean refreshNotifiedMessagesList() {
                         List<Event> unreadEvents = store.unreadEvents(room.getRoomId(), null);
 
                         if ((null != unreadEvents) && unreadEvents.size() > 0) {
-                            List<NotificationUtils.NotifiedEvent> list = new ArrayList<>();
+                            List<NotifiedEvent> list = new ArrayList<>();
 
                             for (Event event : unreadEvents) {
                                 if (event.getOriginServerTs() > minTs) {
                                     BingRule rule = session.fulfillRule(event);
 
                                     if ((null != rule) && rule.isEnabled && rule.shouldNotify()) {
-                                        list.add(new NotificationUtils.NotifiedEvent(event.roomId, event.eventId, rule, event.getOriginServerTs()));
+                                        list.add(new NotifiedEvent(event.roomId, event.eventId, rule, event.getOriginServerTs()));
                                         //Log.d(LOG_TAG, "## refreshNotifiedMessagesList() : the event " + event.eventId + " in room " + event.roomId + " fulfills " + rule);
                                     }
                                 } else {
@@ -1525,20 +1538,20 @@ private boolean refreshNotifiedMessagesList() {
                         isUpdated = true;
                     } else {
                         // the messages are sorted from the oldest to the latest
-                        List<NotificationUtils.NotifiedEvent> events = mNotifiedEventsByRoomId.get(roomId);
+                        List<NotifiedEvent> events = mNotifiedEventsByRoomId.get(roomId);
 
                         // if the oldest event has been read
                         // something has been updated
-                        NotificationUtils.NotifiedEvent oldestEvent = events.get(0);
+                        NotifiedEvent oldestEvent = events.get(0);
 
                         if (room.isEventRead(oldestEvent.mEventId) || (oldestEvent.mOriginServerTs < minTs)) {
                             // if the latest message has been read
                             // we have to find out the unread messages
-                            NotificationUtils.NotifiedEvent latestEvent = events.get(events.size() - 1);
+                            NotifiedEvent latestEvent = events.get(events.size() - 1);
                             if (!room.isEventRead(latestEvent.mEventId) && latestEvent.mOriginServerTs > minTs) {
                                 // search for the read messages
                                 for (int i = 0; i < events.size(); ) {
-                                    NotificationUtils.NotifiedEvent event = events.get(i);
+                                    NotifiedEvent event = events.get(i);
 
                                     if (room.isEventRead(event.mEventId) || (event.mOriginServerTs <= minTs)) {
                                         // Log.d(LOG_TAG, "## refreshNotifiedMessagesList() : the event " + event.mEventId + " in room " + room.getRoomId() + " is read");
@@ -1597,12 +1610,14 @@ else if (null == CallsManager.getSharedInstance().getActiveCall()) {
             Log.d(LOG_TAG, "displayIncomingCallNotification : display the dedicated notification");
             Notification notification = NotificationUtils.buildIncomingCallNotification(
                     EventStreamService.this,
-                    NotificationUtils.getRoomName(getApplicationContext(), session, room, event),
+                    RoomsNotifications.getRoomName(getApplicationContext(), session, room, event),
                     session.getMyUserId(),
                     callId);
 
-            startForeground(NOTIF_ID_FOREGROUND_SERVICE, notification);
-            mForegroundServiceIdentifier = FOREGROUND_ID_INCOMING_CALL;
+
+            startForeground(NOTIFICATION_ID, notification);
+            mNotificationState = NotificationState.INCOMING_CALL;
+            mIsForeground = true;
 
             mIncomingCallId = callId;
 
@@ -1619,7 +1634,7 @@ else if (null == CallsManager.getSharedInstance().getActiveCall()) {
     }
 
     /**
-     * Display a call in progress notificatin.
+     * Display a call in progress notification.
      *
      * @param session the session
      * @param callId  the callId
@@ -1627,8 +1642,8 @@ else if (null == CallsManager.getSharedInstance().getActiveCall()) {
     public void displayCallInProgressNotification(MXSession session, Room room, String callId) {
         if (null != callId) {
             Notification notification = NotificationUtils.buildPendingCallNotification(getApplicationContext(), room.getName(session.getCredentials().userId), room.getRoomId(), session.getCredentials().userId, callId);
-            startForeground(NOTIF_ID_FOREGROUND_SERVICE, notification);
-            mForegroundServiceIdentifier = FOREGROUND_NOTIF_ID_PENDING_CALL;
+            startForeground(NOTIFICATION_ID, notification);
+            mNotificationState = NotificationState.CALL_IN_PROGRESS;
             mCallIdInProgress = callId;
         }
     }
@@ -1640,16 +1655,17 @@ public void hideCallNotifications() {
         NotificationManager nm = (NotificationManager) EventStreamService.this.getSystemService(Context.NOTIFICATION_SERVICE);
 
         // hide the call
-        if ((FOREGROUND_NOTIF_ID_PENDING_CALL == mForegroundServiceIdentifier) || (FOREGROUND_ID_INCOMING_CALL == mForegroundServiceIdentifier)) {
-            if (FOREGROUND_NOTIF_ID_PENDING_CALL == mForegroundServiceIdentifier) {
+        if ((NotificationState.CALL_IN_PROGRESS == mNotificationState) || (NotificationState.INCOMING_CALL == mNotificationState)) {
+            if (NotificationState.CALL_IN_PROGRESS == mNotificationState) {
                 mCallIdInProgress = null;
             } else {
                 mIncomingCallId = null;
             }
-            nm.cancel(NOTIF_ID_FOREGROUND_SERVICE);
-            mForegroundServiceIdentifier = -1;
+            nm.cancel(NOTIFICATION_ID);
             stopForeground(true);
-            updateServiceForegroundState();
+
+            mNotificationState = NotificationState.NONE;
+            refreshStatusNotification();
         }
     }
 }
diff --git a/vector/src/main/java/im/vector/util/BugReporter.java b/vector/src/main/java/im/vector/util/BugReporter.java
index c4bedafb48..09c7f6a3fc 100755
--- a/vector/src/main/java/im/vector/util/BugReporter.java
+++ b/vector/src/main/java/im/vector/util/BugReporter.java
@@ -300,6 +300,7 @@ public void onWrite(long totalWritten, long contentLength) {
 
                     int responseCode = HttpURLConnection.HTTP_INTERNAL_ERROR;
                     Response response = null;
+                    String errorMessage = null;
 
                     // trigger the request
                     try {
@@ -308,11 +309,14 @@ public void onWrite(long totalWritten, long contentLength) {
                         responseCode = response.code();
                     } catch (Exception e) {
                         Log.e(LOG_TAG, "response " + e.getMessage());
+                        errorMessage = e.getLocalizedMessage();
                     }
 
                     // if the upload failed, try to retrieve the reason
                     if (responseCode != HttpURLConnection.HTTP_OK) {
-                        if ((null == response) || (null == response.body())) {
+                        if (null != errorMessage) {
+                            serverError = "Failed with error " + errorMessage;
+                        } else if ((null == response) || (null == response.body())) {
                             serverError = "Failed with error " + responseCode;
                         } else {
                             InputStream is = null;
diff --git a/vector/src/main/java/im/vector/util/CallsManager.java b/vector/src/main/java/im/vector/util/CallsManager.java
index 6927f5e812..7bc405954f 100755
--- a/vector/src/main/java/im/vector/util/CallsManager.java
+++ b/vector/src/main/java/im/vector/util/CallsManager.java
@@ -22,6 +22,7 @@
 import android.media.AudioManager;
 import android.os.Handler;
 import android.os.Looper;
+import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.view.View;
 import android.widget.Toast;
@@ -356,9 +357,22 @@ public void onIncomingCall(final IMXCall aCall, final MXUsersDevicesMap<MXDevice
             mUiHandler.post(new Runnable() {
                 @Override
                 public void run() {
+                    Context context = VectorApp.getInstance();
                     Log.d(LOG_TAG, "## onIncomingCall () :" + aCall.getCallId());
+                    int currentCallState = TelephonyManager.CALL_STATE_IDLE;
 
-                    if (null != mActiveCall) {
+                    TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+
+                    if (null != telephonyManager && telephonyManager.getSimState() == TelephonyManager.SIM_STATE_READY) {
+                        currentCallState = telephonyManager.getCallState();
+                    }
+
+                    Log.d(LOG_TAG, "## onIncomingCall () : currentCallState(GSM) = " + currentCallState);
+
+                    if (currentCallState == TelephonyManager.CALL_STATE_OFFHOOK || currentCallState == TelephonyManager.CALL_STATE_RINGING) {
+                        Log.d(LOG_TAG, "## onIncomingCall () : rejected because GSM Call is in progress");
+                        aCall.hangup("busy");
+                    } else if (null != mActiveCall) {
                         Log.d(LOG_TAG, "## onIncomingCall () : rejected because " + mActiveCall + " is in progress");
                         aCall.hangup("busy");
                     } else {
@@ -372,8 +386,6 @@ public void run() {
                         if (null == homeActivity) {
                             Log.d(LOG_TAG, "onIncomingCall : the home activity does not exist -> launch it");
 
-                            Context context = VectorApp.getInstance();
-
                             // clear the activity stack to home activity
                             Intent intent = new Intent(context, VectorHomeActivity.class);
                             intent.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP | Intent.FLAG_ACTIVITY_SINGLE_TOP | Intent.FLAG_ACTIVITY_NEW_TASK);
diff --git a/vector/src/main/java/im/vector/util/GroupUtils.java b/vector/src/main/java/im/vector/util/GroupUtils.java
new file mode 100644
index 0000000000..0adc83608c
--- /dev/null
+++ b/vector/src/main/java/im/vector/util/GroupUtils.java
@@ -0,0 +1,198 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.util;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.text.TextUtils;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.data.Room;
+import org.matrix.androidsdk.data.RoomPreviewData;
+import org.matrix.androidsdk.rest.callback.ApiCallback;
+import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
+import org.matrix.androidsdk.rest.model.MatrixError;
+import org.matrix.androidsdk.rest.model.group.Group;
+import org.matrix.androidsdk.rest.model.group.GroupRoom;
+import org.matrix.androidsdk.rest.model.group.GroupUser;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.regex.Pattern;
+
+import im.vector.activity.CommonActivityUtils;
+import im.vector.activity.VectorMemberDetailsActivity;
+import im.vector.activity.VectorRoomActivity;
+
+public class GroupUtils {
+    private static final String LOG_TAG = GroupUtils.class.getSimpleName();
+
+    /**
+     * Create a list of groups by filtering the given list with the given pattern
+     *
+     * @param groupsToFilter
+     * @param constraint
+     * @return filtered groups
+     */
+    public static List<Group> getFilteredGroups(final List<Group> groupsToFilter, final CharSequence constraint) {
+        final String filterPattern = constraint != null ? constraint.toString().trim() : null;
+        if (!TextUtils.isEmpty(filterPattern)) {
+            List<Group> filteredGroups = new ArrayList<>();
+            Pattern pattern = Pattern.compile(Pattern.quote(filterPattern), Pattern.CASE_INSENSITIVE);
+
+            for (final Group group : groupsToFilter) {
+                if (pattern.matcher(group.getDisplayName()).find()) {
+                    filteredGroups.add(group);
+                }
+            }
+            return filteredGroups;
+        } else {
+            return groupsToFilter;
+        }
+    }
+
+    /**
+     * Create a list of groups by filtering the given list with the given pattern
+     *
+     * @param groupsUsersToFilter
+     * @param constraint
+     * @return filtered group users
+     */
+    public static List<GroupUser> getFilteredGroupUsers(final List<GroupUser> groupsUsersToFilter, final CharSequence constraint) {
+        final String filterPattern = constraint != null ? constraint.toString().trim() : null;
+        if (!TextUtils.isEmpty(filterPattern)) {
+            List<GroupUser> filteredGroupUsers = new ArrayList<>();
+            Pattern pattern = Pattern.compile(Pattern.quote(filterPattern), Pattern.CASE_INSENSITIVE);
+
+            for (final GroupUser groupUser : groupsUsersToFilter) {
+                if (pattern.matcher(groupUser.getDisplayname()).find()) {
+                    filteredGroupUsers.add(groupUser);
+                }
+            }
+            return filteredGroupUsers;
+        } else {
+            return groupsUsersToFilter;
+        }
+    }
+
+    /**
+     * Create a list of groups by filtering the given list with the given pattern
+     *
+     * @param groupRoomsToFilter
+     * @param constraint
+     * @return filtered group users
+     */
+    public static List<GroupRoom> getFilteredGroupRooms(final List<GroupRoom> groupRoomsToFilter, final CharSequence constraint) {
+        final String filterPattern = constraint != null ? constraint.toString().trim() : null;
+        if (!TextUtils.isEmpty(filterPattern)) {
+            List<GroupRoom> filteredGroupRooms = new ArrayList<>();
+            Pattern pattern = Pattern.compile(Pattern.quote(filterPattern), Pattern.CASE_INSENSITIVE);
+
+            for (final GroupRoom groupRoom : groupRoomsToFilter) {
+                if (pattern.matcher(groupRoom.getDisplayName()).find()) {
+                    filteredGroupRooms.add(groupRoom);
+                }
+            }
+            return filteredGroupRooms;
+        } else {
+            return groupRoomsToFilter;
+        }
+    }
+
+    /**
+     * Open the detailed group user page
+     *
+     * @param fromActivity the caller activity
+     * @param session      the session
+     * @param groupUser    the group user
+     */
+    public static void openGroupUserPage(Activity fromActivity, MXSession session, GroupUser groupUser) {
+        Intent userIntent = new Intent(fromActivity, VectorMemberDetailsActivity.class);
+        userIntent.putExtra(VectorMemberDetailsActivity.EXTRA_MEMBER_ID, groupUser.userId);
+
+        if (!TextUtils.isEmpty(groupUser.avatarUrl)) {
+            userIntent.putExtra(VectorMemberDetailsActivity.EXTRA_MEMBER_AVATAR_URL, groupUser.avatarUrl);
+        }
+
+        if (!TextUtils.isEmpty(groupUser.displayname)) {
+            userIntent.putExtra(VectorMemberDetailsActivity.EXTRA_MEMBER_DISPLAY_NAME, groupUser.displayname);
+        }
+
+        userIntent.putExtra(VectorMemberDetailsActivity.EXTRA_MATRIX_ID, session.getCredentials().userId);
+        fromActivity.startActivity(userIntent);
+    }
+
+    /**
+     * Open the detailed group room page
+     *
+     * @param fromActivity the caller activity
+     * @param session      the session
+     * @param groupRoom    the group room
+     */
+    public static void openGroupRoom(final Activity fromActivity, final MXSession session, final GroupRoom groupRoom, final SimpleApiCallback<Void> callback) {
+        Room room = session.getDataHandler().getStore().getRoom(groupRoom.roomId);
+
+        if ((null == room) || (null == room.getMember(session.getMyUserId()))) {
+            final RoomPreviewData roomPreviewData = new RoomPreviewData(session, groupRoom.roomId, null, groupRoom.getAlias(), null);
+
+            roomPreviewData.fetchPreviewData(new ApiCallback<Void>() {
+                private void onDone() {
+                    if (null != callback) {
+                        callback.onSuccess(null);
+                    }
+
+                    CommonActivityUtils.previewRoom(fromActivity, roomPreviewData);
+                }
+
+                @Override
+                public void onSuccess(Void info) {
+                    onDone();
+                }
+
+                private void onError() {
+                    roomPreviewData.setRoomState(groupRoom);
+                    roomPreviewData.setRoomName(groupRoom.name);
+                    onDone();
+                }
+
+                @Override
+                public void onNetworkError(Exception e) {
+                    onError();
+                }
+
+                @Override
+                public void onMatrixError(MatrixError e) {
+                    onError();
+                }
+
+                @Override
+                public void onUnexpectedError(Exception e) {
+                    onError();
+                }
+            });
+        } else {
+            Intent roomIntent = new Intent(fromActivity, VectorRoomActivity.class);
+            roomIntent.putExtra(VectorRoomActivity.EXTRA_MATRIX_ID, session.getMyUserId());
+            roomIntent.putExtra(VectorRoomActivity.EXTRA_ROOM_ID, groupRoom.roomId);
+            fromActivity.startActivity(roomIntent);
+
+            if (null != callback) {
+                callback.onSuccess(null);
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/util/MatrixURLSpan.java b/vector/src/main/java/im/vector/util/MatrixURLSpan.java
index 9da5473b6e..ec9444002e 100755
--- a/vector/src/main/java/im/vector/util/MatrixURLSpan.java
+++ b/vector/src/main/java/im/vector/util/MatrixURLSpan.java
@@ -130,6 +130,10 @@ public void onClick(View widget) {
                 if (null != mActionsListener) {
                     mActionsListener.onMessageIdClick(mURL);
                 }
+            } else if (mPattern == MXSession.PATTERN_CONTAIN_MATRIX_GROUP_IDENTIFIER) {
+                if (null != mActionsListener) {
+                    mActionsListener.onGroupIdClick(mURL);
+                }
             } else {
                 Uri uri = Uri.parse(getURL());
 
@@ -156,7 +160,8 @@ public void onClick(View widget) {
             MXSession.PATTERN_CONTAIN_MATRIX_USER_IDENTIFIER,
             MXSession.PATTERN_CONTAIN_MATRIX_ALIAS,
             MXSession.PATTERN_CONTAIN_MATRIX_ROOM_IDENTIFIER,
-            MXSession.PATTERN_CONTAIN_MATRIX_MESSAGE_IDENTIFIER
+            MXSession.PATTERN_CONTAIN_MATRIX_MESSAGE_IDENTIFIER,
+            MXSession.PATTERN_CONTAIN_MATRIX_GROUP_IDENTIFIER
     );
 
     /**
diff --git a/vector/src/main/java/im/vector/util/PhoneNumberUtils.java b/vector/src/main/java/im/vector/util/PhoneNumberUtils.java
index 6e8e3e3eed..44f6f3ff82 100755
--- a/vector/src/main/java/im/vector/util/PhoneNumberUtils.java
+++ b/vector/src/main/java/im/vector/util/PhoneNumberUtils.java
@@ -23,7 +23,6 @@
 import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 
-import com.google.i18n.phonenumbers.NumberParseException;
 import com.google.i18n.phonenumbers.PhoneNumberUtil;
 import com.google.i18n.phonenumbers.Phonenumber;
 
@@ -160,7 +159,7 @@ public static String getCountryCode(final Context context) {
         if (!preferences.contains(COUNTRY_CODE_PREF_KEY) || TextUtils.isEmpty(preferences.getString(COUNTRY_CODE_PREF_KEY, ""))) {
             try {
                 TelephonyManager tm = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-                String countryCode = tm.getNetworkCountryIso().toUpperCase();
+                String countryCode = tm.getNetworkCountryIso().toUpperCase(VectorApp.getApplicationLocale());
                 if (TextUtils.isEmpty(countryCode)
                         && !TextUtils.isEmpty(Locale.getDefault().getCountry())
                         && PhoneNumberUtil.getInstance().getCountryCodeForRegion(Locale.getDefault().getCountry()) != 0) {
diff --git a/vector/src/main/java/im/vector/util/PreferencesManager.java b/vector/src/main/java/im/vector/util/PreferencesManager.java
index 263fcdb1aa..3acc21e259 100755
--- a/vector/src/main/java/im/vector/util/PreferencesManager.java
+++ b/vector/src/main/java/im/vector/util/PreferencesManager.java
@@ -18,7 +18,6 @@
 
 import android.annotation.SuppressLint;
 import android.content.Context;
-import android.content.Intent;
 import android.content.SharedPreferences;
 import android.database.Cursor;
 import android.media.RingtoneManager;
@@ -121,8 +120,17 @@ public class PreferencesManager {
     private static final String SETTINGS_NOTIFICATION_RINGTONE_PREFERENCE_KEY = "SETTINGS_NOTIFICATION_RINGTONE_PREFERENCE_KEY";
     public static final String SETTINGS_NOTIFICATION_RINGTONE_SELECTION_PREFERENCE_KEY = "SETTINGS_NOTIFICATION_RINGTONE_SELECTION_PREFERENCE_KEY";
 
+    public static final String SETTINGS_GROUPS_FLAIR_KEY = "SETTINGS_GROUPS_FLAIR_KEY";
+
     private static final String SETTINGS_USE_NATIVE_CAMERA_PREFERENCE_KEY = "SETTINGS_USE_NATIVE_CAMERA_PREFERENCE_KEY";
 
+    public static final String SETTINGS_SHOW_URL_PREVIEW_KEY = "SETTINGS_SHOW_URL_PREVIEW_KEY";
+
+    private static final String SETTINGS_VIBRATE_ON_MENTION_KEY = "SETTINGS_VIBRATE_ON_MENTION_KEY";
+
+    private static final String SETTINGS_USE_RAGE_SHAKE_KEY = "SETTINGS_USE_RAGE_SHAKE_KEY";
+
+    private static final String SETTINGS_DISPLAY_ALL_EVENTS_KEY = "SETTINGS_DISPLAY_ALL_EVENTS_KEY";
 
     private static final int MEDIA_SAVING_3_DAYS = 0;
     private static final int MEDIA_SAVING_1_WEEK = 1;
@@ -193,18 +201,18 @@ public static void clearPreferences(Context context) {
     }
 
     /**
-     * Tells if a background service can be started.
+     * Tells if the battery optimisations are ignored for this application.
      *
      * @param context the context
-     * @return true if a background service can be started.
+     * @return true if the battery optimisations are ignored.
      */
     @SuppressLint("NewApi")
-    public static boolean canStartBackgroundService(Context context) {
-        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
-            return ((PowerManager) context.getSystemService(context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName());
+    public static boolean useBatteryOptimisation(Context context) {
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            return !((PowerManager) context.getSystemService(context.POWER_SERVICE)).isIgnoringBatteryOptimizations(context.getPackageName());
         }
 
-        return true;
+        return false;
     }
 
     /**
@@ -606,9 +614,52 @@ public static boolean pinUnreadMessages(Context context) {
      * Tells if Piwik can be used
      *
      * @param context the context
-     * @return null if not defined, true / false when defined
+     * @return true to use it
      */
-    public static Boolean trackWithPiwik(Context context) {
+    public static boolean trackWithPiwik(Context context) {
         return !PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SETTINGS_DISABLE_PIWIK_SETTINGS_PREFERENCE_KEY, false);
     }
+
+    /**
+     * Tells if the phone must vibrate when mentioning
+     *
+     * @param context the context
+     * @return true
+     */
+    public static boolean vibrateWhenMentioning(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SETTINGS_VIBRATE_ON_MENTION_KEY, false);
+    }
+
+    /**
+     * Tells if the rage shake is used.
+     *
+     * @param context the context
+     * @return true if the rage shake is used
+     */
+    public static boolean useRageshake(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SETTINGS_USE_RAGE_SHAKE_KEY, true);
+    }
+
+    /**
+     * Update the rage shake  status.
+     *
+     * @param context   the context
+     * @param isEnabled true to enable the rage shake
+     */
+    public static void setUseRageshake(Context context, boolean isEnabled) {
+        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean(SETTINGS_USE_RAGE_SHAKE_KEY, isEnabled);
+        editor.commit();
+    }
+
+    /**
+     * Tells if all the events must be displayed ie even the redacted events.
+     *
+     * @param context the context
+     * @return true to display all the events even the redacted ones.
+     */
+    public static boolean displayAllEvents(Context context) {
+        return PreferenceManager.getDefaultSharedPreferences(context).getBoolean(SETTINGS_DISPLAY_ALL_EVENTS_KEY, false);
+    }
 }
diff --git a/vector/src/main/java/im/vector/util/RageShake.java b/vector/src/main/java/im/vector/util/RageShake.java
index bb5989f1e5..e6a4c0d9d1 100755
--- a/vector/src/main/java/im/vector/util/RageShake.java
+++ b/vector/src/main/java/im/vector/util/RageShake.java
@@ -41,10 +41,28 @@ public class RageShake implements SensorEventListener {
     // the context
     private Context mContext;
 
+    // the sensor
+    private SensorManager mSensorManager;
+    private Sensor mSensor;
+    private boolean mIsStarted;
+
     /**
      * Constructor
      */
-    public RageShake() {
+    public RageShake(Context context) {
+        mContext = context;
+
+        mSensorManager = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
+
+        if (null != mSensorManager) {
+            mSensor = mSensorManager.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
+        }
+
+        if (null == mSensor) {
+            Log.e(LOG_TAG, "No accelerometer in this device. Cannot use rage shake.");
+            mSensorManager = null;
+        }
+
         // Samsung devices for some reason seem to be less sensitive than others so the threshold is being
         // lowered for them. A possible lead for a better formula is the fact that the sensitivity detected
         // with the calculated force below seems to relate to the sample rate: The higher the sample rate,
@@ -79,12 +97,7 @@ public void onClick(DialogInterface dialog, int which) {
                     .setNeutralButton(R.string.disable, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, int which) {
-                            SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
-
-                            SharedPreferences.Editor editor = preferences.edit();
-                            editor.putBoolean(mContext.getString(im.vector.R.string.settings_key_use_rage_shake), false);
-                            editor.commit();
-
+                            PreferencesManager.setUseRageshake(mContext, false);
                             dialog.dismiss();
                         }
                     })
@@ -101,19 +114,27 @@ public void onClick(DialogInterface dialog, int which) {
         }
     }
 
+
     /**
      * start the sensor detector
      */
-    public void start(Context context) {
-        mContext = context;
+    public void start() {
+        if ((null != mSensorManager) && PreferencesManager.useRageshake(mContext) && !VectorApp.isAppInBackground() && !mIsStarted) {
+            mIsStarted = true;
+            mLastUpdate = 0;
+            mLastShake = 0;
+            mSensorManager.registerListener(this, mSensor, SensorManager.SENSOR_DELAY_NORMAL);
+        }
+    }
 
-        SensorManager sm = (SensorManager) context.getSystemService(Context.SENSOR_SERVICE);
-        Sensor s = sm.getDefaultSensor(Sensor.TYPE_ACCELEROMETER);
-        if (s == null) {
-            Log.e(LOG_TAG, "No accelerometer in this device. Cannot use rage shake.");
-            return;
+    /**
+     * Stop the sensor detector
+     */
+    public void stop() {
+        if (null != mSensorManager) {
+            mSensorManager.unregisterListener(this, mSensor);
         }
-        sm.registerListener(this, s, SensorManager.SENSOR_DELAY_NORMAL);
+        mIsStarted = false;
     }
 
     @Override
@@ -136,12 +157,6 @@ public void onAccuracyChanged(Sensor sensor, int accuracy) {
 
     @Override
     public void onSensorChanged(SensorEvent event) {
-        // ignore the sensor events when the application is in background
-        if (VectorApp.isAppInBackground()) {
-            mLastUpdate = 0;
-            return;
-        }
-
         if (event.sensor.getType() != Sensor.TYPE_ACCELEROMETER) {
             return;
         }
@@ -169,9 +184,7 @@ public void onSensorChanged(SensorEvent event) {
                         Log.d(LOG_TAG, "Shaking detected.");
                         mLastShakeTimestamp = System.currentTimeMillis();
 
-                        SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(mContext);
-
-                        if (preferences.getBoolean(mContext.getString(im.vector.R.string.settings_key_use_rage_shake), true)) {
+                        if (PreferencesManager.useRageshake(mContext)) {
                             promptForReport();
                         }
                     } else {
diff --git a/vector/src/main/java/im/vector/util/RoomUtils.java b/vector/src/main/java/im/vector/util/RoomUtils.java
index 0a9b7384d5..bd54cb8ce0 100644
--- a/vector/src/main/java/im/vector/util/RoomUtils.java
+++ b/vector/src/main/java/im/vector/util/RoomUtils.java
@@ -20,12 +20,20 @@
 import android.app.AlertDialog;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.pm.ShortcutInfo;
+import android.content.pm.ShortcutManager;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.Icon;
 import android.os.Build;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
+import android.view.ContextThemeWrapper;
 import android.view.Gravity;
 import android.view.MenuItem;
 import android.view.View;
+import android.widget.ImageView;
 import android.widget.PopupMenu;
 
 import org.matrix.androidsdk.MXSession;
@@ -36,11 +44,13 @@
 import org.matrix.androidsdk.data.store.IMXStore;
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.model.Event;
+import org.matrix.androidsdk.rest.model.RoomMember;
 import org.matrix.androidsdk.rest.model.User;
 import org.matrix.androidsdk.util.BingRulesManager;
 import org.matrix.androidsdk.util.EventDisplay;
 import org.matrix.androidsdk.util.Log;
 
+import java.io.File;
 import java.lang.reflect.Field;
 import java.lang.reflect.Method;
 import java.util.ArrayList;
@@ -53,6 +63,7 @@
 import im.vector.Matrix;
 import im.vector.R;
 import im.vector.activity.CommonActivityUtils;
+import im.vector.activity.VectorRoomActivity;
 import im.vector.adapters.AdapterUtils;
 
 public class RoomUtils {
@@ -60,7 +71,7 @@ public class RoomUtils {
     private static final String LOG_TAG = RoomUtils.class.getSimpleName();
 
     public interface MoreActionListener {
-        void onToggleRoomNotifications(MXSession session, String roomId);
+        void onUpdateRoomNotificationsState(MXSession session, String roomId, BingRulesManager.RoomNotificationState state);
 
         void onToggleDirectChat(MXSession session, String roomId);
 
@@ -71,6 +82,10 @@ public interface MoreActionListener {
         void moveToLowPriority(MXSession session, String roomId);
 
         void onLeaveRoom(MXSession session, String roomId);
+
+        void onForgetRoom(MXSession session, String roomId);
+
+        void addHomeScreenShortcut(MXSession session, String roomId);
     }
 
     public interface HistoricalRoomActionListener {
@@ -450,18 +465,21 @@ private static void displayPopupMenu(final Context context, final MXSession sess
             return;
         }
 
+        Context popmenuContext = new ContextThemeWrapper(context, R.style.PopMenuStyle);
+
         final PopupMenu popup;
 
         if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
-            popup = new PopupMenu(context, actionView, Gravity.END);
+            popup = new PopupMenu(popmenuContext, actionView, Gravity.END);
         } else {
-            popup = new PopupMenu(context, actionView);
+            popup = new PopupMenu(popmenuContext, actionView);
         }
         popup.getMenuInflater().inflate(R.menu.vector_home_room_settings, popup.getMenu());
         CommonActivityUtils.tintMenuIcons(popup.getMenu(), ThemeUtils.getColor(context, R.attr.settings_icon_tint_color));
 
         if (room.isLeft()) {
             popup.getMenu().setGroupVisible(R.id.active_room_actions, false);
+            popup.getMenu().setGroupVisible(R.id.add_shortcut_actions, false);
             popup.getMenu().setGroupVisible(R.id.historical_room_actions, true);
 
             if (historicalRoomActionListener != null) {
@@ -477,42 +495,92 @@ public boolean onMenuItemClick(final MenuItem item) {
             }
         } else {
             popup.getMenu().setGroupVisible(R.id.active_room_actions, true);
+
+            if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+                popup.getMenu().setGroupVisible(R.id.add_shortcut_actions, false);
+            } else {
+                ShortcutManager manager = context.getSystemService(ShortcutManager.class);
+
+                if (!manager.isRequestPinShortcutSupported()) {
+                    popup.getMenu().setGroupVisible(R.id.add_shortcut_actions, false);
+                } else {
+                    popup.getMenu().setGroupVisible(R.id.add_shortcut_actions, true);
+                }
+            }
+
             popup.getMenu().setGroupVisible(R.id.historical_room_actions, false);
 
             MenuItem item;
 
-            final BingRulesManager bingRulesManager = session.getDataHandler().getBingRulesManager();
+            BingRulesManager.RoomNotificationState state = session.getDataHandler().getBingRulesManager().getRoomNotificationState(room.getRoomId());
+
+            if (BingRulesManager.RoomNotificationState.ALL_MESSAGES_NOISY != state) {
+                item = popup.getMenu().findItem(R.id.ic_action_notifications_noisy);
+                item.setIcon(null);
+            }
+
+            if (BingRulesManager.RoomNotificationState.ALL_MESSAGES != state) {
+                item = popup.getMenu().findItem(R.id.ic_action_notifications_all_message);
+                item.setIcon(null);
+            }
+
+            if (BingRulesManager.RoomNotificationState.MENTIONS_ONLY != state) {
+                item = popup.getMenu().findItem(R.id.ic_action_notifications_mention_only);
+                item.setIcon(null);
+            }
 
-            if (bingRulesManager.isRoomNotificationsDisabled(room.getRoomId())) {
-                item = popup.getMenu().getItem(0);
+            if (BingRulesManager.RoomNotificationState.MUTE != state) {
+                item = popup.getMenu().findItem(R.id.ic_action_notifications_mute);
                 item.setIcon(null);
             }
 
             if (!isFavorite) {
-                item = popup.getMenu().getItem(1);
+                item = popup.getMenu().findItem(R.id.ic_action_select_fav);
                 item.setIcon(null);
             }
 
             if (!isLowPrior) {
-                item = popup.getMenu().getItem(2);
+                item = popup.getMenu().findItem(R.id.ic_action_select_deprioritize);
                 item.setIcon(null);
             }
 
-            if (session.getDirectChatRoomIdsList().indexOf(room.getRoomId()) < 0) {
-                item = popup.getMenu().getItem(3);
+            if (!session.getDirectChatRoomIdsList().contains(room.getRoomId())) {
+                item = popup.getMenu().findItem(R.id.ic_action_select_direct_chat);
                 item.setIcon(null);
             }
 
+            RoomMember member = room.getMember(session.getMyUserId());
+            final boolean isBannedKickedRoom = (null != member) && member.kickedOrBanned();
+
+            if (isBannedKickedRoom) {
+                item = popup.getMenu().findItem(R.id.ic_action_select_remove);
+
+                if (null != item) {
+                    item.setTitle(R.string.forget_room);
+                }
+            }
 
             if (moreActionListener != null) {
                 popup.setOnMenuItemClickListener(new PopupMenu.OnMenuItemClickListener() {
                     @Override
                     public boolean onMenuItemClick(final MenuItem item) {
                         switch (item.getItemId()) {
-                            case R.id.ic_action_select_notifications: {
-                                moreActionListener.onToggleRoomNotifications(session, room.getRoomId());
+                            case R.id.ic_action_notifications_noisy:
+                                moreActionListener.onUpdateRoomNotificationsState(session, room.getRoomId(), BingRulesManager.RoomNotificationState.ALL_MESSAGES_NOISY);
                                 break;
-                            }
+
+                            case R.id.ic_action_notifications_all_message:
+                                moreActionListener.onUpdateRoomNotificationsState(session, room.getRoomId(), BingRulesManager.RoomNotificationState.ALL_MESSAGES);
+                                break;
+
+                            case R.id.ic_action_notifications_mention_only:
+                                moreActionListener.onUpdateRoomNotificationsState(session, room.getRoomId(), BingRulesManager.RoomNotificationState.MENTIONS_ONLY);
+                                break;
+
+                            case R.id.ic_action_notifications_mute:
+                                moreActionListener.onUpdateRoomNotificationsState(session, room.getRoomId(), BingRulesManager.RoomNotificationState.MUTE);
+                                break;
+
                             case R.id.ic_action_select_fav: {
                                 if (isFavorite) {
                                     moreActionListener.moveToConversations(session, room.getRoomId());
@@ -530,13 +598,21 @@ public boolean onMenuItemClick(final MenuItem item) {
                                 break;
                             }
                             case R.id.ic_action_select_remove: {
-                                moreActionListener.onLeaveRoom(session, room.getRoomId());
+                                if (isBannedKickedRoom) {
+                                    moreActionListener.onForgetRoom(session, room.getRoomId());
+                                } else {
+                                    moreActionListener.onLeaveRoom(session, room.getRoomId());
+                                }
                                 break;
                             }
                             case R.id.ic_action_select_direct_chat: {
                                 moreActionListener.onToggleDirectChat(session, room.getRoomId());
                                 break;
                             }
+                            case R.id.ic_action_add_homescreen_shortcut: {
+                                moreActionListener.addHomeScreenShortcut(session, room.getRoomId());
+                                break;
+                            }
                         }
                         return false;
                     }
@@ -591,6 +667,75 @@ public void onClick(DialogInterface dialog, int which) {
                 .show();
     }
 
+    /**
+     * Add a room shortcut to the home screen (Android >= O).
+     *
+     * @param context the context
+     * @param session the session
+     * @param roomId  the room Id
+     */
+    @SuppressLint("NewApi")
+    public static void addHomeScreenShortcut(final Context context, final MXSession session, final String roomId) {
+        // android >=  O only
+        if (Build.VERSION.SDK_INT < Build.VERSION_CODES.O) {
+            return;
+        }
+
+        ShortcutManager manager = context.getSystemService(ShortcutManager.class);
+
+        if (!manager.isRequestPinShortcutSupported()) {
+            return;
+        }
+
+        Room room = session.getDataHandler().getRoom(roomId);
+
+        if (null == room) {
+            return;
+        }
+
+        String roomName = VectorUtils.getRoomDisplayName(context, session, room);
+
+        Bitmap bitmap = null;
+
+        // try to retrieve the avatar from the medias cache
+        if (!TextUtils.isEmpty(room.getAvatarUrl())) {
+            int size = context.getResources().getDimensionPixelSize(R.dimen.profile_avatar_size);
+
+            // check if the thumbnail is already downloaded
+            File f = session.getMediasCache().thumbnailCacheFile(room.getAvatarUrl(), size);
+
+            if (null != f) {
+                BitmapFactory.Options options = new BitmapFactory.Options();
+                options.inPreferredConfig = Bitmap.Config.ARGB_8888;
+                try {
+                    bitmap = BitmapFactory.decodeFile(f.getPath(), options);
+                } catch (OutOfMemoryError oom) {
+                    Log.e(LOG_TAG, "decodeFile failed with an oom");
+                }
+            }
+        }
+
+        if (null == bitmap) {
+            bitmap = VectorUtils.getAvatar(context, VectorUtils.getAvatarColor(roomId), roomName, true);
+        }
+
+        Icon icon = Icon.createWithBitmap(bitmap);
+
+        Intent intent = new Intent(context, VectorRoomActivity.class);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
+        intent.setAction(Intent.ACTION_VIEW);
+        intent.putExtra(VectorRoomActivity.EXTRA_ROOM_ID, roomId);
+
+        ShortcutInfo info = new ShortcutInfo.Builder(context, roomId)
+                .setShortLabel(roomName)
+                .setIcon(icon)
+                .setIntent(intent)
+                .build();
+
+
+        manager.requestPinShortcut(info, null);
+    }
+
     /**
      * Update a room Tag
      *
@@ -643,18 +788,6 @@ public static void toggleDirectChat(final MXSession session, String roomId, fina
         }
     }
 
-    /**
-     * Enable or disable notifications for the given room
-     *
-     * @param session
-     * @param roomId
-     * @param listener
-     */
-    public static void toggleNotifications(final MXSession session, final String roomId, final BingRulesManager.onBingRuleUpdateListener listener) {
-        BingRulesManager bingRulesManager = session.getDataHandler().getBingRulesManager();
-        bingRulesManager.muteRoomNotifications(roomId, !bingRulesManager.isRoomNotificationsDisabled(roomId), listener);
-    }
-
     /**
      * Get whether the room of the given is a direct chat
      *
diff --git a/vector/src/main/java/im/vector/util/SlashComandsParser.java b/vector/src/main/java/im/vector/util/SlashComandsParser.java
index 14487c6cf3..18a9d5e138 100755
--- a/vector/src/main/java/im/vector/util/SlashComandsParser.java
+++ b/vector/src/main/java/im/vector/util/SlashComandsParser.java
@@ -17,7 +17,6 @@
 package im.vector.util;
 
 import android.app.AlertDialog;
-import android.content.DialogInterface;
 import android.text.TextUtils;
 
 import org.matrix.androidsdk.util.Log;
diff --git a/vector/src/main/java/im/vector/util/SlidableMediaInfo.java b/vector/src/main/java/im/vector/util/SlidableMediaInfo.java
index 7a9343c363..799ea5adfd 100755
--- a/vector/src/main/java/im/vector/util/SlidableMediaInfo.java
+++ b/vector/src/main/java/im/vector/util/SlidableMediaInfo.java
@@ -15,7 +15,7 @@
  */
 package im.vector.util;
 
-import org.matrix.androidsdk.rest.model.EncryptedFileInfo;
+import org.matrix.androidsdk.rest.model.crypto.EncryptedFileInfo;
 
 import java.io.Serializable;
 
diff --git a/vector/src/main/java/im/vector/util/ThemeUtils.java b/vector/src/main/java/im/vector/util/ThemeUtils.java
index 657a851c31..2053bbea8d 100644
--- a/vector/src/main/java/im/vector/util/ThemeUtils.java
+++ b/vector/src/main/java/im/vector/util/ThemeUtils.java
@@ -23,6 +23,7 @@
 import android.preference.PreferenceManager;
 import android.support.annotation.AttrRes;
 import android.support.annotation.ColorInt;
+import android.support.design.widget.TabLayout;
 import android.support.v4.content.ContextCompat;
 import android.text.TextUtils;
 import android.util.TypedValue;
@@ -47,6 +48,7 @@
 import im.vector.activity.SplashActivity;
 import im.vector.activity.VectorBaseSearchActivity;
 import im.vector.activity.VectorCallViewActivity;
+import im.vector.activity.VectorGroupDetailsActivity;
 import im.vector.activity.VectorHomeActivity;
 import im.vector.activity.VectorMediasPickerActivity;
 import im.vector.activity.VectorMediasViewerActivity;
@@ -178,6 +180,8 @@ public static void setActivityTheme(Activity activity) {
                 activity.setTheme(R.style.AppTheme_Dark);
             } else if (activity instanceof LockScreenActivity) {
                 activity.setTheme(R.style.Vector_Lock_Dark);
+            } else if (activity instanceof VectorGroupDetailsActivity) {
+                activity.setTheme(R.style.AppTheme_Dark);
             }
         }
 
@@ -234,6 +238,8 @@ public static void setActivityTheme(Activity activity) {
                 activity.setTheme(R.style.AppTheme_Black);
             } else if (activity instanceof LockScreenActivity) {
                 activity.setTheme(R.style.Vector_Lock_Black);
+            } else if (activity instanceof VectorGroupDetailsActivity) {
+                activity.setTheme(R.style.AppTheme_Black);
             }
         }
 
@@ -247,6 +253,34 @@ public static void setActivityTheme(Activity activity) {
         mColorByAttr.clear();
     }
 
+    /**
+     * Set the TabLayout colors.
+     * It seems that there is no proper way to manage it with the manifest file.
+     *
+     * @param activity the activity
+     * @param layout   the layout
+     */
+    public static void setTabLayoutTheme(Activity activity, TabLayout layout) {
+
+        if (activity instanceof VectorGroupDetailsActivity) {
+            int textColor;
+            int underlineColor;
+            int backgroundColor;
+
+            if (TextUtils.equals(getApplicationTheme(activity), THEME_LIGHT_VALUE)) {
+                underlineColor = textColor = ContextCompat.getColor(activity, android.R.color.white);
+                backgroundColor = ContextCompat.getColor(activity, R.color.tab_groups);
+            } else {
+                underlineColor = textColor = ContextCompat.getColor(activity, R.color.tab_groups);
+                backgroundColor = getColor(activity, R.attr.primary_color);
+            }
+
+            layout.setTabTextColors(textColor, textColor);
+            layout.setSelectedTabIndicatorColor(underlineColor);
+            layout.setBackgroundColor(backgroundColor);
+        }
+    }
+
     /**
      * Translates color attributes to colors
      *
diff --git a/vector/src/main/java/im/vector/util/VectorImageGetter.java b/vector/src/main/java/im/vector/util/VectorImageGetter.java
new file mode 100644
index 0000000000..3c60804f77
--- /dev/null
+++ b/vector/src/main/java/im/vector/util/VectorImageGetter.java
@@ -0,0 +1,154 @@
+/*
+ * Copyright 2017 Vector Creations Ltd
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.util;
+
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
+import android.os.AsyncTask;
+import android.support.v4.content.res.ResourcesCompat;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.util.Log;
+
+import android.text.Html;
+
+import java.net.URL;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+
+import im.vector.R;
+import im.vector.VectorApp;
+
+public class VectorImageGetter implements Html.ImageGetter {
+    private final String LOG_TAG = VectorImageGetter.class.getSimpleName();
+
+    // application image placeholder
+    private static Drawable mPlaceHolder = null;
+
+    // source to image map
+    private Map<String, Drawable> mBitmapCache = new HashMap<>();
+
+    // pending source downloads
+    private Set<String> mPendingDownloads = new HashSet<>();
+
+    /**
+     * Image download listener
+     */
+    public interface OnImageDownloadListener {
+        /**
+         * An image has been downloaded.
+         *
+         * @param source the image URL
+         */
+        void onImageDownloaded(String source);
+    }
+
+    //
+    private MXSession mSession;
+
+    // listener
+    private OnImageDownloadListener mListener;
+
+    /**
+     * Constructor
+     *
+     * @param session the session
+     */
+    public VectorImageGetter(MXSession session) {
+        mSession = session;
+    }
+
+    /**
+     * Set the listener
+     *
+     * @param listener the listener
+     */
+    public void setListener(OnImageDownloadListener listener) {
+        mListener = listener;
+    }
+
+    @Override
+    public Drawable getDrawable(String source) {
+        if (mBitmapCache.containsKey(source)) {
+            Log.d(LOG_TAG, "## getDrawable() : " + source + " already cached");
+            return mBitmapCache.get(source);
+        }
+
+        if (!mPendingDownloads.contains(source)) {
+            Log.d(LOG_TAG, "## getDrawable() : starts a task to download " + source);
+            try {
+                new ImageDownloaderTask().execute(source);
+                mPendingDownloads.add(source);
+            } catch (Throwable t) {
+                Log.e(LOG_TAG, "## getDrawable() failed " + t.getMessage());
+            }
+        } else {
+            Log.d(LOG_TAG, "## getDrawable() : " + source + " is downloading");
+        }
+
+        if (null == mPlaceHolder) {
+            mPlaceHolder = ResourcesCompat.getDrawable(VectorApp.getInstance().getResources(), R.drawable.filetype_image, null);
+            mPlaceHolder.setBounds(0, 0, mPlaceHolder.getIntrinsicWidth(), mPlaceHolder.getIntrinsicHeight());
+        }
+
+        return mPlaceHolder;
+    }
+
+
+    private class ImageDownloaderTask extends AsyncTask<Object, Void, Bitmap> {
+        private String mSource;
+
+        @Override
+        protected Bitmap doInBackground(Object... params) {
+            mSource = (String) params[0];
+            Log.d(LOG_TAG, "## doInBackground() : " + mSource);
+            try {
+                return BitmapFactory.decodeStream(new URL(mSession.getContentManager().getDownloadableUrl(mSource)).openConnection().getInputStream());
+            } catch (Throwable t) {
+                Log.e(LOG_TAG, "## ImageDownloader() failed " + t.getMessage());
+            }
+
+            return null;
+        }
+
+        @Override
+        protected void onPostExecute(Bitmap bitmap) {
+            Log.d(LOG_TAG, "## doInBackground() : bitmap " + bitmap);
+
+            mPendingDownloads.remove(mSource);
+
+            if (null != bitmap) {
+                Drawable drawable = new BitmapDrawable(VectorApp.getInstance().getResources(), bitmap);
+                drawable.setBounds(0, 0, drawable.getIntrinsicWidth(), drawable.getIntrinsicHeight());
+
+                mBitmapCache.put(mSource, drawable);
+
+                try {
+                    if (null != mListener) {
+                        mListener.onImageDownloaded(mSource);
+                    }
+                } catch (Throwable t) {
+                    Log.e(LOG_TAG, "## ImageDownloader() failed " + t.getMessage());
+                }
+            }
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/util/VectorMarkdownParser.java b/vector/src/main/java/im/vector/util/VectorMarkdownParser.java
index d6229bad6e..419226c543 100755
--- a/vector/src/main/java/im/vector/util/VectorMarkdownParser.java
+++ b/vector/src/main/java/im/vector/util/VectorMarkdownParser.java
@@ -28,6 +28,9 @@
 import android.webkit.JavascriptInterface;
 import android.webkit.WebView;
 
+import java.util.Timer;
+import java.util.TimerTask;
+
 /**
  * Markdown parser.
  * This class uses a webview.
@@ -113,6 +116,9 @@ public void markdownToHtml(final String markdownText, final IVectorMarkdownParse
         mMarkDownWebAppInterface.initParams(markdownText, listener);
 
         try {
+            // the conversion starts
+            mMarkDownWebAppInterface.start();
+
             // call the javascript method
             if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
                 loadUrl(String.format("javascript:convertToHtml('%s')", escapeText(markdownText)));
@@ -120,6 +126,7 @@ public void markdownToHtml(final String markdownText, final IVectorMarkdownParse
                 evaluateJavascript(String.format("convertToHtml('%s')", escapeText(markdownText)), null);
             }
         } catch (Exception e) {
+            mMarkDownWebAppInterface.cancel();
             Log.e(LOG_TAG, "## markdownToHtml() : failed " + e.getMessage());
             listener.onMarkdownParsed(markdownText, text);
         }
@@ -151,6 +158,11 @@ private class MarkDownWebAppInterface {
          */
         private IVectorMarkdownParserListener mListener;
 
+        /**
+         * Defines watchdog timer
+         */
+        private Timer mWatchdogTimer;
+
         /**
          * Init the search params.
          *
@@ -162,6 +174,54 @@ public void initParams(String textToParse, IVectorMarkdownParserListener listene
             mListener = listener;
         }
 
+        /**
+         * The parsing starts.
+         */
+        public void start() {
+            Log.d(LOG_TAG, "## start() : Markdown starts");
+
+            try {
+                // monitor the parsing as there is no way to detect if there was an error in the JS.
+                mWatchdogTimer = new Timer();
+                mWatchdogTimer.schedule(new TimerTask() {
+                    @Override
+                    public void run() {
+                        if (null != mListener) {
+                            Log.d(LOG_TAG, "## start() : delay expires");
+
+                            try {
+                                mListener.onMarkdownParsed(mTextToParse, mTextToParse);
+                            } catch (Exception e) {
+                                Log.e(LOG_TAG, "## wOnParse() " + e.getMessage());
+                            }
+                        }
+                        done();
+                    }
+                }, 300);
+            } catch (Throwable e) {
+                Log.e(LOG_TAG, "## start() : failed to starts " + e.getMessage());
+            }
+        }
+
+        /**
+         * Cancel the markdown parser
+         */
+        public void cancel() {
+            Log.e(LOG_TAG, "## cancel()");
+            done();
+        }
+
+        /**
+         * The parsing is done
+         */
+        private void done() {
+            if (null != mWatchdogTimer) {
+                mWatchdogTimer.cancel();
+                mWatchdogTimer = null;
+            }
+            mListener = null;
+        }
+
         @JavascriptInterface
         public void wOnParse(String HTMLText) {
             if (!TextUtils.isEmpty(HTMLText)) {
@@ -179,11 +239,17 @@ public void wOnParse(String HTMLText) {
             }
 
             if (null != mListener) {
+                Log.d(LOG_TAG, "## wOnParse() : parse done");
+
                 try {
                     mListener.onMarkdownParsed(mTextToParse, HTMLText);
                 } catch (Exception e) {
                     Log.e(LOG_TAG, "## wOnParse() " + e.getMessage());
                 }
+
+                done();
+            } else {
+                Log.d(LOG_TAG, "## wOnParse() : parse required too much time");
             }
         }
     }
diff --git a/vector/src/main/java/im/vector/util/VectorRoomMediasSender.java b/vector/src/main/java/im/vector/util/VectorRoomMediasSender.java
index 4494cd14e3..f83032f5c9 100755
--- a/vector/src/main/java/im/vector/util/VectorRoomMediasSender.java
+++ b/vector/src/main/java/im/vector/util/VectorRoomMediasSender.java
@@ -23,7 +23,9 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.net.Uri;
+import android.os.Handler;
 import android.os.HandlerThread;
+import android.os.Looper;
 import android.support.v4.app.FragmentManager;
 import android.text.Html;
 import android.text.TextUtils;
@@ -35,7 +37,7 @@
 import android.widget.Toast;
 
 import org.matrix.androidsdk.db.MXMediasCache;
-import org.matrix.androidsdk.rest.model.Message;
+import org.matrix.androidsdk.rest.model.message.Message;
 import org.matrix.androidsdk.util.ImageUtils;
 import org.matrix.androidsdk.util.ResourceUtils;
 
@@ -260,29 +262,42 @@ public void run() {
      * @param sharedDataItem the media item.
      */
     private void sendTextMessage(RoomMediaMessage sharedDataItem) {
-        CharSequence sequence = sharedDataItem.getText();
+        final CharSequence sequence = sharedDataItem.getText();
         String htmlText = sharedDataItem.getHtmlText();
-        String text = null;
 
-        if (null == sequence) {
-            if (null != htmlText) {
-                text = Html.fromHtml(htmlText).toString();
-            }
+        // content only text -> insert it in the room editor
+        // to let the user decides to send the message
+        if (!TextUtils.isEmpty(sequence) && (null == htmlText)) {
+            new Handler(Looper.getMainLooper()).post(new Runnable() {
+                @Override
+                public void run() {
+                    mVectorRoomActivity.insertTextInTextEditor(sequence.toString());
+                }
+            });
         } else {
-            text = sequence.toString();
-        }
 
-        Log.d(LOG_TAG, "sendTextMessage " + text);
+            String text = null;
 
-        final String fText = text;
-        final String fHtmlText = htmlText;
-
-        mVectorRoomActivity.runOnUiThread(new Runnable() {
-            @Override
-            public void run() {
-                mVectorRoomActivity.sendMessage(fText, fHtmlText, Message.FORMAT_MATRIX_HTML);
+            if (null == sequence) {
+                if (null != htmlText) {
+                    text = Html.fromHtml(htmlText).toString();
+                }
+            } else {
+                text = sequence.toString();
             }
-        });
+
+            Log.d(LOG_TAG, "sendTextMessage " + text);
+
+            final String fText = text;
+            final String fHtmlText = htmlText;
+
+            mVectorRoomActivity.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    mVectorRoomActivity.sendMessage(fText, fHtmlText, Message.FORMAT_MATRIX_HTML);
+                }
+            });
+        }
 
         // manage others
         if (mSharedDataItems.size() > 0) {
diff --git a/vector/src/main/java/im/vector/util/VectorUtils.java b/vector/src/main/java/im/vector/util/VectorUtils.java
index 634d60010a..1586771334 100755
--- a/vector/src/main/java/im/vector/util/VectorUtils.java
+++ b/vector/src/main/java/im/vector/util/VectorUtils.java
@@ -55,7 +55,9 @@
 import org.matrix.androidsdk.rest.callback.ApiCallback;
 import org.matrix.androidsdk.rest.callback.SimpleApiCallback;
 import org.matrix.androidsdk.rest.model.MatrixError;
-import org.matrix.androidsdk.rest.model.PublicRoom;
+import org.matrix.androidsdk.rest.model.group.Group;
+import org.matrix.androidsdk.rest.model.group.GroupProfile;
+import org.matrix.androidsdk.rest.model.publicroom.PublicRoom;
 import org.matrix.androidsdk.rest.model.RoomMember;
 import org.matrix.androidsdk.rest.model.User;
 import org.matrix.androidsdk.util.ImageUtils;
@@ -71,7 +73,6 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
 import im.vector.R;
@@ -250,9 +251,9 @@ public int compare(RoomMember m1, RoomMember m2) {
 
                     if (TextUtils.equals(member.membership, RoomMember.MEMBERSHIP_INVITE)) {
 
-                        if (!TextUtils.isEmpty(member.getInviterId())) {
+                        if (!TextUtils.isEmpty(member.mSender)) {
                             // extract who invited us to the room
-                            displayName = context.getString(R.string.room_displayname_invite_from, roomState.getMemberName(member.getInviterId()));
+                            displayName = context.getString(R.string.room_displayname_invite_from, roomState.getMemberName(member.mSender));
                         } else {
                             displayName = context.getString(R.string.room_displayname_room_invite);
                         }
@@ -376,7 +377,7 @@ private static String getInitialLetter(String name) {
             int idx = 0;
             char initial = name.charAt(idx);
 
-            if ((initial == '@' || initial == '#') && (name.length() > 1)) {
+            if ((initial == '@' || initial == '#' || initial == '+') && (name.length() > 1)) {
                 idx++;
             }
 
@@ -402,7 +403,7 @@ private static String getInitialLetter(String name) {
             firstChar = name.substring(idx, idx + chars);
         }
 
-        return firstChar.toUpperCase();
+        return firstChar.toUpperCase(VectorApp.getApplicationLocale());
     }
 
     /**
@@ -472,6 +473,20 @@ public static void loadRoomAvatar(Context context, MXSession session, ImageView
         }
     }
 
+    /**
+     * Set the group avatar in an imageView.
+     *
+     * @param context   the context
+     * @param session   the session
+     * @param imageView the image view
+     * @param group     the group
+     */
+    public static void loadGroupAvatar(Context context, MXSession session, ImageView imageView, Group group) {
+        if (null != group) {
+            VectorUtils.loadUserAvatar(context, session, imageView, group.getAvatarUrl(), group.getGroupId(), group.getDisplayName());
+        }
+    }
+
     /**
      * Set the call avatar in an imageView.
      *
@@ -590,18 +605,20 @@ public static void loadUserAvatar(final Context context, final MXSession session
             if (null != bitmap) {
                 imageView.setImageBitmap(bitmap);
 
-                final String tag = avatarUrl + userId + displayName;
-                imageView.setTag(tag);
+                if (!TextUtils.isEmpty(avatarUrl)) {
+                    final String tag = avatarUrl + userId + displayName;
+                    imageView.setTag(tag);
 
-                if (!MXMediasCache.isMediaUrlUnreachable(avatarUrl)) {
-                    mImagesThreadHandler.post(new Runnable() {
-                        @Override
-                        public void run() {
-                            if (TextUtils.equals(tag, (String) imageView.getTag())) {
-                                session.getMediasCache().loadAvatarThumbnail(session.getHomeServerConfig(), imageView, avatarUrl, context.getResources().getDimensionPixelSize(R.dimen.profile_avatar_size), bitmap);
+                    if (!MXMediasCache.isMediaUrlUnreachable(avatarUrl)) {
+                        mImagesThreadHandler.post(new Runnable() {
+                            @Override
+                            public void run() {
+                                if (TextUtils.equals(tag, (String) imageView.getTag())) {
+                                    session.getMediasCache().loadAvatarThumbnail(session.getHomeServerConfig(), imageView, avatarUrl, context.getResources().getDimensionPixelSize(R.dimen.profile_avatar_size), bitmap);
+                                }
                             }
-                        }
-                    });
+                        });
+                    }
                 }
             } else {
                 final String tmpTag0 = "00" + avatarUrl + "-" + userId + "--" + displayName;
@@ -615,7 +632,7 @@ public void run() {
                             imageView.setTag(null);
                             setDefaultMemberAvatar(imageView, userId, displayName);
 
-                            if (!MXMediasCache.isMediaUrlUnreachable(avatarUrl)) {
+                            if (!TextUtils.isEmpty(avatarUrl) && !MXMediasCache.isMediaUrlUnreachable(avatarUrl)) {
                                 final String tmpTag1 = "11" + avatarUrl + "-" + userId + "--" + displayName;
                                 imageView.setTag(tmpTag1);
 
diff --git a/vector/src/main/java/im/vector/view/CodeBlockNestedScrollView.java b/vector/src/main/java/im/vector/view/CodeBlockNestedScrollView.java
new file mode 100755
index 0000000000..f253d50212
--- /dev/null
+++ b/vector/src/main/java/im/vector/view/CodeBlockNestedScrollView.java
@@ -0,0 +1,42 @@
+/* 
+ * Copyright 2016 OpenMarket Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package im.vector.view;
+
+import android.content.Context;
+import android.support.v4.widget.NestedScrollView;
+import android.util.AttributeSet;
+
+public class CodeBlockNestedScrollView extends NestedScrollView {
+
+    public CodeBlockNestedScrollView(Context context) {
+        super(context);
+    }
+
+    public CodeBlockNestedScrollView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public CodeBlockNestedScrollView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
+        heightMeasureSpec = MeasureSpec.makeMeasureSpec(500, MeasureSpec.AT_MOST);
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec);
+    }
+}
\ No newline at end of file
diff --git a/vector/src/main/java/im/vector/view/HomeSectionView.java b/vector/src/main/java/im/vector/view/HomeSectionView.java
index 855bf2e5fd..c615c74327 100644
--- a/vector/src/main/java/im/vector/view/HomeSectionView.java
+++ b/vector/src/main/java/im/vector/view/HomeSectionView.java
@@ -131,12 +131,15 @@ private void onDataUpdated() {
             // reported by GA
             // the adapter value is tested by it seems crashed when calling getBadgeCount
             try {
-                setVisibility(mHideIfEmpty && mAdapter.isEmpty() ? GONE : VISIBLE);
-                final int badgeCount = mAdapter.getBadgeCount();
+                boolean isEmpty = mAdapter.isEmpty();
+                boolean hasNoResult = mAdapter.hasNoResult();
+                int badgeCount = mAdapter.getBadgeCount();
+
+                setVisibility(mHideIfEmpty && isEmpty ? GONE : VISIBLE);
                 mBadge.setText(RoomUtils.formatUnreadMessagesCounter(badgeCount));
                 mBadge.setVisibility(badgeCount == 0 ? GONE : VISIBLE);
-                mRecyclerView.setVisibility(mAdapter.hasNoResult() ? GONE : VISIBLE);
-                mPlaceHolder.setVisibility(mAdapter.hasNoResult() ? VISIBLE : GONE);
+                mRecyclerView.setVisibility(hasNoResult ? GONE : VISIBLE);
+                mPlaceHolder.setVisibility(hasNoResult ? VISIBLE : GONE);
             } catch (Exception e) {
                 Log.e(LOG_TAG, "## onDataUpdated() failed " + e.getMessage());
             }
@@ -190,10 +193,10 @@ public void setHideIfEmpty(final boolean hideIfEmpty) {
      * @param invitationListener   listener for invite buttons
      * @param moreActionListener   listener for room menu
      */
-    public void setupRecyclerView(final RecyclerView.LayoutManager layoutManager, @LayoutRes final int itemResId,
-                                  final boolean nestedScrollEnabled, final HomeRoomAdapter.OnSelectRoomListener onSelectRoomListener,
-                                  final AbsAdapter.InvitationListener invitationListener,
-                                  final AbsAdapter.MoreRoomActionListener moreActionListener) {
+    public void setupRoomRecyclerView(final RecyclerView.LayoutManager layoutManager, @LayoutRes final int itemResId,
+                                      final boolean nestedScrollEnabled, final HomeRoomAdapter.OnSelectRoomListener onSelectRoomListener,
+                                      final AbsAdapter.RoomInvitationListener invitationListener,
+                                      final AbsAdapter.MoreRoomActionListener moreActionListener) {
         mRecyclerView.setLayoutManager(layoutManager);
         mRecyclerView.setHasFixedSize(true);
         mRecyclerView.setNestedScrollingEnabled(nestedScrollEnabled);
diff --git a/vector/src/main/java/im/vector/view/PillImageView.java b/vector/src/main/java/im/vector/view/PillImageView.java
new file mode 100644
index 0000000000..6a45720e3d
--- /dev/null
+++ b/vector/src/main/java/im/vector/view/PillImageView.java
@@ -0,0 +1,60 @@
+/* 
+ * Copyright 2014 OpenMarket Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.view;
+
+import android.content.Context;
+import android.support.v4.graphics.drawable.RoundedBitmapDrawable;
+import android.util.AttributeSet;
+
+import java.lang.ref.WeakReference;
+
+/**
+ * Avatar image view used in PillView
+ */
+public class PillImageView extends VectorCircularImageView {
+    // listener
+    private WeakReference<PillView.OnUpdateListener> mOnUpdateListener = null;
+
+    public PillImageView(Context context) {
+        super(context);
+    }
+
+    public PillImageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+
+    public PillImageView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+    }
+
+    @Override
+    protected void setCircularImageDrawable(final RoundedBitmapDrawable cachedDrawable) {
+        super.setCircularImageDrawable(cachedDrawable);
+
+        if ((null != mOnUpdateListener) && (null != mOnUpdateListener.get())) {
+            mOnUpdateListener.get().onAvatarUpdate();
+        }
+    }
+
+    /**
+     * Update the update listener
+     *
+     * @param listener the new update listener
+     */
+    public void setOnUpdateListener(PillView.OnUpdateListener listener) {
+        mOnUpdateListener = new WeakReference<>(listener);
+    }
+}
diff --git a/vector/src/main/java/im/vector/view/PillView.java b/vector/src/main/java/im/vector/view/PillView.java
index d0418ad675..74f3854acb 100644
--- a/vector/src/main/java/im/vector/view/PillView.java
+++ b/vector/src/main/java/im/vector/view/PillView.java
@@ -22,24 +22,40 @@
 import android.graphics.drawable.Drawable;
 import android.support.v4.content.ContextCompat;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
 import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.rest.callback.ApiCallback;
+import org.matrix.androidsdk.rest.model.MatrixError;
+import org.matrix.androidsdk.rest.model.User;
+import org.matrix.androidsdk.util.Log;
+
+import java.lang.ref.WeakReference;
 
-import im.vector.Matrix;
 import im.vector.R;
+import im.vector.VectorApp;
+import im.vector.util.VectorUtils;
+
 /**
  *
  */
 public class PillView extends LinearLayout {
     private static final String LOG_TAG = PillView.class.getSimpleName();
 
+    // pill item views
     private TextView mTextView;
+    private PillImageView mAvatarView;
     private View mPillLayout;
 
+    // update listener
+    public interface OnUpdateListener {
+        void onAvatarUpdate();
+    }
+
+    private WeakReference<OnUpdateListener> mOnUpdateListener = null;
+
     /**
      * constructors
      **/
@@ -64,33 +80,47 @@ public PillView(Context context, AttributeSet attrs, int defStyle) {
     private void initView() {
         View.inflate(getContext(), R.layout.pill_view, this);
         mTextView = findViewById(R.id.pill_text_view);
+        mAvatarView = findViewById(R.id.pill_avatar_view);
         mPillLayout = findViewById(R.id.pill_layout);
     }
 
     /**
-     * Tells if a pill can be displayed for this url.
+     * Extract the linked URL from the universal link
      *
-     * @param url the url
-     * @return true if a pill can be made.
+     * @param url the universal link
+     * @return the url
      */
-    public static boolean isPillable(String url) {
+    private static String getLinkedUrl(String url) {
         boolean isSupported = (null != url) && url.startsWith("https://matrix.to/#/");
 
         if (isSupported) {
-            String linkedItem = url.substring("https://matrix.to/#/".length());
-            isSupported = MXSession.isRoomAlias(linkedItem) || MXSession.isUserId(linkedItem);
+            return url.substring("https://matrix.to/#/".length());
         }
 
-        return isSupported;
+        return null;
+    }
+
+    /**
+     * Tells if a pill can be displayed for this url.
+     *
+     * @param url the url
+     * @return true if a pill can be made.
+     */
+    public static boolean isPillable(String url) {
+        String linkedUrl = getLinkedUrl(url);
+
+        return (null != linkedUrl) && (MXSession.isRoomAlias(linkedUrl) || MXSession.isUserId(linkedUrl));
     }
 
     /**
-     * Update the pills text.
+     * Update the pills data
      *
      * @param text the pills
      * @param url  the URL
      */
-    public void setText(CharSequence text, String url) {
+    public void initData(final CharSequence text, final String url, final MXSession session, OnUpdateListener listener) {
+        mOnUpdateListener = new WeakReference<>(listener);
+        mAvatarView.setOnUpdateListener(listener);
         mTextView.setText(text.toString());
 
         TypedArray a = getContext().getTheme().obtainStyledAttributes(new int[]{MXSession.isRoomAlias(text.toString()) ? R.attr.pill_background_room_alias : R.attr.pill_background_user_id});
@@ -103,6 +133,43 @@ public void setText(CharSequence text, String url) {
         attributeResourceId = a.getResourceId(0, 0);
         a.recycle();
         mTextView.setTextColor(ContextCompat.getColor(getContext(), attributeResourceId));
+
+        String linkedUrl = getLinkedUrl(url);
+
+        if (MXSession.isUserId(linkedUrl)) {
+            User user = session.getDataHandler().getUser(linkedUrl);
+
+            if (null == user) {
+                user = new User();
+                user.user_id = linkedUrl;
+            }
+
+            VectorUtils.loadUserAvatar(VectorApp.getInstance(), session, mAvatarView, user);
+        } else {
+            session.getDataHandler().roomIdByAlias(linkedUrl, new ApiCallback<String>() {
+                @Override
+                public void onSuccess(String roomId) {
+                    if (null != mOnUpdateListener) {
+                        VectorUtils.loadRoomAvatar(VectorApp.getInstance(), session, mAvatarView, session.getDataHandler().getRoom(roomId));
+                    }
+                }
+
+                @Override
+                public void onNetworkError(Exception e) {
+                    Log.e(LOG_TAG, "## initData() : roomIdByAlias failed " + e.getMessage());
+                }
+
+                @Override
+                public void onMatrixError(MatrixError e) {
+                    Log.e(LOG_TAG, "## initData() : roomIdByAlias failed " + e.getMessage());
+                }
+
+                @Override
+                public void onUnexpectedError(Exception e) {
+                    Log.e(LOG_TAG, "## initData() : roomIdByAlias failed " + e.getMessage());
+                }
+            });
+        }
     }
 
     /**
diff --git a/vector/src/main/java/im/vector/view/RiotViewPager.java b/vector/src/main/java/im/vector/view/RiotViewPager.java
index 3d0748b936..56280a515f 100644
--- a/vector/src/main/java/im/vector/view/RiotViewPager.java
+++ b/vector/src/main/java/im/vector/view/RiotViewPager.java
@@ -18,9 +18,10 @@
 import android.content.Context;
 import android.graphics.Canvas;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 
+import org.matrix.androidsdk.util.Log;
+
 /**
  * Patch the issue "https://code.google.com/p/android/issues/detail?id=66620"
  */
diff --git a/vector/src/main/java/im/vector/view/UrlPreviewView.java b/vector/src/main/java/im/vector/view/UrlPreviewView.java
new file mode 100644
index 0000000000..d673f39354
--- /dev/null
+++ b/vector/src/main/java/im/vector/view/UrlPreviewView.java
@@ -0,0 +1,151 @@
+/* 
+ * Copyright 2014 OpenMarket Ltd
+ * 
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package im.vector.view;
+
+import android.content.Context;
+import android.content.SharedPreferences;
+import android.preference.PreferenceManager;
+import android.text.Html;
+import android.text.method.LinkMovementMethod;
+import android.util.AttributeSet;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import org.matrix.androidsdk.MXSession;
+import org.matrix.androidsdk.rest.model.URLPreview;
+import org.matrix.androidsdk.util.Log;
+
+import java.util.HashSet;
+
+import im.vector.R;
+import im.vector.VectorApp;
+import im.vector.util.PreferencesManager;
+
+/**
+ *
+ */
+public class UrlPreviewView extends LinearLayout {
+    private static final String LOG_TAG = UrlPreviewView.class.getSimpleName();
+
+    // private item views
+    private ImageView mImageView;
+    private TextView mTitleTextView;
+    private TextView mDescriptionTextView;
+    private View mCloseView;
+
+    // dismissed when clicking on mCloseView
+    private boolean mIsDismissed = false;
+
+    private String mUID = null;
+
+    // save
+    private static HashSet<String> mDismissedUrlsPreviews = null;
+
+    private static final String DISMISSED_URL_PREVIEWS_PREF_KEY = "DISMISSED_URL_PREVIEWS_PREF_KEY";
+
+    /**
+     * constructors
+     **/
+    public UrlPreviewView(Context context) {
+        super(context);
+        initView();
+    }
+
+    public UrlPreviewView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView();
+    }
+
+    public UrlPreviewView(Context context, AttributeSet attrs, int defStyle) {
+        super(context, attrs, defStyle);
+        initView();
+    }
+
+    /**
+     * Common initialisation method.
+     */
+    private void initView() {
+        View.inflate(getContext(), R.layout.url_preview_view, this);
+        mImageView = findViewById(R.id.url_preview_image_view);
+        mTitleTextView = findViewById(R.id.url_preview_title_text_view);
+        mDescriptionTextView = findViewById(R.id.url_preview_description_text_view);
+        mCloseView = findViewById(R.id.url_preview_hide_image_view);
+
+        mCloseView.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                mIsDismissed = true;
+                UrlPreviewView.this.setVisibility(View.GONE);
+
+                mDismissedUrlsPreviews.add(mUID);
+
+                SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(VectorApp.getInstance());
+                SharedPreferences.Editor editor = preferences.edit();
+
+                editor.putStringSet(DISMISSED_URL_PREVIEWS_PREF_KEY, mDismissedUrlsPreviews);
+                editor.commit();
+            }
+        });
+    }
+
+    /**
+     * Tells if the URL preview defines by uid has been dismissed.
+     *
+     * @param uid the url preview id
+     * @return true if it has been dismissed
+     */
+    public static boolean didUrlPreviewDismiss(String uid) {
+        if (null == mDismissedUrlsPreviews) {
+            mDismissedUrlsPreviews = new HashSet<>(PreferenceManager.getDefaultSharedPreferences(VectorApp.getInstance()).getStringSet(DISMISSED_URL_PREVIEWS_PREF_KEY, new HashSet<String>()));
+        }
+
+        return mDismissedUrlsPreviews.contains(uid);
+    }
+
+    /**
+     * Set the URL preview.
+     *
+     * @param context the context
+     * @param session the session
+     * @param preview the url preview
+     * @param uid     unique identifier of this preview
+     */
+    public void setUrlPreview(Context context, MXSession session, URLPreview preview, String uid) {
+        Log.d(LOG_TAG, "## setUrlPreview " + this);
+
+        if ((null == preview) || mIsDismissed || didUrlPreviewDismiss(uid) || !session.isURLPreviewEnabled()) {
+            setVisibility(View.GONE);
+        } else {
+            setVisibility(View.VISIBLE);
+            session.getMediasCache().loadAvatarThumbnail(session.getHomeServerConfig(), mImageView, preview.getThumbnailURL(), context.getResources().getDimensionPixelSize(R.dimen.profile_avatar_size));
+
+            if ((null != preview.getRequestedURL()) && (null != preview.getTitle())) {
+                mTitleTextView.setText(Html.fromHtml("<a href=\"" + preview.getRequestedURL() + "\">" + preview.getTitle() + "</a>"));
+            } else if (null != preview.getTitle()) {
+                mTitleTextView.setText(preview.getTitle());
+            } else {
+                mTitleTextView.setText(preview.getRequestedURL());
+            }
+            mTitleTextView.setMovementMethod(LinkMovementMethod.getInstance());
+
+            mDescriptionTextView.setText(preview.getDescription());
+
+            mUID = uid;
+        }
+    }
+}
diff --git a/vector/src/main/java/im/vector/view/VectorCircularImageView.java b/vector/src/main/java/im/vector/view/VectorCircularImageView.java
index bab1adfd3f..61115c89ea 100755
--- a/vector/src/main/java/im/vector/view/VectorCircularImageView.java
+++ b/vector/src/main/java/im/vector/view/VectorCircularImageView.java
@@ -90,6 +90,15 @@ protected int sizeOf(String key, RoundedBitmapDrawable drawable) {
 
     private static Map<String, ArrayList<Pair<Object, VectorCircularImageView>>> mPendingConversion = new HashMap<>();
 
+    /**
+     * Update the image drawable with the rounded bitmap.
+     *
+     * @param cachedDrawable the bitmap drawable.
+     */
+    protected void setCircularImageDrawable(final RoundedBitmapDrawable cachedDrawable) {
+        super.setImageDrawable(cachedDrawable);
+    }
+
     /**
      * Update the bitmap.
      * The bitmap is first squared before adding corners
@@ -108,7 +117,7 @@ public void setImageBitmap(final Bitmap bm) {
             // Create a RoundedBitmapDrawable might be slow
             RoundedBitmapDrawable cachedDrawable = mCache.get(key);
             if (null != cachedDrawable) {
-                super.setImageDrawable(cachedDrawable);
+                setCircularImageDrawable(cachedDrawable);
                 return;
             }
 
@@ -182,7 +191,7 @@ public void run() {
                                 for (Pair<Object, VectorCircularImageView> pair : pairs) {
                                     // update only if the tag is the same
                                     if (pair.second.getTag() == pair.first) {
-                                        pair.second.setImageDrawable(drawable);
+                                        pair.second.setCircularImageDrawable(drawable);
                                     }
                                 }
                             }
diff --git a/vector/src/main/java/im/vector/widgets/WidgetContent.java b/vector/src/main/java/im/vector/widgets/WidgetContent.java
index df74f76a70..a02d07bc84 100755
--- a/vector/src/main/java/im/vector/widgets/WidgetContent.java
+++ b/vector/src/main/java/im/vector/widgets/WidgetContent.java
@@ -17,11 +17,11 @@
 package im.vector.widgets;
 
 import android.text.TextUtils;
-import android.util.Log;
 
 import com.google.gson.JsonElement;
 
 import org.matrix.androidsdk.util.JsonUtils;
+import org.matrix.androidsdk.util.Log;
 
 import java.io.Serializable;
 import java.util.Map;
diff --git a/vector/src/main/java/im/vector/widgets/WidgetsManager.java b/vector/src/main/java/im/vector/widgets/WidgetsManager.java
index 9aed217a77..4558373ee6 100755
--- a/vector/src/main/java/im/vector/widgets/WidgetsManager.java
+++ b/vector/src/main/java/im/vector/widgets/WidgetsManager.java
@@ -333,7 +333,7 @@ public void createJitsiWidget(MXSession session, Room room, boolean withVideo, f
             widgetSessionId = widgetSessionId.substring(0, 7);
         }
         String roomId = room.getRoomId();
-        String confId = roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.toLowerCase();
+        String confId = roomId.substring(1, roomId.indexOf(":") - 1) + widgetSessionId.toLowerCase(VectorApp.getApplicationLocale());
 
         // TODO: This url may come from scalar API
         // Note: this url can be used as is inside a web container (like iframe for Riot-web)
diff --git a/vector/src/main/res/drawable-hdpi/ic_people_black_24dp.png b/vector/src/main/res/drawable-hdpi/ic_people_black_24dp.png
deleted file mode 100644
index 078216628d..0000000000
Binary files a/vector/src/main/res/drawable-hdpi/ic_people_black_24dp.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-mdpi/ic_people_black_24dp.png b/vector/src/main/res/drawable-mdpi/ic_people_black_24dp.png
deleted file mode 100644
index e2600a4d93..0000000000
Binary files a/vector/src/main/res/drawable-mdpi/ic_people_black_24dp.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xhdpi/ic_people_black_24dp.png b/vector/src/main/res/drawable-xhdpi/ic_people_black_24dp.png
deleted file mode 100644
index c2e9ffea1d..0000000000
Binary files a/vector/src/main/res/drawable-xhdpi/ic_people_black_24dp.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_people_black_24dp.png b/vector/src/main/res/drawable-xxhdpi/ic_people_black_24dp.png
deleted file mode 100644
index 5a8b5d05e2..0000000000
Binary files a/vector/src/main/res/drawable-xxhdpi/ic_people_black_24dp.png and /dev/null differ
diff --git a/vector/src/main/res/drawable-xxhdpi/ic_power_settings.png b/vector/src/main/res/drawable-xxhdpi/ic_power_settings.png
new file mode 100644
index 0000000000..d206fa435a
Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/ic_power_settings.png differ
diff --git a/vector/src/main/res/drawable-xxhdpi/riot_tab_groups.png b/vector/src/main/res/drawable-xxhdpi/riot_tab_groups.png
new file mode 100644
index 0000000000..7dc4232ae3
Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/riot_tab_groups.png differ
diff --git a/vector/src/main/res/drawable-xxhdpi/riot_tab_rooms.png b/vector/src/main/res/drawable-xxhdpi/riot_tab_rooms.png
new file mode 100644
index 0000000000..4f3b8cfb41
Binary files /dev/null and b/vector/src/main/res/drawable-xxhdpi/riot_tab_rooms.png differ
diff --git a/vector/src/main/res/drawable-xxxhdpi/ic_people_black_24dp.png b/vector/src/main/res/drawable-xxxhdpi/ic_people_black_24dp.png
deleted file mode 100644
index 2994e7caa6..0000000000
Binary files a/vector/src/main/res/drawable-xxxhdpi/ic_people_black_24dp.png and /dev/null differ
diff --git a/vector/src/main/res/drawable/vector_tabbar_background_group_light.xml b/vector/src/main/res/drawable/vector_tabbar_background_group_light.xml
new file mode 100644
index 0000000000..ba8904ad99
--- /dev/null
+++ b/vector/src/main/res/drawable/vector_tabbar_background_group_light.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <!-- Non focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="false" android:state_pressed="false" android:state_selected="false"/>
+    <item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="false" android:state_pressed="false" android:state_selected="true"/>
+
+    <!-- Focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="true" android:state_pressed="false" android:state_selected="false"/>
+    <item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="true" android:state_pressed="false" android:state_selected="true"/>
+
+    <!-- Pressed -->
+    <!-- Non focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="false" android:state_pressed="true" android:state_selected="false"/>
+    <item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="false" android:state_pressed="true" android:state_selected="true"/>
+
+    <!-- Focused states -->
+    <item android:drawable="@drawable/vector_tabbar_unselected_background_group_light" android:state_focused="true" android:state_pressed="true" android:state_selected="false"/>
+    <item android:drawable="@drawable/vector_tabbar_selected_background_group_light" android:state_focused="true" android:state_pressed="true" android:state_selected="true"/>
+
+</selector>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_selected_background_group_light.xml b/vector/src/main/res/drawable/vector_tabbar_selected_background_group_light.xml
new file mode 100644
index 0000000000..8db718af96
--- /dev/null
+++ b/vector/src/main/res/drawable/vector_tabbar_selected_background_group_light.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/list_divider_color_light" />
+            <padding android:bottom="1dp" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@android:color/white" />
+            <padding android:bottom="2dp" />
+        </shape>
+    </item>
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/tab_groups" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/drawable/vector_tabbar_unselected_background_group_light.xml b/vector/src/main/res/drawable/vector_tabbar_unselected_background_group_light.xml
new file mode 100644
index 0000000000..4f594ea72c
--- /dev/null
+++ b/vector/src/main/res/drawable/vector_tabbar_unselected_background_group_light.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle" >
+            <solid android:color="@color/tab_groups"/>
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_lock_screen.xml b/vector/src/main/res/layout/activity_lock_screen.xml
index 164afdcf7b..36b81490ce 100644
--- a/vector/src/main/res/layout/activity_lock_screen.xml
+++ b/vector/src/main/res/layout/activity_lock_screen.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/lock_main_layout"
     android:layout_width="200dp"
     android:layout_height="wrap_content"
diff --git a/vector/src/main/res/layout/activity_vector_group_details.xml b/vector/src/main/res/layout/activity_vector_group_details.xml
new file mode 100644
index 0000000000..2535730453
--- /dev/null
+++ b/vector/src/main/res/layout/activity_vector_group_details.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="match_parent">
+
+        <android.support.design.widget.TabLayout
+            android:id="@+id/group_tabs"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_alignParentStart="true"
+            android:layout_below="@+id/group_loading_layout"
+            android:layout_gravity="top" />
+
+        <ProgressBar
+            android:id="@+id/group_sync_in_progress"
+            style="@style/Widget.AppCompat.ProgressBar.Horizontal"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/group_tabs"
+            android:background="@android:color/transparent"
+            android:indeterminate="true"
+            android:indeterminateTint="@color/tab_groups_secondary"
+            android:visibility="visible" />
+        
+        <im.vector.view.RiotViewPager
+            android:id="@+id/groups_pager"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:layout_below="@+id/group_sync_in_progress" />
+
+        <!-- progress bar -->
+        <FrameLayout
+            android:id="@+id/group_loading_layout"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
+            android:background="?attr/waiting_background_color"
+            android:visibility="gone">
+
+            <ProgressBar
+                android:id="@+id/loading_settings_progress_bar"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_gravity="center"
+                android:visibility="visible" />
+        </FrameLayout>
+    </RelativeLayout>
+
+</FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/activity_vector_registration_captcha.xml b/vector/src/main/res/layout/activity_vector_registration_captcha.xml
index c8b6c97ce5..3e665f1e1e 100644
--- a/vector/src/main/res/layout/activity_vector_registration_captcha.xml
+++ b/vector/src/main/res/layout/activity_vector_registration_captcha.xml
@@ -2,41 +2,58 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
     <RelativeLayout
         android:id="@+id/captcha_logo_layout"
-        android:layout_marginTop="30dp"
-        android:layout_marginBottom="27dp"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="27dp"
+        android:layout_marginTop="30dp">
+
         <ImageView
             android:id="@+id/login_large_logo"
             android:layout_width="100dp"
             android:layout_height="100dp"
 
             android:layout_centerHorizontal="true"
-            android:src="@drawable/logo_login">
-        </ImageView>
+            android:src="@drawable/logo_login"></ImageView>
     </RelativeLayout>
 
     <TextView
         android:id="@+id/account_creation_message"
-        android:layout_below="@id/captcha_logo_layout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textSize="16sp"
+        android:layout_below="@id/captcha_logo_layout"
         android:layout_marginBottom="10dp"
         android:layout_marginLeft="16dp"
         android:layout_marginRight="16dp"
-        android:text="@string/auth_recaptcha_message" />
+        android:text="@string/auth_recaptcha_message"
+        android:textSize="16sp" />
 
-	<WebView
+    <WebView
         android:id="@+id/account_creation_webview"
-	    android:layout_alignParentBottom="true"
-        android:layout_below="@id/account_creation_message"
         android:layout_width="match_parent"
-	    android:layout_height="0dp"
+        android:layout_height="0dp"
+        android:layout_alignParentBottom="true"
+        android:layout_alignParentEnd="true"
+        android:layout_alignParentRight="true"
+        android:layout_below="@id/account_creation_message"
         android:background="#000" />
 
+    <RelativeLayout
+        android:id="@+id/account_creation_webview_loading"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_alignBottom="@id/account_creation_webview"
+        android:layout_below="@id/account_creation_message"
+        android:background="@android:color/transparent">
+
+        <ProgressBar
+            android:layout_width="60dp"
+            android:layout_height="60dp"
+            android:layout_centerInParent="true"
+            android:indeterminate="true" />
+    </RelativeLayout>
+
 </RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/adapter_item_circular_room_view.xml b/vector/src/main/res/layout/adapter_item_circular_room_view.xml
old mode 100644
new mode 100755
diff --git a/vector/src/main/res/layout/adapter_item_group_invite.xml b/vector/src/main/res/layout/adapter_item_group_invite.xml
new file mode 100644
index 0000000000..ac39a98548
--- /dev/null
+++ b/vector/src/main/res/layout/adapter_item_group_invite.xml
@@ -0,0 +1,105 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/invite_view"
+    android:layout_width="match_parent"
+    android:layout_height="130dp"
+    android:paddingRight="16dp">
+
+    <RelativeLayout
+        android:id="@+id/group_desc"
+        android:layout_width="match_parent"
+        android:layout_height="74dp">
+
+        <im.vector.view.VectorCircularImageView
+            android:id="@+id/room_avatar"
+            android:layout_width="@dimen/chat_avatar_size"
+            android:layout_height="@dimen/chat_avatar_size"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="16dp"
+            tools:src="#22000000" />
+
+        <RelativeLayout
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_marginLeft="16dp"
+            android:layout_marginRight="6dp"
+            android:layout_toRightOf="@+id/room_avatar">
+
+            <TextView
+                android:id="@+id/group_name"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_toLeftOf="@+id/group_members_count"
+                android:ellipsize="end"
+                android:fontFamily="sans-serif-regular"
+                android:maxLines="1"
+                android:textColor="?attr/riot_primary_text_color"
+                android:textSize="16sp"
+                tools:text="Room name a bit long to be displayed completely" />
+
+            <TextView
+                android:id="@+id/group_topic"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignRight="@+id/group_name"
+                android:layout_below="@+id/group_name"
+                android:ellipsize="end"
+                android:maxLines="1"
+                android:textColor="?attr/default_text_light_color"
+                android:textSize="14sp"
+                tools:text="First message of the room is a bit too long to be displayed" />
+
+            <!-- unread count badge -->
+            <TextView
+                android:id="@+id/group_members_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignBaseline="@+id/group_name"
+                android:layout_alignParentRight="true"
+                android:layout_marginLeft="6dp"
+                android:gravity="center"
+                android:minWidth="25dp"
+                android:textColor="@android:color/white"
+                android:textSize="12sp"
+                tools:background="#AAff00ff"
+                tools:text="12" />
+
+
+        </RelativeLayout>
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/group_desc"
+        android:layout_centerHorizontal="true"
+        android:layout_marginBottom="20dp"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/group_invite_reject_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:background="@color/vector_green_color"
+            android:fontFamily="sans-serif-medium"
+            android:minWidth="100dp"
+            android:text="@string/reject"
+            android:textColor="@android:color/white"
+            android:textSize="14sp" />
+
+        <Button
+            android:id="@+id/group_invite_join_button"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="16dp"
+            android:background="@color/vector_green_color"
+            android:fontFamily="sans-serif-medium"
+            android:minWidth="100dp"
+            android:text="@string/join"
+            android:textColor="@android:color/white"
+            android:textSize="14sp" />
+    </LinearLayout>
+</RelativeLayout>
diff --git a/vector/src/main/res/layout/adapter_item_group_user_room_view.xml b/vector/src/main/res/layout/adapter_item_group_user_room_view.xml
new file mode 100644
index 0000000000..2414f77952
--- /dev/null
+++ b/vector/src/main/res/layout/adapter_item_group_user_room_view.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/contact_view"
+    android:layout_width="match_parent"
+    android:layout_height="74dp"
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp">
+
+    <include
+        android:id="@+id/contact_avatar_layout"
+        layout="@layout/adapter_item_circular_avatar_contact_view"
+        android:layout_width="@dimen/chat_avatar_size"
+        android:layout_height="@dimen/chat_avatar_size"
+        android:layout_centerVertical="true" />
+
+    <ImageView
+        android:id="@+id/contact_badge"
+        android:layout_width="20dp"
+        android:layout_height="20dp"
+        android:layout_alignRight="@+id/contact_avatar_layout"
+        android:layout_alignTop="@+id/contact_avatar_layout"
+        android:layout_marginRight="-7dp"
+        android:layout_marginTop="-7dp"
+        android:src="@drawable/logo"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:layout_toRightOf="@+id/contact_avatar_layout"
+        android:orientation="vertical">
+
+        <TextView
+            android:id="@+id/contact_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:textColor="?attr/default_text_dark_color"
+            android:textSize="16sp"
+            android:textStyle="bold"
+            tools:text="A member name" />
+
+        <TextView
+            android:id="@+id/contact_desc"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:maxLines="1"
+            android:textColor="?attr/default_text_light_color"
+            android:textSize="14sp"
+            tools:text="A member status" />
+
+    </LinearLayout>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/adapter_item_group_view.xml b/vector/src/main/res/layout/adapter_item_group_view.xml
new file mode 100644
index 0000000000..f8e22e3e28
--- /dev/null
+++ b/vector/src/main/res/layout/adapter_item_group_view.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/room_view"
+    android:layout_width="match_parent"
+    android:layout_height="74dp">
+
+    <!-- Vertical bar with colour changing to indicate unread messages -->
+    <View
+        android:id="@+id/left_margin"
+        android:layout_width="8dp"
+        android:layout_height="match_parent"
+        android:layout_marginRight="8dp"
+        android:background="@android:color/transparent" />
+
+    <include
+        android:id="@+id/room_avatar_layout"
+        layout="@layout/adapter_item_circular_avatar_room_view"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_centerInParent="true"
+        android:layout_toRightOf="@+id/left_margin" />
+
+    <RelativeLayout
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="16dp"
+        android:layout_toRightOf="@+id/room_avatar_layout"
+        android:paddingRight="16dp">
+
+        <TextView
+            android:id="@+id/group_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@+id/group_members_count"
+            android:ellipsize="end"
+            android:fontFamily="sans-serif-regular"
+            android:maxLines="1"
+            android:textColor="?attr/riot_primary_text_color"
+            android:textSize="16sp"
+            tools:text="Room name a bit long to be displayed completely" />
+
+        <TextView
+            android:id="@+id/group_topic"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/group_name"
+            android:layout_marginTop="3dp"
+            android:ellipsize="end"
+            android:maxLines="1"
+            android:textColor="?attr/default_text_light_color"
+            android:textSize="14sp"
+            tools:text="First message of the room is a bit too long to be displayed" />
+
+        <ImageView
+            android:id="@+id/group_more_action_ic"
+            android:layout_width="15dp"
+            android:layout_height="15dp"
+            android:layout_alignBottom="@+id/group_name"
+            android:layout_alignParentRight="true"
+            android:layout_alignTop="@+id/group_name"
+            android:layout_marginLeft="10dp"
+            android:src="@drawable/vector_actions_9b"
+            android:visibility="visible" />
+
+        <!-- unread count badge -->
+        <TextView
+            android:id="@+id/group_members_count"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignBaseline="@+id/group_name"
+            android:layout_marginLeft="6dp"
+            android:layout_marginRight="5dp"
+            android:layout_toLeftOf="@+id/group_more_action_ic"
+            android:gravity="center"
+            android:minWidth="25dp"
+            android:paddingLeft="4dp"
+            android:paddingRight="4dp"
+            android:textColor="@android:color/white"
+            android:textSize="12sp"
+            tools:background="#AAff00ff"
+            tools:text="3.6K" />
+    </RelativeLayout>
+
+    <View
+        android:id="@+id/group_more_action_anchor"
+        android:layout_width="1dp"
+        android:layout_height="1dp"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="20dp" />
+
+    <View
+        android:id="@+id/group_more_action_click_area"
+        android:layout_width="40dp"
+        android:layout_height="match_parent"
+        android:layout_alignParentRight="true" />
+
+</RelativeLayout>
diff --git a/vector/src/main/res/layout/adapter_item_room_invite.xml b/vector/src/main/res/layout/adapter_item_room_invite.xml
index 397f399a83..40203bdfde 100644
--- a/vector/src/main/res/layout/adapter_item_room_invite.xml
+++ b/vector/src/main/res/layout/adapter_item_room_invite.xml
@@ -17,7 +17,6 @@
             android:layout_height="@dimen/chat_avatar_size"
             android:layout_centerVertical="true"
             android:layout_marginLeft="16dp"
-            android:layout_toRightOf="@+id/indicator_unread_message"
             tools:src="#22000000" />
 
         <ImageView
diff --git a/vector/src/main/res/layout/adapter_item_vector_message_code.xml b/vector/src/main/res/layout/adapter_item_vector_message_code.xml
new file mode 100644
index 0000000000..ee7665cd77
--- /dev/null
+++ b/vector/src/main/res/layout/adapter_item_vector_message_code.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <include
+        layout="@layout/vector_message_header"
+        android:visibility="gone" />
+
+    <LinearLayout
+        android:id="@+id/messagesAdapter_body_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="16dp"
+        android:layout_marginRight="16dp"
+        android:orientation="horizontal">
+
+        <include
+            android:id="@+id/messagesAdapter_roundAvatar"
+            layout="@layout/vector_room_round_avatar" />
+
+        <View
+            android:id="@+id/messagesAdapter_highlight_message_marker"
+            android:layout_width="6dp"
+            android:layout_height="match_parent"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="5dp"
+            android:background="#f00" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_vertical"
+            android:layout_weight="1"
+            android:orientation="vertical"
+            android:paddingBottom="5dp">
+
+            <RelativeLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content">
+
+                <LinearLayout
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_toLeftOf="@+id/message_timestamp_layout"
+                    android:orientation="horizontal">
+
+                    <include layout="@layout/vector_message_sender" />
+                </LinearLayout>
+
+                <LinearLayout
+                    android:id="@+id/message_timestamp_layout"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:orientation="horizontal">
+
+                    <include layout="@layout/vector_message_timestamp" />
+                </LinearLayout>
+            </RelativeLayout>
+
+            <LinearLayout
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:orientation="horizontal">
+
+                <FrameLayout
+                    android:id="@+id/messagesAdapter_body_layout"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_weight="1"
+                    android:paddingRight="4dp">
+
+                    <!-- the body is here -->
+                    <RelativeLayout
+                        android:id="@+id/messagesAdapter_text_layout"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_gravity="left">
+
+                        <ImageView
+                            android:id="@+id/message_adapter_e2e_icon"
+                            android:layout_width="14dp"
+                            android:layout_height="14dp"
+                            android:src="@drawable/e2e_verified" />
+
+                        <LinearLayout
+                            android:id="@+id/messages_container"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:orientation="vertical"
+                            android:layout_gravity="left"
+                            android:layout_marginLeft="4dp"
+                            android:layout_toRightOf="@id/message_adapter_e2e_icon"
+                            />
+                    </RelativeLayout>
+
+                </FrameLayout>
+            </LinearLayout>
+        </LinearLayout>
+    </LinearLayout>
+
+    <include
+        android:id="@+id/messagesAdapter_avatars_list"
+        layout="@layout/vector_message_receipts_list" />
+
+    <include layout="@layout/message_separator" />
+
+    <include layout="@layout/message_read_marker" />
+
+</LinearLayout>
diff --git a/vector/src/main/res/layout/adapter_item_vector_message_code_block.xml b/vector/src/main/res/layout/adapter_item_vector_message_code_block.xml
new file mode 100644
index 0000000000..72c18f065a
--- /dev/null
+++ b/vector/src/main/res/layout/adapter_item_vector_message_code_block.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/messagesAdapter_body_hsv"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content">
+
+    <im.vector.view.CodeBlockNestedScrollView
+        android:id="@+id/messagesAdapter_code_scroll_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:fadeScrollbars="false"
+        android:scrollbars="vertical|horizontal">
+
+        <HorizontalScrollView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
+
+            <TextView
+                android:id="@+id/messagesAdapter_body"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:autoLink="none"
+                android:fontFamily="monospace"
+                android:text="A body"
+                android:textSize="14sp" />
+
+        </HorizontalScrollView>
+
+    </im.vector.view.CodeBlockNestedScrollView>
+</FrameLayout>
diff --git a/vector/src/main/res/layout/adapter_item_vector_message_code_text.xml b/vector/src/main/res/layout/adapter_item_vector_message_code_text.xml
new file mode 100644
index 0000000000..dac630b074
--- /dev/null
+++ b/vector/src/main/res/layout/adapter_item_vector_message_code_text.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/messagesAdapter_body"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_gravity="left"
+    android:layout_marginLeft="4dp"
+    android:autoLink="all"
+    android:text="A body"
+    android:textIsSelectable="false"
+    android:textSize="14sp" />
diff --git a/vector/src/main/res/layout/adapter_item_vector_message_merge.xml b/vector/src/main/res/layout/adapter_item_vector_message_merge.xml
index 0b95087fb7..41905e293b 100644
--- a/vector/src/main/res/layout/adapter_item_vector_message_merge.xml
+++ b/vector/src/main/res/layout/adapter_item_vector_message_merge.xml
@@ -60,7 +60,6 @@
                 android:id="@+id/messagesAdapter_merge_summary"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_centerVertical="true"
                 android:text="A message here"
                 android:textIsSelectable="false"
                 android:textSize="14sp" />
diff --git a/vector/src/main/res/layout/adapter_item_vector_message_text_emote_notice.xml b/vector/src/main/res/layout/adapter_item_vector_message_text_emote_notice.xml
index a1b345f0b1..5aaae77d5c 100644
--- a/vector/src/main/res/layout/adapter_item_vector_message_text_emote_notice.xml
+++ b/vector/src/main/res/layout/adapter_item_vector_message_text_emote_notice.xml
@@ -112,4 +112,11 @@
 
     <include layout="@layout/message_read_marker" />
 
+    <LinearLayout
+        android:id="@+id/messagesAdapter_urls_preview_list"
+        android:layout_width="match_parent"
+        android:orientation="vertical"
+        android:layout_height="wrap_content">
+    </LinearLayout>
+
 </LinearLayout>
diff --git a/vector/src/main/res/layout/adapter_vector_medias_viewer.xml b/vector/src/main/res/layout/adapter_vector_medias_viewer.xml
index 87a6ec32e4..cf323861ec 100644
--- a/vector/src/main/res/layout/adapter_vector_medias_viewer.xml
+++ b/vector/src/main/res/layout/adapter_vector_medias_viewer.xml
@@ -42,4 +42,10 @@
         android:alpha="0.2"
         android:layout_width="160dp"
         android:layout_height="160dp"/>
+
+    <ImageView
+        android:id="@+id/media_download_failed"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@android:drawable/ic_menu_gallery"/>
 </RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/dialog_create_group.xml b/vector/src/main/res/layout/dialog_create_group.xml
new file mode 100644
index 0000000000..6c7a34004c
--- /dev/null
+++ b/vector/src/main/res/layout/dialog_create_group.xml
@@ -0,0 +1,62 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:text="@string/community_name" />
+
+    <EditText
+        android:id="@+id/community_name_edit_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:hint="@string/community_name_hint"
+        android:textColor="?attr/riot_primary_text_color"
+        android:textColorHint="?attr/default_text_hint_color" />
+
+    <TextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp"
+        android:text="@string/community_id" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="10dp">
+
+        <TextView
+            android:id="@+id/community_plus_text_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:background="@color/vector_silver_color"
+            android:text="+"
+            android:textSize="18sp" />
+
+        <TextView
+            android:id="@+id/community_hs_name_text_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_centerVertical="true"
+            android:background="@color/vector_silver_color"
+            android:text=":a_server_name.org"
+            android:textSize="18sp" />
+
+        <EditText
+            android:id="@+id/community_id_edit_text"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toLeftOf="@+id/community_hs_name_text_view"
+            android:layout_toRightOf="@+id/community_plus_text_view"
+            android:hint="@string/community_id_hint"
+            android:textColor="?attr/riot_primary_text_color"
+            android:textColorHint="?attr/default_text_hint_color" />
+    </RelativeLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_dialog_groups_list.xml b/vector/src/main/res/layout/fragment_dialog_groups_list.xml
new file mode 100644
index 0000000000..76abb033ca
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_dialog_groups_list.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <ListView
+        android:id="@+id/listView_groups"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent" />
+</FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_group_details_home.xml b/vector/src/main/res/layout/fragment_group_details_home.xml
new file mode 100644
index 0000000000..ee65cd110b
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_group_details_home.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="10dp">
+
+        <im.vector.view.VectorCircularImageView
+            android:id="@+id/group_avatar"
+            android:layout_width="@dimen/chat_avatar_size"
+            android:layout_height="@dimen/chat_avatar_size"
+            tools:background="#f00" />
+
+        <RelativeLayout
+            android:id="@+id/group_details_group_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="10dp"
+            android:layout_toRightOf="@+id/group_avatar">
+
+            <TextView
+                android:id="@+id/group_name_text_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:maxLines="3"
+                android:textSize="18sp"
+                android:textStyle="bold"
+                tools:background="#0f0"
+                tools:text="The group name" />
+
+            <TextView
+                android:id="@+id/group_topic_text_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/group_name_text_view"
+                android:maxLines="5"
+                android:textSize="14sp"
+                tools:background="#00f"
+                tools:text="The group topic" />
+
+            <LinearLayout
+                android:id="@+id/group_members_rooms_view"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_below="@+id/group_topic_text_view"
+                android:layout_marginTop="10dp"
+                android:orientation="horizontal"
+                tools:background="#f00">
+
+                <ImageView
+                    android:id="@+id/group_members_icon_view"
+                    android:layout_width="12dp"
+                    android:layout_height="12dp"
+                    android:layout_gravity="center"
+                    android:src="@drawable/riot_tab_groups" />
+
+                <TextView
+                    android:id="@+id/group_members_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:textSize="12sp"
+                    tools:text="33 members" />
+
+                <ImageView
+                    android:id="@+id/group_rooms_icon_view"
+                    android:layout_width="12dp"
+                    android:layout_height="12dp"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="10dp"
+                    android:src="@drawable/riot_tab_rooms" />
+
+                <TextView
+                    android:id="@+id/group_rooms_text_view"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center"
+                    android:layout_marginLeft="5dp"
+                    android:textSize="12sp"
+                    tools:text="33 rooms" />
+            </LinearLayout>
+        </RelativeLayout>
+    </RelativeLayout>
+
+    <View
+        android:layout_width="wrap_content"
+        android:layout_height="1dp"
+        android:background="@color/vector_silver_color" />
+
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="10dp">
+
+        <TextView
+            android:id="@+id/html_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            tools:text="an HTML text here" />
+    </ScrollView>
+
+    <TextView
+        android:id="@+id/no_html_text_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp"
+        android:layout_marginLeft="20dp"
+        android:layout_marginRight="20dp"
+        android:layout_marginTop="10dp"
+        android:text="@string/group_no_long_description"
+        android:textColor="@color/vector_silver_color" />
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_group_details_people.xml b/vector/src/main/res/layout/fragment_group_details_people.xml
new file mode 100644
index 0000000000..cfd5849ca6
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_group_details_people.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.SearchView
+        android:id="@+id/search_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_group_details_rooms.xml b/vector/src/main/res/layout/fragment_group_details_rooms.xml
new file mode 100644
index 0000000000..cfd5849ca6
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_group_details_rooms.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
+
+    <android.support.v7.widget.SearchView
+        android:id="@+id/search_view"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <android.support.v7.widget.RecyclerView
+            android:id="@+id/recyclerview"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content" />
+    </RelativeLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/fragment_groups.xml b/vector/src/main/res/layout/fragment_groups.xml
new file mode 100644
index 0000000000..e3b960a1a0
--- /dev/null
+++ b/vector/src/main/res/layout/fragment_groups.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <android.support.v7.widget.RecyclerView
+        android:id="@+id/recyclerview"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
+</RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/item_room_directory.xml b/vector/src/main/res/layout/item_room_directory.xml
index 9e14d6341e..07cb8222b9 100644
--- a/vector/src/main/res/layout/item_room_directory.xml
+++ b/vector/src/main/res/layout/item_room_directory.xml
@@ -27,7 +27,6 @@
             android:id="@+id/room_directory_display_name"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
             android:ellipsize="end"
             android:maxLines="1"
             android:textSize="16sp"
@@ -38,7 +37,6 @@
             android:id="@+id/room_directory_description"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
             android:ellipsize="end"
             android:maxLines="1"
             android:textSize="14sp"
diff --git a/vector/src/main/res/layout/pill_view.xml b/vector/src/main/res/layout/pill_view.xml
index fd37aa2878..ed801a53f3 100644
--- a/vector/src/main/res/layout/pill_view.xml
+++ b/vector/src/main/res/layout/pill_view.xml
@@ -8,13 +8,20 @@
     android:layout_marginRight="3dp"
     android:orientation="horizontal">
 
+    <im.vector.view.PillImageView
+        android:id="@+id/pill_avatar_view"
+        android:layout_width="14sp"
+        android:layout_height="14sp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="5dp" />
+
     <TextView
         android:id="@+id/pill_text_view"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="10dp"
-        android:layout_marginRight="10dp"
+        android:layout_gravity="center_vertical"
+        android:layout_marginLeft="5dp"
+        android:layout_marginRight="5dp"
         android:text="A text"
         android:textSize="14sp" />
-
 </LinearLayout>
diff --git a/vector/src/main/res/layout/url_preview_view.xml b/vector/src/main/res/layout/url_preview_view.xml
new file mode 100644
index 0000000000..90ee0889a6
--- /dev/null
+++ b/vector/src/main/res/layout/url_preview_view.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/url_preview_layout"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:layout_marginLeft="76dp"
+    android:layout_marginRight="16dp"
+    android:orientation="horizontal">
+
+    <View
+        android:layout_width="5dp"
+        android:layout_height="match_parent"
+        android:layout_marginLeft="0dp"
+        android:background="@color/vector_silver_color" />
+
+    <RelativeLayout
+        android:id="@+id/url_preview_content_layout"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_weight="1">
+
+        <ImageView
+            android:id="@+id/url_preview_image_view"
+            android:layout_width="50dp"
+            android:layout_height="50dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginRight="10dp" />
+
+        <TextView
+            android:id="@+id/url_preview_title_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_toRightOf="@+id/url_preview_image_view"
+            android:maxLines="2"
+            android:text="a title"
+            android:linksClickable="true"
+            android:textSize="14sp" />
+
+        <TextView
+            android:id="@+id/url_preview_description_text_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_below="@+id/url_preview_title_text_view"
+            android:layout_toRightOf="@+id/url_preview_image_view"
+            android:maxLines="3"
+            android:text="a description"
+            android:textSize="14sp" />
+    </RelativeLayout>
+
+    <RelativeLayout
+        android:id="@+id/url_preview_hide_view"
+        android:layout_width="30dp"
+        android:layout_height="match_parent">
+
+        <ImageView
+            android:id="@+id/url_preview_hide_image_view"
+            android:layout_width="30dp"
+            android:layout_height="30sp"
+            android:src="@drawable/vector_clear_edittext_green" />
+    </RelativeLayout>
+</LinearLayout>
diff --git a/vector/src/main/res/layout/vector_incoming_call_dialog.xml b/vector/src/main/res/layout/vector_incoming_call_dialog.xml
deleted file mode 100644
index 9255bb374b..0000000000
--- a/vector/src/main/res/layout/vector_incoming_call_dialog.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="280dp"
-    android:layout_height="wrap_content"
-    android:background="?attr/riot_primary_background_color">
-
-    <RelativeLayout
-        android:id="@+id/incoming_call_avatar_container"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="25dp">
-
-        <include
-            android:id="@+id/room_avatar"
-            layout="@layout/vector_incoming_call_round_avatar"
-            android:layout_width="84dp"
-            android:layout_height="84dp" />
-    </RelativeLayout>
-
-    <!-- keep singleLine="true" because maxLines="1" truncation is not the expected one.-->
-    <TextView
-        android:id="@+id/room_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/incoming_call_avatar_container"
-        android:layout_centerHorizontal="true"
-        android:layout_marginLeft="8dp"
-        android:layout_marginRight="8dp"
-        android:layout_marginTop="14dp"
-        android:ellipsize="end"
-        android:gravity="center_horizontal"
-        android:singleLine="true"
-        android:text="Room name"
-        android:textColor="?attr/default_text_light_color"
-        android:textSize="20sp" />
-
-    <TextView
-        android:id="@+id/incoming_call_title"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_below="@id/room_name"
-        android:layout_centerHorizontal="true"
-        android:gravity="center_horizontal"
-        android:text="@string/incoming_call"
-        android:textColor="?attr/default_text_light_color"
-        android:textSize="14sp" />
-
-    <!-- this layout is used to compute the height of a single line -->
-    <!-- action_bar_header_invite_members needs it to have an icon with the same height as the text -->
-    <Button
-        android:id="@+id/button_incoming_call_accept"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
-        android:layout_below="@id/incoming_call_title"
-        android:layout_marginBottom="17dp"
-        android:layout_marginRight="16dp"
-        android:layout_marginTop="43dp"
-        android:background="?attr/riot_primary_background_color"
-        android:text="@string/action_accept"
-        android:textColor="?attr/default_button_light_text_color"
-        android:textSize="14sp"
-        android:textStyle="bold" />
-
-    <Button
-        android:id="@+id/button_incoming_call_ignore"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_alignTop="@+id/button_incoming_call_accept"
-        android:layout_below="@id/incoming_call_title"
-        android:layout_marginBottom="17dp"
-        android:layout_marginRight="24dp"
-        android:layout_toLeftOf="@+id/button_incoming_call_accept"
-        android:background="?attr/riot_primary_background_color"
-        android:text="@string/action_ignore"
-        android:textColor="?attr/default_button_light_text_color"
-        android:textSize="14sp"
-        android:textStyle="bold" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/vector_incoming_call_round_avatar.xml b/vector/src/main/res/layout/vector_incoming_call_round_avatar.xml
deleted file mode 100644
index aec2dad66b..0000000000
--- a/vector/src/main/res/layout/vector_incoming_call_round_avatar.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="40dp"
-    android:layout_height="40dp">
-
-    <!-- android:background="?attr/vector_green_color" -->
-    <ImageView
-        android:id="@+id/avatar_img"
-        android:background="@color/vector_green_color"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:scaleType="centerCrop"
-        android:adjustViewBounds="true"/>
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:src="?avatar_mask_white_stroke"/>
-
-</FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/vector_message_flair_groups_list.xml b/vector/src/main/res/layout/vector_message_flair_groups_list.xml
new file mode 100644
index 0000000000..3fa83dc155
--- /dev/null
+++ b/vector/src/main/res/layout/vector_message_flair_groups_list.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_weight="1"
+    android:layout_width="wrap_content"
+    android:layout_height="match_parent">
+
+    <LinearLayout
+        android:layout_centerVertical="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="6dp"
+        android:orientation="horizontal">
+
+        <include
+            android:id="@+id/message_avatar_group_1"
+            layout="@layout/vector_receipt_round_avatar" />
+
+        <include
+            android:id="@+id/message_avatar_group_2"
+            layout="@layout/vector_receipt_round_avatar" />
+
+
+        <include
+            android:id="@+id/message_avatar_group_3"
+            layout="@layout/vector_receipt_round_avatar" />
+
+        <TextView
+            android:id="@+id/message_more_than_expected"
+            android:layout_width="20dp"
+            android:layout_height="match_parent"
+            android:gravity="center"
+            android:text="+999"
+            android:textSize="9sp" />
+    </LinearLayout>
+</RelativeLayout>
diff --git a/vector/src/main/res/layout/vector_message_header.xml b/vector/src/main/res/layout/vector_message_header.xml
index 48cd6e7c3b..89e09f7ed6 100644
--- a/vector/src/main/res/layout/vector_message_header.xml
+++ b/vector/src/main/res/layout/vector_message_header.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/messagesAdapter_message_header"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:id="@+id/messagesAdapter_message_header">
-    
+    android:orientation="vertical">
+
     <View
         android:id="@+id/messagesAdapter_message_header_top_margin"
         android:layout_width="match_parent"
@@ -15,21 +15,21 @@
         android:layout_width="match_parent"
         android:layout_height="42dp"
         android:background="?attr/room_activity_divider_color">
+
         <TextView
             android:id="@+id/messagesAdapter_message_header_text"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_centerVertical="true"
             android:layout_marginLeft="18dp"
+            android:text="A message here"
             android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textStyle="bold"
             android:textColor="?attr/riot_primary_text_color"
-            android:text = "A message here" />
+            android:textStyle="bold" />
     </RelativeLayout>
 
     <View
         android:id="@+id/messagesAdapter_message_header_bottom_margin"
         android:layout_width="match_parent"
         android:layout_height="16dp" />
-
 </LinearLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/vector_message_sender.xml b/vector/src/main/res/layout/vector_message_sender.xml
index d3495bcb5a..787241f0b4 100644
--- a/vector/src/main/res/layout/vector_message_sender.xml
+++ b/vector/src/main/res/layout/vector_message_sender.xml
@@ -23,4 +23,8 @@
         android:textSize="14sp"
         android:textStyle="bold"
         tools:text="One very long sender name for testing purpose" />
+
+    <include
+        android:id="@+id/messagesAdapter_flair_groups_list"
+        layout="@layout/vector_message_flair_groups_list" />
 </merge>
\ No newline at end of file
diff --git a/vector/src/main/res/layout/vector_settings_round_group_avatar.xml b/vector/src/main/res/layout/vector_settings_round_group_avatar.xml
new file mode 100644
index 0000000000..015d269948
--- /dev/null
+++ b/vector/src/main/res/layout/vector_settings_round_group_avatar.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content">
+
+    <im.vector.view.VectorCircularImageView
+        android:id="@+id/avatar_img"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_marginRight="10dp"
+        android:scaleType="centerCrop"
+        android:adjustViewBounds="true"/>
+</FrameLayout>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/bottom_navigation_main.xml b/vector/src/main/res/menu/bottom_navigation_main.xml
index 9da28aaf3c..c4a3a65238 100644
--- a/vector/src/main/res/menu/bottom_navigation_main.xml
+++ b/vector/src/main/res/menu/bottom_navigation_main.xml
@@ -27,6 +27,13 @@
         android:contentDescription="@string/bottom_action_rooms"
         android:id="@+id/bottom_action_rooms"
         android:enabled="true"
-        android:icon="@drawable/ic_people_black_24dp"/>
+        android:icon="@drawable/riot_tab_rooms"/>
+
+    <item
+        android:title=""
+        android:contentDescription="@string/bottom_action_groups"
+        android:id="@+id/bottom_action_groups"
+        android:enabled="true"
+        android:icon="@drawable/riot_tab_groups"/>
 
 </menu>
diff --git a/vector/src/main/res/menu/vector_home_group_settings.xml b/vector/src/main/res/menu/vector_home_group_settings.xml
new file mode 100755
index 0000000000..e40c4b487f
--- /dev/null
+++ b/vector/src/main/res/menu/vector_home_group_settings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+    <item
+        android:id="@+id/ic_action_select_remove_group"
+        android:icon="@drawable/vector_leave_room_black"
+        android:title="@string/leave" />
+</menu>
\ No newline at end of file
diff --git a/vector/src/main/res/menu/vector_home_room_settings.xml b/vector/src/main/res/menu/vector_home_room_settings.xml
index 6dafba191b..2a1c282521 100755
--- a/vector/src/main/res/menu/vector_home_room_settings.xml
+++ b/vector/src/main/res/menu/vector_home_room_settings.xml
@@ -1,11 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
+
     <group android:id="@+id/active_room_actions">
+        <item
+            android:id="@+id/ic_action_notifications_noisy"
+            android:icon="@drawable/ic_material_done"
+            android:title="@string/room_settings_all_messages_noisy" />
+
+        <item
+            android:id="@+id/ic_action_notifications_all_message"
+            android:icon="@drawable/ic_material_done"
+            android:title="@string/room_settings_all_messages" />
+
+        <item
+            android:id="@+id/ic_action_notifications_mention_only"
+            android:icon="@drawable/ic_material_done"
+            android:title="@string/room_settings_mention_only"/>
 
         <item
-            android:id="@+id/ic_action_select_notifications"
+            android:id="@+id/ic_action_notifications_mute"
             android:icon="@drawable/ic_material_done"
-            android:title="@string/room_settings_notifications" />
+            android:title="@string/room_settings_mute" />
+
 
         <item
             android:id="@+id/ic_action_select_fav"
@@ -26,6 +42,13 @@
             android:id="@+id/ic_action_select_remove"
             android:icon="@drawable/vector_leave_room_black"
             android:title="@string/room_settings_leave_conversation" />
+
+    </group>
+
+    <group android:id="@+id/add_shortcut_actions">
+        <item
+            android:id="@+id/ic_action_add_homescreen_shortcut"
+            android:title="@string/room_settings_add_homescreen_shortcut" />
     </group>
 
     <group android:id="@+id/historical_room_actions">
diff --git a/vector/src/main/res/menu/vector_home_sliding_menu.xml b/vector/src/main/res/menu/vector_home_sliding_menu.xml
index e40cf58a6f..62d5d18e5a 100755
--- a/vector/src/main/res/menu/vector_home_sliding_menu.xml
+++ b/vector/src/main/res/menu/vector_home_sliding_menu.xml
@@ -17,6 +17,11 @@
             android:icon="@drawable/ic_material_bug_report"
             android:title="@string/send_bug_report"/>
 
+        <item
+            android:id="@+id/sliding_menu_exit"
+            android:icon="@drawable/ic_power_settings"
+            android:title="@string/action_exit"/>
+
         <item
             android:id="@+id/sliding_menu_sign_out"
             android:icon="@drawable/ic_material_exit_to_app"
diff --git a/vector/src/main/res/raw/message.ogg b/vector/src/main/res/raw/message.ogg
deleted file mode 100755
index adc74437d0..0000000000
Binary files a/vector/src/main/res/raw/message.ogg and /dev/null differ
diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml
new file mode 100644
index 0000000000..3f2ef80e55
--- /dev/null
+++ b/vector/src/main/res/values-ar/strings.xml
@@ -0,0 +1,479 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="resouces_language">ar</string>
+    <string name="light_theme">السمة الفاتحة</string>
+    <string name="dark_theme">السمة الداكنة</string>
+    <string name="black_them">السمة السوداء</string>
+
+    <string name="notification_sync_in_progress">يُزامن</string>
+    <string name="notification_listen_for_events">يستمع للأحداث</string>
+    <string name="title_activity_home">الرسائل</string>
+    <string name="title_activity_settings">الإعدادات</string>
+    <string name="title_activity_member_details">تفاصيل الأعضاء</string>
+    <string name="title_activity_historical">القديمة</string>
+    <string name="title_activity_bug_report">أبلِغ عن علة</string>
+
+    <string name="ok">حسنا</string>
+    <string name="cancel">ألغِ</string>
+    <string name="save">احفظ</string>
+    <string name="leave">اترك</string>
+    <string name="send">أرسِل</string>
+    <string name="copy">انسخ</string>
+    <string name="resend">أعِد الإرسال</string>
+    <string name="quote">اقتبس</string>
+    <string name="share">شارِك</string>
+    <string name="forward">مرّر</string>
+    <string name="permalink">رابط دائم</string>
+    <string name="view_source">اعرض المصدر</string>
+    <string name="view_decrypted_source">اعرض المصدر بلا تعمية</string>
+    <string name="delete">احذف</string>
+    <string name="rename">غيّر الاسم</string>
+    <string name="report_content">أبلِغ عن المحتوى</string>
+    <string name="active_call">مكالمة نشطة</string>
+    <string name="ongoing_conference_call">" مكالمة اجتماع جارية. انضم إليها بالصوت أو بالصورة."</string>
+    <string name="ongoing_conference_call_voice">بالصوت</string>
+    <string name="ongoing_conference_call_video">بالصورة</string>
+    <string name="cannot_start_call">تعذّر بدء المكالمة، رجاءً أعِد المحاولة لاحقا</string>
+    <string name="missing_permissions_warning">بعض التصاريح ناقصة، ستفقد بعض المزايا..</string>
+    <string name="missing_permissions_title_to_start_conf_call">تعذّر بدء المكالمة</string>
+    <string name="device_information">معلومات الجهاز</string>
+    <string name="room_no_conference_call_in_encrypted_rooms">مكالمات الاجتماعات ليست مدعومة في الغرفة المعمّاة</string>
+    <string name="send_anyway">أرسِل بأي حال</string>
+    <string name="action_sign_out">اخرج</string>
+    <string name="action_sign_out_confirmation">كنوع من الأمان، عند خروجك ستُحذف أية مفاتيح تعمية طرفين ما يجعل تأريخ الدردشة المعمّى السابق محال القراءة إن ولجت ثانيةً.
+اختر ”صدّر“ إن أردت نسخها احتياطيا قبل الخروج.</string>
+    <string name="action_voice_call">مكالمة صورية</string>
+    <string name="action_video_call">مكالمة صوتية</string>
+    <string name="action_global_search">بحث عمومي</string>
+    <string name="action_mark_all_as_read">علّمها كلّها كمقروءة</string>
+    <string name="action_open">افتح</string>
+    <string name="action_close">أغلِق</string>
+    <string name="copied_to_clipboard">نُسخ إلى الحافظة</string>
+    <string name="disable">عطّل</string>
+
+    <string name="dialog_title_confirmation">أكّد</string>
+    <string name="dialog_title_warning">تحذير</string>
+
+    <string name="bottom_action_home">الرئيسيّة</string>
+    <string name="bottom_action_favourites">المفضلة</string>
+    <string name="bottom_action_rooms">الغرف</string>
+
+    <string name="invitations_header">الدعوات</string>
+    <string name="direct_chats_header">المحادثات</string>
+    <string name="local_address_book_header">دفتر العناوين المحلي</string>
+    <string name="matrix_only_filter">متراسلو «ماترِكس» فقط</string>
+    <string name="no_conversation_placeholder">لا محادثات</string>
+    <string name="no_contact_access_placeholder">لم تسمح لِ‍ Riot بمطالعة متراسليك المحليين</string>
+    <string name="no_result_placeholder">لا نتائج</string>
+
+    <string name="rooms_header">الغرف</string>
+    <string name="rooms_directory_header">دليل الغرف</string>
+    <string name="no_room_placeholder">لا غرف</string>
+    <string name="no_public_room_placeholder">لا غرف عمومية متوفرة</string>
+    <plurals name="public_room_nb_users">
+	<item quantity="zero">لا مستخدمين</item>
+	<item quantity="one">مستخدم واحد</item>
+	<item quantity="two">مستخدمان</item>
+	<item quantity="few">%d مستخدمين</item>
+	<item quantity="many">%d مستخدما</item>
+	<item quantity="other">%d مستخدم</item>
+</plurals>
+
+    <string name="send_bug_report_include_logs">أرسِل السجلات</string>
+    <string name="send_bug_report_include_crash_logs">أرسِل سجلات الانهيار</string>
+    <string name="send_bug_report_include_screenshot">أرسِل لقطة شاشة</string>
+    <string name="send_bug_report_description">رجاءً صِف المشكلة. ما الذي فعله؟ ما الذي توقعت حدوثه؟ ما الذي حدث؟</string>
+    <string name="send_bug_report_placeholder">صِف المشكلة هنا</string>
+    <string name="send_bug_report_logs_description">لنقدر على تحليل المشاكل، ستُرسل السجلات من هذا العميل مع بلاغ العلة هذا. إن أردت إرسال النص أعلاه فقط، رجاءً أزل تأشير:</string>
+    <string name="send_bug_report_app_crashed">انهار التطبيق في آخر مرة. أتريد إرسال بلاغ انهيار؟</string>
+
+    <string name="send_bug_report_sent">أُرسل بلاغ العلة بنجاح</string>
+    <string name="send_bug_report_failed">فشل إرسال بلاغ العلة (%s)</string>
+    <string name="username">اسم المستخدم</string>
+    <string name="create_account">سجّل</string>
+    <string name="login">لِج</string>
+    <string name="logout">اخرج</string>
+    <string name="start_new_chat">ابدأ دردشة جديدة</string>
+    <string name="start_voice_call">ابدأ مكالمة صوتية</string>
+    <string name="start_video_call">ابدأ مكالمة صورية</string>
+
+    <string name="option_send_files">أرسِل ملفات</string>
+    <string name="option_take_photo_video">خُذ صورة أو ڤديو</string>
+    <string name="option_take_photo">خُذ صورة</string>
+    <string name="option_take_video">خُذ ڤديو</string>
+
+    <string name="auth_login">لِج</string>
+    <string name="auth_register">سجّل</string>
+    <string name="auth_submit">أرسِل</string>
+    <string name="auth_skip">تخطَّ</string>
+    <string name="auth_send_reset_email">أرسِل بريد التصفير</string>
+    <string name="auth_return_to_login">عُد إلى شاشة الولوج</string>
+    <string name="auth_user_id_placeholder">البريد الإلكتروني أو اسم المستخدم</string>
+    <string name="auth_password_placeholder">كلمة السر</string>
+    <string name="auth_new_password_placeholder">كلمة السر الجديدة</string>
+    <string name="auth_user_name_placeholder">اسم المستخدم</string>
+    <string name="auth_add_email_message">أضِف عنوان بريد إلكتروني إلى حسابك ليمكن</string>
+    <string name="auth_add_phone_message">أضِف رقم هات ل</string>
+    <string name="auth_email_placeholder">عنوان البريد الإلكتروني</string>
+    <string name="auth_opt_email_placeholder">عنوان البريد الإلكتروني (اختياري)</string>
+    <string name="auth_phone_number_placeholder">رقم الهاتف</string>
+    <string name="auth_opt_phone_number_placeholder">رقم الهاتف (اختياري)</string>
+    <string name="auth_repeat_password_placeholder">أعِد كلمة السر</string>
+    <string name="auth_repeat_new_password_placeholder">أكِد كلمة السر الجديدة</string>
+    <string name="auth_invalid_login_param">اسم المستخدم و/أو كلمة السر خاطئة</string>
+    <string name="auth_invalid_user_name">يمكن أن يحتوي اسم المستخدم على الأحرف والأرقام والنُقط والشُرط والشُرط السفلية فقط</string>
+    <string name="auth_invalid_password">كلمة السر قصيرة جدا (على الأقل 6)</string>
+    <string name="auth_missing_password">كلمة السر ناقصة</string>
+    <string name="auth_invalid_email">لا يبدو هذا وكأنه بريد إلكتروني صالح</string>
+    <string name="auth_invalid_phone">لا يبدو هذا وكأنه رقم هاتف صالح</string>
+    <string name="auth_missing_email">عنوان البريد ناقص</string>
+    <string name="auth_missing_phone">رقم الهاتف ناقص</string>
+    <string name="auth_missing_email_or_phone">عنوان البريد أو رقم الهاتف ناقص</string>
+    <string name="auth_password_dont_match">لا تتطابق كلمات السر</string>
+    <string name="auth_forgot_password">أنسيت كلمة السر؟</string>
+    <string name="auth_use_server_options">استخدم خيارات خادوم مخصصة (متقدم)</string>
+    <string name="auth_email_validation_message">رجاءً افحص بريدك لمتابعة التسجيل</string>
+    <string name="auth_username_in_use">اسم المستخدم مستخدم</string>
+    <string name="auth_reset_password_message">لتصفير كلمة السر أدخِل عنوان البريد الإلكتروني المرتبط بحسابك:</string>
+    <string name="auth_reset_password_missing_email">يجب إدخال عنوان البريد الإلكتروني المرتبط بحسابك.</string>
+    <string name="auth_reset_password_missing_password">يجب إدخال كلمة سر جديدة.</string>
+    <string name="auth_reset_password_error_unauthorized">فشل التحقق من عنوان البريد: تحقق من نقر الرابط في البريد</string>
+    <string name="auth_reset_password_success_message">صُفّرت كلمة السر.
+
+لقد أخرجناك من كل الأجهزة ولم تعد تستقبل</string>
+
+    <string name="login_error_network_error">تعذّر الولوج: خطأ في الشبكة</string>
+    <string name="login_error_unable_login">تعذّر الولوج</string>
+    <string name="login_error_registration_network_error">تعذّر التسجيل: خطأ في الشبكة</string>
+    <string name="login_error_unable_register">تعذّر التسجيل</string>
+    <string name="login_error_unable_register_mail_ownership">تعذّر التسجيل: فشل في ملكية البريد</string>
+    <string name="login_error_invalid_home_server">أدخِل مسارا صالحا</string>
+    <string name="login_mobile_device">المحمول</string>
+
+    <string name="login_error_forbidden">اسم المستخدم/كلمة السر غير صالحة</string>
+    <string name="login_error_not_json">لم يحتوي JSON صالح</string>
+    <string name="login_error_limit_exceeded">أُرسلت الكثير من الطلبات</string>
+    <string name="login_error_user_in_use">اسم المستخدم هذا مستخدم بالفعل</string>
+    <string name="login_error_login_email_not_yet">لم يُنقر بعد على الرابط في البريد</string>
+
+    <string name="e2e_need_log_in_again">عليك الولوج ثانيةً لتوليد مفاتيح تعمية الطرفين لهذا الجهاز وإرسال المفتاح العمومي إلى خادوم المنزل.
+</string>
+
+    <string name="attachment_cancel_download">أأُلغي التنزيل؟</string>
+    <string name="attachment_cancel_upload">أأُلغي الرفع؟</string>
+    <string name="attachment_remaining_time_seconds">%d ثا</string>
+    <string name="attachment_remaining_time_minutes">%1$dدق %2$dثا</string>
+
+    <string name="yesterday">الأمس</string>
+    <string name="today">اليوم</string>
+
+    <string name="room_info_room_name">اسم الغرفة</string>
+    <string name="room_info_room_topic">موضوع الغرفة</string>
+
+    <string name="call_ended">انتهت المكالمة</string>
+    <string name="incoming_call">مكالمة واردة</string>
+    <string name="incoming_video_call">مكالمة صورية واردة</string>
+    <string name="incoming_voice_call">مكالمة صوتية واردة</string>
+    <string name="call_in_progress">المكالمة جارية</string>
+
+    <string name="call_error_camera_init_failed">تعذّر تمهيد الكمرة</string>
+
+    <string name="media_picker_both_capture_title">خُذ صورة أو ڤديو</string>
+    <string name="media_picker_cannot_record_video">تعذّر تسجيل الڤديو</string>
+
+    <string name="permissions_rationale_popup_title">معلومات</string>
+    <string name="permissions_action_not_performed_missing_permissions">نأسف، لم يجر</string>
+
+    <string name="media_slider_saved_message">احفظ في التنزيلات</string>
+    <string name="yes">نعم</string>
+    <string name="no">لا</string>
+    <string name="_continue">تابع</string>
+
+    <string name="remove">أزِل</string>
+    <string name="join">انضم</string>
+    <string name="reject">ارفض</string>
+
+    <string name="room_jump_to_first_unread">انتقل إلى أول رسالة غير مقروءة.</string>
+
+    <string name="room_preview_invitation_format">لقد دعاك ⁨%s⁩ للانضمام إلى هذه الغرفة</string>
+    <string name="room_preview_room_interactions_disabled">هذه معاينة عن الغرفة. عُطّل التفاعل مع الغرفة.</string>
+
+    <string name="room_creation_title">دردشة جديدة</string>
+    <string name="room_creation_add_member">أضِف عضوا</string>
+    <string name="room_header_active_members">%1$d/%2$d عضو نشط</string>
+    <string name="room_e2e_alert_title">تحذير!</string>
+    <string name="format_time_s">ثا</string>
+    <string name="format_time_m">دق</string>
+    <string name="format_time_h">سا</string>
+    <string name="format_time_d">يوم</string>
+
+    <string name="room_participants_leave_prompt_title">اترك الغرفة</string>
+    <string name="room_participants_leave_prompt_msg">أمتأكد من ترك الغرفة؟</string>
+    <string name="room_participants_remove_prompt_msg">أمتأكّد من إزالة ⁨%s⁩ من هذه الدردشة؟</string>
+    <string name="room_participants_create">أنشئ</string>
+
+    <string name="room_participants_header_admin_tools">أدوات الإدارة</string>
+    <string name="room_participants_header_devices">الأجهزة</string>
+
+    <string name="room_participants_action_leave">اترك هذه الغرفة</string>
+    <string name="room_participants_action_remove">أزِل من هذه الغرفة</string>
+    <string name="room_participants_action_ban">امنع</string>
+    <string name="room_participants_action_unban">ارفع المنع</string>
+    <string name="room_participants_action_set_default_power_level">صفّره إلى مستخدم عادي</string>
+    <string name="room_participants_action_set_moderator">اجعله إداريا</string>
+    <string name="room_participants_action_set_admin">اجعله مديرا</string>
+    <string name="room_participants_action_ignore">أخفِ كل رسائل هذا المستخدم</string>
+    <string name="room_participants_action_unignore">اعرض كل رسائل هذا المستخدم</string>
+    <string name="room_participants_action_devices_list">اعرض قائمة الأجهزة</string>
+    <string name="room_participants_invite_prompt_msg">أمتأكد من دعوة ⁨%s⁩ لهذه الدردشة؟</string>
+
+    <string name="people_search_local_contacts">المتراسلون المحليون (%d)</string>
+    <string name="people_search_filter_text">مستخدمو «ماترِكس» فقط</string>
+
+    <string name="room_one_user_is_typing">‏⁨%1$s⁩ يكتب…</string>
+    <string name="room_message_placeholder_encrypted">أرسِل رسالة معمّاة…</string>
+    <string name="room_message_placeholder_not_encrypted">أرسِل رسالة (غير معمّاة)…</string>
+    <string name="room_offline_notification">فُقد التواصل مع الخادوم.</string>
+    <string name="room_unsent_messages_notification">لم تُرسل الرسائل. أ%1$s أم %2$s الآن؟</string>
+    <string name="room_prompt_resend">أُعيد إرسالها كلها</string>
+    <string name="room_prompt_cancel">أُلغيها كلها</string>
+    <string name="room_resend_unsent_messages">أعِد إرسال الرسائل غير المرسلة</string>
+    <string name="room_delete_unsent_messages">احذف الرسائل غير المرسلة</string>
+    <string name="room_message_file_not_found">لم يُعثر على الملف</string>
+    <string name="room_do_not_have_permission_to_post">"لا تصريح لديك "</string>
+    <string name="ssl_logout_account">اخرج</string>
+    <string name="ssl_fingerprint_hash">البصمة (⁨%s⁩):</string>
+    <string name="ssl_could_not_verify">تعذّر التحقق من معرّف الخادوم البعيد.</string>
+    <string name="ssl_fingerprint_example">00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</string>
+
+    <string name="room_details_title">تفاصيل الغرفة</string>
+    <string name="room_details_files">الملفات</string>
+    <string name="room_details_settings">إعدادات</string>
+    <string name="room_details_people_invited_group_name">المدعوّون</string>
+    <string name="room_details_people_present_group_name">المنضمون</string>
+
+    <string name="room_event_action_report_prompt_ignore_user">أتريد إخفاء كل رسائل هذا العضو؟</string>
+    <string name="room_event_action_cancel_upload">ألغِ الرفع</string>
+    <string name="room_event_action_cancel_download">ألغِ التنزيل</string>
+
+    <string name="room_displayname_invite_from">دعوة من ⁨%s⁩</string>
+    <string name="room_displayname_no_title">غرفة فارغة</string>
+
+    <string name="search_no_results">لا نتائج</string>
+    <string name="tab_title_search_rooms">الغرف</string>
+    <string name="tab_title_search_messages">الرسائل</string>
+    <string name="tab_title_search_files">الملفات</string>
+
+    <string name="room_recents_directory">الدليل</string>
+    <string name="room_recents_favourites">المفضلة</string>
+    <string name="room_recents_conversations">الغرف</string>
+    <string name="room_recents_invites">الدعوات</string>
+    <string name="room_recents_create_room">أنشئ غرفة</string>
+    <string name="room_recents_join_room">انضم إلى غرفة</string>
+    <string name="room_recents_join_room_title">انضم إلى غرفة</string>
+    <string name="room_recents_join_room_prompt">اكتب معرّف غرفة أو اختصارها</string>
+
+    <string name="directory_searching_title">يبحث في الدليل..</string>
+
+    <string name="room_settings_leave_conversation">اترك المحادثة</string>
+    <string name="room_settings_forget">انسَ</string>
+
+    <string name="room_sliding_menu_messages">الرسائل</string>
+    <string name="room_sliding_menu_settings">إعدادات</string>
+    <string name="room_sliding_menu_version">"الإصدارة "</string>
+    <string name="room_sliding_menu_copyright">حقوق النسخ</string>
+    <string name="room_sliding_menu_privacy_policy">سياسة الخصوصية</string>
+
+    <string name="settings_profile_picture">صورة اللاحة</string>
+    <string name="settings_display_name">اسم العرض</string>
+    <string name="settings_email_address">البريد الإلكتروني</string>
+    <string name="settings_add_email_address">أضِف بريدا إلكترونيا</string>
+    <string name="settings_phone_number">الهاتف</string>
+    <string name="settings_add_phone_number">أضِف رقم هاتف</string>
+    <string name="settings_title_app_info_link">معلومات التطبيق</string>
+
+    <string name="settings_notification_ringtone">صوت الإخطارات</string>
+    <string name="settings_turn_screen_on">شغّل الشاشة لمدة ٣ ثواني</string>
+
+    <string name="settings_containing_my_display_name">الرسائل التي فيها اسم العرض</string>
+    <string name="settings_containing_my_user_name">الرسائل التي فيها اسم المستخدم</string>
+    <string name="settings_messages_in_one_to_one">الرسائل في محادثات الطرفين</string>
+    <string name="settings_messages_in_group_chat">الرسائل في دردشات المجموعات</string>
+    <string name="settings_invited_to_room">عندما أُدعى إلى غرفة ما</string>
+    <string name="settings_background_sync">المزامنة الخلفية</string>
+    <string name="settings_enable_background_sync">فعّل المزامنة في الخلفية</string>
+    <string name="settings_copyright">حقوق النسخ</string>
+    <string name="settings_privacy_policy">سياسة الخصوصية</string>
+    <string name="settings_clear_cache">امسح الخبيئة</string>
+    <string name="settings_clear_medias_cache">امسح خبيئة الوسائط</string>
+    <string name="settings_user_settings">إعدادات المستخدم</string>
+    <string name="settings_notifications">الإخطارات</string>
+    <string name="settings_advanced">متقدم</string>
+    <string name="settings_contact">المتراسلون المحليون</string>
+    <string name="settings_contacts_app_permission">تصاريح المتراسلون</string>
+    <string name="settings_contacts_phonebook_country">دولة دفتر العناوين</string>
+    <string name="settings_devices_list">الأجهزة</string>
+    <string name="settings_hide_read_receipts">"أخفِ "</string>
+    <string name="settings_dont_send_typings_notifs">لا تُرسل إخطارات الكتابة</string>
+    <string name="settings_always_show_timestamps">اعرض أختام الرسائل الزمنية دائما</string>
+    <string name="settings_12_24_timestamps">اعرض الأختام الزمنية بنسق ١٢ ساعة (مثلا ٢:٣٠م)</string>
+    <string name="settings_hide_join_leave_messages">أخفِ رسائل الانضمام/الخروج (الدعوات والطرد والمنع لا يتأثر)</string>
+    <string name="settings_hide_avatar_display_name_changes_messages">اعرض تغييرات الصور وأسماء العرض</string>
+
+    <string name="settings_disable_markdown">عطّل تنسيق ”ماركداون“</string>
+    <string name="settings_data_save_mode">وضع حفظ البيانات</string>
+
+    <string name="devices_details_dialog_title">تفاصيل الجهاز</string>
+    <string name="devices_details_id_title">المعرّف</string>
+    <string name="devices_details_name_title">الاسم</string>
+    <string name="devices_details_device_name">اسم الجهاز</string>
+    <string name="devices_details_last_seen_title">آخر ظهور</string>
+    <string name="devices_delete_pswd">كلمة السر:</string>
+    <string name="devices_delete_submit_button_label">أرسِل</string>
+
+    <string name="settings_user_interface">واجهة المستخدم</string>
+    <string name="settings_interface_language">لغة الواجهة</string>
+    <string name="settings_select_language">اختر لغة</string>
+
+    <string name="settings_change_password">غيّر كلمة السر</string>
+    <string name="settings_old_password">كلمة السر القديمة</string>
+    <string name="settings_new_password">كلمة السر الجديدة</string>
+    <string name="settings_confirm_password">أكّد كلمة السر</string>
+    <string name="settings_fail_to_update_password">فشل تحديث كلمة السر</string>
+    <string name="settings_password_updated">حُدّثت كلمة السر</string>
+    <string name="settings_unignore_user">أأعرض كل رسائل ⁨%s⁩؟</string>
+
+    <string name="settings_select_country">اختر دولة</string>
+
+    <string name="settings_phone_number_country_label">الدولة</string>
+    <string name="settings_phone_number_country_error">رجاءً اختر دولة</string>
+    <string name="settings_phone_number_label">رقم الهاتف</string>
+    <string name="settings_phone_number_verification_error_empty_code">أدخِل رمز التأكيد</string>
+    <string name="settings_phone_number_verification_error">خطأ في التحقق من رقم الهاتف</string>
+    <string name="settings_phone_number_code">الرمز</string>
+
+    <string name="media_saving_period_3_days">٣ أيام</string>
+    <string name="media_saving_period_1_week">أسبوع واحد</string>
+    <string name="media_saving_period_1_month">شهر واحد</string>
+    <string name="media_saving_period_forever">للأبد</string>
+
+    <string name="room_settings_room_photo">صورة الغرفة</string>
+    <string name="room_settings_room_name">اسم الغرفة</string>
+    <string name="room_settings_topic">الموضوع</string>
+
+    <string name="room_settings_room_read_history_rules_pref_title">إمكانيّة قراءة تأريخ الغرفة</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">من يمكنه قراءة التأريخ؟</string>
+    <string name="room_settings_read_history_entry_anyone">الكل</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">الأعضاء فقط (من لحظة اختيار هذا الخيار)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">الأعضاء فقط (من لحظة دعوتهم)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">الأعضاء فقط (من لحظة انضمامهم)</string>
+
+    <string name="room_settings_banned_users_title">المستخدمون الممنوعون</string>
+
+    <string name="room_settings_category_advanced_title">متقدم</string>
+    <string name="room_settings_labs_pref_title">مختبرات</string>
+    <string name="room_settings_labs_end_to_end">تعمية الطرفية</string>
+    <string name="room_settings_labs_end_to_end_is_active">تعمية الطرفية نشطة</string>
+    <string name="room_settings_labs_end_to_end_warnings">عليك الخروج لتفعيل التعمية.</string>
+    <string name="widget_creation_failure">فشل إنشاء الودجة</string>
+    <string name="widget_delete_message_confirmation">أمتأكد من حذف الودجة؟</string>
+    <string name="widget_integration_unable_to_create">تعذّر إنشاء الودجة.</string>
+    <string name="widget_integration_failed_to_send_request">فشل إرسال الطلب.</string>
+    <string name="widget_integration_must_be_in_room">لست في هذه الغرفة.</string>
+    <string name="widget_integration_no_permission_in_room">ليس لديك تصريح لفعل هذا في هذه الغرفة.</string>
+    <string name="settings_labs_native_camera">استخدم الكمرة الأصيلة</string>
+
+    // share keys
+    <string name="conference_call_warning_title">تحذير!</string>
+    <string name="resouces_country">العربية</string>
+
+    <string name="room_unknown_devices_messages_notification">لم تُرسل الرسائل بسبب وجود أجهزة مجهولة. أ%1$s أم %2$s الآن؟</string>
+    <string name="room_settings_addresses_invalid_format_dialog_body">ليس ’⁨%s⁩‘ تنسيقا صالحا لاختصار</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_msg">لن يُحدّد عنوان رئيسي. سيُنتقى العنوان الرئيسي المبدئي لهذه الغرفة عشوائيا</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_title">تحذيرات بشأن العنوان الرئيسي</string>
+
+    <string name="room_settings_set_main_address">اضبطه كعنوان رئيسي</string>
+    <string name="room_settings_unset_main_address">ألغِ ضبطه كعنوان رئيسي</string>
+    <string name="room_settings_copy_room_id">انسخ معرّف الغرفة</string>
+    <string name="room_settings_copy_room_address">انسخ عنوان الغرفة</string>
+
+    <string name="room_settings_addresses_e2e_enabled">التعمية مفعّلة في هذه الغرفة.</string>
+    <string name="room_settings_addresses_e2e_disabled">التعمية معطّلة في هذه الغرفة.</string>
+    <string name="room_settings_addresses_e2e_encryption_warning">فعّل التعمية
+(احترس: لا يمكنك تعطيلها ثانيةً!)</string>
+    <string name="room_settings_addresses_e2e_prompt_title">تحذير!</string>
+    <string name="directory_title">الدليل</string>
+    <string name="settings_theme">السمة</string>
+
+    <string name="encryption_information_title">معلومات تعمية الطرفين</string>
+
+    <string name="encryption_information_device_info">معلومات الحدث</string>
+    <string name="encryption_information_user_id">معرّف المستخدم</string>
+    <string name="encryption_information_algorithm">الخوارزميّة</string>
+    <string name="encryption_information_session_id">معرّف الجلسة</string>
+    <string name="encryption_information_decryption_error">خطأ في فكّ التعمية</string>
+
+    <string name="encryption_information_sender_device_information">معلومات الجهاز المرسل</string>
+    <string name="encryption_information_device_name">اسم الجهاز</string>
+    <string name="encryption_information_name">الاسم</string>
+    <string name="encryption_information_device_id">معرّف الجهاز</string>
+    <string name="encryption_information_device_key">مفتاح الجهاز</string>
+    <string name="encryption_export_room_keys">صدّر مفاتيح الغرفة</string>
+    <string name="encryption_export_room_keys_summary">صدّر المفاتيح إلى ملف محلي</string>
+    <string name="encryption_export_enter_passphrase">أدخِل عبارة المرور</string>
+    <string name="encryption_export_confirm_passphrase">أكّد عبارة المرور</string>
+    <string name="encryption_export_saved_as">حُفظت مفاتيح الطرفين للغرفة في ’⁨%s⁩‘</string>
+
+    <string name="encryption_import_e2e_room_keys">استورد مفاتيح الطرفين لغرفة</string>
+    <string name="encryption_import_room_keys">استورد مفاتيح الغرفة</string>
+    <string name="encryption_import_room_keys_summary">استورد المفاتيح من ملف محلي</string>
+    <string name="encryption_information_unknown_device">جهاز مجهول</string>
+    <string name="encryption_information_block">امنع</string>
+    <string name="encryption_information_unblock">أزِل المنع</string>
+
+    <string name="encryption_information_verify_device">أكّد الجهاز</string>
+    <string name="directory_server_fail_to_retrieve_server">قد لا يكون الخادوم متوفّرا أو أنه مشغول</string>
+    <string name="directory_server_type_homeserver">اكتب خادوم منزل لسرد الغرف العمومية فيه</string>
+    <string name="directory_server_placeholder">مسار خادوم المنزل</string>
+    <string name="directory_server_all_rooms_on_server">كل الغرف في خادوم ⁨%s⁩</string>
+    <string name="directory_server_native_rooms">كل غرف ⁨%s⁩ الأصيلة</string>
+
+    <string name="font_size">حجم الخط</string>
+    <string name="tiny">ضئيل</string>
+    <string name="small">صغير</string>
+    <string name="normal">متوسط</string>
+    <string name="large">كبير</string>
+    <string name="larger">كبير جدا</string>
+    <string name="largest">ضخم</string>
+    <string name="huge">ضخم جدا</string>
+
+    <string name="widget_no_power_to_manage">تحتاج تصريحا لإدارة الودجات في هذه الغرفة</string>
+    <string name="widget_integration_missing_room_id">المعرّف room_id ناقص في الطلب.</string>
+    <string name="widget_integration_missing_user_id">المعرّف user_id ناقص في الطلب.</string>
+    <string name="widget_integration_room_not_visible">الغرفة ⁨%s⁩ غير ظاهرة.</string>
+    <string name="you_added_a_new_device">لقد أضفت جهازا جديدا ’⁨%s⁩‘ يطلب مفاتيح التعمية.</string>
+    <string name="ignore_request">تجاهل الطلب</string>
+
+    // conference call
+    <string name="command_error">خطأ في الأمر</string>
+    <string name="unrecognized_command">لم يُفهم الأمر: ⁨%s⁩</string>
+
+    // notification statuses
+    <string name="redact">هذّب</string>
+    <string name="missing_permissions_to_start_conf_call">تحتاج تصريح الدعوة لبدء اجتماع في هذه الغرفة</string>
+    <string name="or">أو</string>
+    <string name="action_quick_reply">ردّ سريع</string>
+    <string name="bottom_action_people">الأشخاص</string>
+    <string name="home_filter_placeholder_home">ابحث في الغرف</string>
+    <string name="home_filter_placeholder_favorites">ابحث في المفضّلة</string>
+    <string name="home_filter_placeholder_people">ابحث في الأشخاص</string>
+    <string name="home_filter_placeholder_rooms">ابحث في الغرف</string>
+
+    <string name="user_directory_header">دليل المستخدمين</string>
+    <string name="send_bug_report">بلاغ علة</string>
+    <string name="send_bug_report_alert_message">يبدو أنك تهزّ الهاتف وأنت مُحبط. أتريد إرسال بلاغ علة؟</string>
+    <string name="send_bug_report_progress">التقدم (%s٪)</string>
+
+    <string name="permissions_rationale_msg_camera_explanation">
+
+رجاءً اسمح بالنفاذ في المنبثقة الآتية لتتمكن من إجراء محادثة.</string>
+    </resources>
diff --git a/vector/src/main/res/values-bs/strings.xml b/vector/src/main/res/values-bs/strings.xml
new file mode 100644
index 0000000000..b512d0d341
--- /dev/null
+++ b/vector/src/main/res/values-bs/strings.xml
@@ -0,0 +1,569 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources><string name="resouces_language">en</string>
+    <string name="resouces_country">SAD</string>
+
+    <string name="light_theme">Svijetla Tema</string>
+    <string name="dark_theme">Tamna Tema</string>
+    <string name="black_them">Crna Tema</string>
+
+    <string name="notification_sync_in_progress">Sinkronizacija</string>
+    <string name="notification_listen_for_events">Budući Događaji</string>
+    <string name="notification_noisy_notifications">Glasne notifikacije</string>
+    <string name="notification_silent_notifications">Nečujne notifikiacije</string>
+
+    <string name="title_activity_home">Poruke</string>
+    <string name="title_activity_room">Soba</string>
+    <string name="title_activity_settings">Postavke</string>
+    <string name="title_activity_member_details">Detalji o Članu</string>
+    <string name="title_activity_historical">Istorijski</string>
+    <string name="title_activity_bug_report">Izvještaj o Greški</string>
+
+    <string name="ok">OK</string>
+    <string name="cancel">Otkaži</string>
+    <string name="save">Snimi</string>
+    <string name="leave">Napusti</string>
+    <string name="send">Pošalji</string>
+    <string name="copy">Kopiraj</string>
+    <string name="resend">Pošalji Ponovo</string>
+    <string name="redact">Uredi</string>
+    <string name="quote">Citat</string>
+    <string name="share">Podijeli</string>
+    <string name="later">Poslije</string>
+    <string name="forward">Proslijedi</string>
+    <string name="permalink">Permalink</string>
+    <string name="view_source">Pogledaj Izvor</string>
+    <string name="view_decrypted_source">Pogledaj Dekriptovani Izvor</string>
+    <string name="delete">Izbriši</string>
+    <string name="rename">Preimenuj</string>
+    <string name="report_content">Prijavi sadržaj</string>
+    <string name="active_call">Aktivni poziv</string>
+    <string name="ongoing_conference_call">" Konferencijski poziv u toku. Pridruži se putem videa ili glasa."</string>
+    <string name="ongoing_conference_call_voice">Glas</string>
+    <string name="ongoing_conference_call_video">video</string>
+    <string name="cannot_start_call">Nije moguće započeti poziv, molimo pokušajte poslije</string>
+    <string name="missing_permissions_warning">Zbog nedostatka ovlasti, neke komponente mogu nedostajati..</string>
+    <string name="missing_permissions_to_start_conf_call">Potrebne su vam ovlasti da bi započeli konferenciju u ovoj sobi</string>
+    <string name="missing_permissions_title_to_start_conf_call">Nije moguće započeti poziv</string>
+    <string name="device_information">Informacije o uređaju</string>
+    <string name="room_no_conference_call_in_encrypted_rooms">Konferencijski pozivi nisu podržani u šifriranim sobama</string>
+    <string name="send_anyway">Ipak pošalji</string>
+    <string name="or">ili</string>
+    <string name="and">i</string>
+    <string name="invite">Pozovi</string>
+    <string name="offline">Offline</string>
+
+    <string name="action_sign_out">Odjavi se</string>
+    <string name="action_sign_out_confirmation">Zbog sigurnosti, odjava će izbrisati sve krajnje ključeve za šifriranje, čime se prethodna šifrirana istorija razgovora ne može čitati ako se ponovo prijavite.
+Odaberite eksport kako biste napravili rezervu prije odjavljivanja.</string>
+    <string name="action_voice_call">Glasovni Poziv</string>
+    <string name="action_video_call">Video Poziv</string>
+    <string name="action_global_search">Globalna pretraga</string>
+    <string name="action_mark_all_as_read">Označi kao pročitano</string>
+    <string name="action_historical">Istorijski</string>
+    <string name="action_quick_reply">Brzi odgovor</string>
+    <string name="action_open">Otvori</string>
+    <string name="action_close">Zatvori</string>
+    <string name="copied_to_clipboard">Kopirano</string>
+    <string name="disable">Isključi</string>
+
+    <string name="dialog_title_confirmation">Potvrda</string>
+    <string name="dialog_title_warning">Upozorenje</string>
+
+    <string name="bottom_action_home">Naslovna</string>
+    <string name="bottom_action_favourites">Omiljeni</string>
+    <string name="bottom_action_people">Ljudi</string>
+    <string name="bottom_action_rooms">Sobe</string>
+
+    <string name="home_filter_placeholder_home">Traži sobe</string>
+    <string name="home_filter_placeholder_favorites">Traži favorite</string>
+    <string name="home_filter_placeholder_people">Traži ljude</string>
+    <string name="home_filter_placeholder_rooms">Traži sobe</string>
+
+    <string name="invitations_header">Pozivi</string>
+    <string name="low_priority_header">Niski prioritet</string>
+
+    <string name="direct_chats_header">Razgovori</string>
+    <string name="local_address_book_header">Lokalni adresar</string>
+    <string name="user_directory_header">Imenik korisnika</string>
+    <string name="matrix_only_filter">Samo matriks kontakti</string>
+    <string name="no_conversation_placeholder">Nema razgovora</string>
+    <string name="no_contact_access_placeholder">Niste omogućili Riotu pristup vašim lokalnim kontaktima</string>
+    <string name="no_result_placeholder">Nema rezultata</string>
+
+    <string name="rooms_header">Sobe</string>
+    <string name="rooms_directory_header">Imenik soba</string>
+    <string name="no_room_placeholder">Nema soba</string>
+    <string name="no_public_room_placeholder">Nema dostupnih javnih soba</string>
+    <plurals name="public_room_nb_users">
+	<item quantity="one">Jedan</item>
+	<item quantity="few">Nekoliko</item>
+	<item quantity="other">Drugi</item>
+</plurals>
+
+    <string name="send_bug_report_include_logs">Pošaljite zapise</string>
+    <string name="send_bug_report_include_crash_logs">Pošaljite keš zapise</string>
+    <string name="send_bug_report_include_screenshot">Pošalji sliku ekrana</string>
+    <string name="send_bug_report">Izvještaj o graški</string>
+    <string name="send_bug_report_description">Molimo opišite grešku. Šta ste uradili? Šta ste očekivali da će se dogoditi? Što se zapravo dogodilo?</string>
+    <string name="send_bug_report_placeholder">Opišite svoj problem ovde</string>
+    <string name="send_bug_report_logs_description">Da bi dijagnosticirali probleme, zapisi ovog klijenta bit će poslani s ovim izvještajem o greški. Ako želite poslati samo gore navedeni tekst, uklonite oznaku:</string>
+    <string name="send_bug_report_alert_message">Čini se da frustrirani. Želite li poslati izvještaj o pogrešci?</string>
+    <string name="send_bug_report_app_crashed">Aplikacija se srušila posljednji put. Želite li poslati izvještaj o rušenju?</string>
+
+    <string name="send_bug_report_sent">Izvješće o greški je uspješno poslano</string>
+    <string name="send_bug_report_failed">Izvještaj o greški nije uspješno poslan (%s)</string>
+    <string name="send_bug_report_progress">Napredak (%s%%)</string>
+
+    <string name="send_files_in">Poslane informacije</string>
+    <string name="read_receipt">Čitaj</string>
+
+    <string name="join_room">Pridruži se u sobu</string>
+    <string name="username">Korisničko ime</string>
+    <string name="create_account">Registruj se</string>
+    <string name="login">Prijavi se</string>
+    <string name="logout">Odjavi se</string>
+    <string name="hs_url">URL lokalnog servera</string>
+    <string name="identity_url">URL identitet servera</string>
+    <string name="user">korisnik</string>
+    <string name="users">korisnici</string>
+    <string name="search">Traži</string>
+
+    <string name="start_new_chat">Započni Novi Razgovor</string>
+    <string name="start_voice_call">Započni Glasnovni Poziv</string>
+    <string name="start_video_call">Započni Video Poziv</string>
+
+    <string name="option_send_files">Pošalji fajlove</string>
+    <string name="option_take_photo_video">Napravi fotografiju ili videozapis</string>
+    <string name="option_take_photo">Napravi fotografiju</string>
+    <string name="option_take_video">Napravi video</string>
+
+    <string name="auth_login">Prijavi se</string>
+    <string name="auth_register">Registruj se</string>
+    <string name="auth_submit">Pošalji</string>
+    <string name="auth_skip">Preskoči</string>
+    <string name="auth_send_reset_email">Pošalji Reset Email</string>
+    <string name="auth_return_to_login">Vrati se na početni ekran</string>
+    <string name="auth_user_id_placeholder">Email ili korisničko ime</string>
+    <string name="auth_password_placeholder">Lozinka</string>
+    <string name="auth_new_password_placeholder">Nova lozinka</string>
+    <string name="auth_user_name_placeholder">Korisničko ime</string>
+    <string name="auth_add_email_message">Dodajte email adresu na svoj račun kako biste korisnicima omogućili da vas pronađu, te vam omoguće resetovanje lozinke.</string>
+    <string name="auth_add_phone_message">Dodaj broj telefona na svoj račun da bi omogućili korisnicima da vas pronađu.</string>
+    <string name="auth_add_email_phone_message">Dodajte email adresu i / ili telefonski broj na svoj račun da biste omogućili korisnicima da vas pronađu.
+
+Email adresa će vam također omogućiti resetovanje lozinke.</string>
+    <string name="auth_add_email_and_phone_message">Dodajte email adresu i telefonski broj na svoj račun da biste omogućili korisnicima da vas pronađu.
+
+Email adresa će vam također omogućiti resetovanje lozinke.</string>
+    <string name="auth_email_placeholder">Email adresa</string>
+    <string name="auth_opt_email_placeholder">Email adresa (nije obavezno)</string>
+    <string name="auth_phone_number_placeholder">Broj telefona</string>
+    <string name="auth_opt_phone_number_placeholder">Broj telefona (nije obavezno)</string>
+    <string name="auth_repeat_password_placeholder">Ponovi lozinku</string>
+    <string name="auth_repeat_new_password_placeholder">Ponovi svoju novu lozinku</string>
+    <string name="auth_invalid_login_param">Netačano korisničko ime i / ili lozinka</string>
+    <string name="auth_invalid_user_name">Korisnička imena mogu sadržavati samo slova, brojeve, točkice, crtice i podvlake</string>
+    <string name="auth_invalid_password">Prekratka lozinka (min 6)</string>
+    <string name="auth_missing_password">Lozinka nedostaje</string>
+    <string name="auth_invalid_email">Nevažeća email adresa</string>
+    <string name="auth_invalid_phone">Nevažeći broj telefona</string>
+    <string name="auth_email_already_defined">Ova email adresa je već definisana.</string>
+    <string name="auth_missing_email">Email adresa nedostaje</string>
+    <string name="auth_missing_phone">Broj telefona nedostaje</string>
+    <string name="auth_missing_email_or_phone">Email adresa i broj telefona nedostaju</string>
+    <string name="auth_invalid_token">Pogrešan token</string>
+    <string name="auth_password_dont_match">Lozinke nisu iste</string>
+    <string name="auth_forgot_password">Zaboravljena lozinka?</string>
+    <string name="auth_use_server_options">Koristite prilagođene server opcije (napredno)</string>
+    <string name="auth_email_validation_message">Molimo provjerite vaš email da nastavite registraciju</string>
+    <string name="auth_threepid_warning_message">Registracija putem email adrese i telefonskog broja sada nije podržana sve dok api ne postoji. Samo će se telefonski broj uzeti u obzir.
+
+Možete dodati vašu email adresu na svoj profil u postavkama.</string>
+    <string name="auth_recaptcha_message">Ovaj lokalni server provjerava da niste robot</string>
+    <string name="auth_username_in_use">Korisničko ime se koristi</string>
+    <string name="auth_home_server">Lokalni Server:</string>
+    <string name="auth_identity_server">Identifikacijski Server:</string>
+    <string name="auth_reset_password_next_step_button">Ja sam provjerio svoju email adresu</string>
+    <string name="auth_reset_password_message">Da bi resetovali lozinku, unesite email adresu koja je povezana sa vašim računom:</string>
+    <string name="auth_reset_password_missing_email">Email adresa povezana sa vašim računom mora biti unešena.</string>
+    <string name="auth_reset_password_missing_password">Nova lozinka mora biti unešena.</string>
+    <string name="auth_reset_password_email_validation_message">Email je poslan na %s. Nakon što slijedite link koji sadrži, kliknite ispod.</string>
+    <string name="auth_reset_password_error_unauthorized">Neuspješna verifikacija email adrese: provjerite da li ste kliknuli link u emailu</string>
+    <string name="auth_reset_password_success_message">Vaša lozinka je resetovana.
+
+Odjavljeni ste sa svih uređaja i više nećete primati obavijesti. Da biste ponovno omogućili obavijesti, ponovo se prijavite na svaki uređaj.</string>
+
+    <string name="login_error_must_start_http">URL mora početi sa http[s]://</string>
+    <string name="login_error_network_error">Nemoguća prijava: Greška na mreži</string>
+    <string name="login_error_unable_login">Nemoguća prijava</string>
+    <string name="login_error_registration_network_error">Nemoguća registracija: Problem na mreži</string>
+    <string name="login_error_unable_register">Nemoguća registracija</string>
+    <string name="login_error_unable_register_mail_ownership">Nemoguća registracija : problem sa vlasništvom email adrese</string>
+    <string name="login_error_invalid_home_server">Unesite ispravan URL</string>
+    <string name="login_mobile_device">Mobitel</string>
+
+    <string name="login_error_forbidden">Netačno korisničko ime/lozinka</string>
+    <string name="login_error_unknown_token">Navedeni pristupni token nije prepoznat</string>
+    <string name="login_error_bad_json">Neispravno formatiran JSON</string>
+    <string name="login_error_not_json">Ne sadrži validan JSON</string>
+    <string name="login_error_limit_exceeded">Previše zahtjeva je poslano</string>
+    <string name="login_error_user_in_use">Ovo korisničko ime se već koristi</string>
+    <string name="login_error_login_email_not_yet">Link email adrese koji još uvijek nije kliknut</string>
+
+    <string name="e2e_need_log_in_again">Morate se ponovno prijaviti da biste generisali krajnje ključeve za šifriranje za ovaj uređaj i poslali javni ključ svom lokalnom serveru.
+Ovo je isključeno.
+Oprostite na neugodnosti.</string>
+
+    <string name="read_receipts_list">Čitajte Listu Primalaca</string>
+
+    <string name="membership_changes">% promjene članstva</string>
+
+    <string name="compression_options">"Pošalji kao "</string>
+    <string name="compression_opt_list_original">Orginal</string>
+    <string name="compression_opt_list_large">Veliko</string>
+    <string name="compression_opt_list_medium">Srednje</string>
+    <string name="compression_opt_list_small">Malo</string>
+
+    <string name="attachment_cancel_download">Otkazi preuzimanje?</string>
+    <string name="attachment_cancel_upload">Otkaži prijenos?</string>
+    <string name="yesterday">Jučer</string>
+    <string name="today">Danas</string>
+
+    <string name="room_info_room_name">Ime sobe</string>
+    <string name="room_info_room_topic">Tema sobe</string>
+
+    <string name="call">Poziv</string>
+    <string name="call_connected">Poziv uspostavljen</string>
+    <string name="call_connecting">Poziv se uspostavlja…</string>
+    <string name="call_ended">Poziv završen</string>
+    <string name="call_ring">Poziv u toku…</string>
+    <string name="incoming_call">Dolazni Poziv</string>
+    <string name="incoming_video_call">Dolazni Video Poziv</string>
+    <string name="incoming_voice_call">Dolazni Glasovni Poziv</string>
+    <string name="call_in_progress">Poziv u Toku</string>
+
+    <string name="call_error_user_not_responding">Daljinska strana nije uspjela pokupiti.</string>
+    <string name="call_error_ice_failed">Medijska veza nije uspjela</string>
+    <string name="call_error_camera_init_failed">Kamera se ne moze inicijalizirati</string>
+    <string name="call_error_answered_elsewhere">poziv je odgovoren na drugom mjestu</string>
+
+    <string name="media_picker_both_capture_title">Snimi fotografiju ili video</string>
+    <string name="media_picker_cannot_record_video">Nije moguće snimiti video</string>
+
+    <string name="permissions_rationale_popup_title">Informacije</string>
+    <string name="permissions_rationale_msg_storage">Hepek treba dopuštenje za pristup vašoj biblioteci fotografija i videozapisa za slanje i spremanje privitaka.
+
+Omogućite pristup sljedećem skočnom prozoru da biste mogli slati datoteke sa telefona.</string>
+    <string name="permissions_rationale_msg_camera">Hepek treba dopuštenje za pristup vašoj kameri za snimanje fotografija i videopoziva.</string>
+    <string name="permissions_rationale_msg_camera_explanation">
+
+Omogućite pristup sljedećem pop-upu kako biste mogli uputiti poziv.</string>
+    <string name="permissions_rationale_msg_record_audio">Hepek traži dopuštenje za pristup mikrofonu za obavljanje audio poziva.</string>
+    <string name="permissions_rationale_msg_record_audio_explanation">
+
+Omogućite pristup sljedećem pop-upu kako biste mogli uputiti poziv.</string>
+    <string name="permissions_rationale_msg_camera_and_audio">Hepek treba dopuštenje za pristup vašoj kemeri i mikrofonu za obavljanje video poziva.
+
+Omogućite pristup sljedećim skočnim prozorima da biste mogli uspostaviti poziv.</string>
+    <string name="permissions_rationale_msg_contacts">Hepek treba dopuštenje za pristup kontaktima kako bi pronašao druge Matrix korisnike na temelju njihove email adrese i telefonskih brojeva.
+
+Dopustite pristup sljedećem skočnom prozoru da biste otkrili kontakte koji koriste Hepek.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Hepek treba dopuštenje za pristup kontaktima kako bi pronašao druge Matrix korisnike na temelju njihove email adrese i telefonskih brojeva.
+
+Želite li dopustiti da Hepek pristupi vašim kontaktima?</string>
+
+    <string name="permissions_action_not_performed_missing_permissions">Nažalost, akcija nije izvršena zbog nedostatka dozvola</string>
+
+    <string name="media_slider_saved">Snimljeno</string>
+    <string name="media_slider_saved_message">Snimi u preuzimanja</string>
+    <string name="yes">DA</string>
+    <string name="no">NE</string>
+    <string name="_continue">Nastavi</string>
+
+    <string name="remove">Ukloni</string>
+    <string name="join">Spoji</string>
+    <string name="preview">Pregled</string>
+    <string name="reject">Odbij</string>
+
+    <string name="room_jump_to_first_unread">Idi na prvu nepročitanu poruku.</string>
+
+    <string name="room_preview_invitation_format">Pozvani ste da %s se pridružite u ovu sobu</string>
+    <string name="room_preview_unlinked_email_warning">Ova je pozivnica poslana na%, koja nije povezana s ovim računom.
+Možda se želite prijaviti s nekim drugim računom ili dodati ovu poruku email adresu svom računu.</string>
+    <string name="room_preview_try_join_an_unknown_room">Pokušavate pristupiti usluzi %s. Želite li se pridružiti kako biste sudjelovali u razgovoru?</string>
+    <string name="room_preview_try_join_an_unknown_room_default">soba</string>
+    <string name="room_preview_room_interactions_disabled">Ovo je pregled ove sobe. Razgovori u sobi su onemoguceni.</string>
+
+    <string name="room_creation_title">Novi Razgovor</string>
+    <string name="room_creation_add_member">Dodaj člana</string>
+    <string name="room_header_active_members">%1$d/%2$d aktivni članovi</string>
+    <string name="room_title_members">%1$d članovi</string>
+    <string name="room_title_one_member">1 član</string>
+    <string name="room_e2e_alert_title">Upozorenje!</string>
+    <string name="room_e2e_alert_message">End-to-end šifriranje je u beta verziji i možda nije pouzdano.
+
+Još uvijek nije pouzdan za čuvanje podataka.
+
+Uređaji još uvijek neće moći dešifrirati istoriju prije nego što se pridruže sobi.
+
+Šifrirane poruke neće biti vidljive na klijentima koji još ne provode šifriranje.</string>
+
+    <string name="format_time_m">m</string>
+    <string name="format_time_h">h</string>
+    <string name="format_time_d">d</string>
+
+    <string name="room_participants_leave_prompt_title">Napusti sobu</string>
+    <string name="room_participants_leave_prompt_msg">Da li ste sigurni da želite napustiti sobu?</string>
+    <string name="room_participants_remove_prompt_msg">Da li ste sigurni da želite ukloniti % iz ovog razgovora?</string>
+    <string name="room_participants_create">Kreiraj</string>
+
+    <string name="room_participants_online">Online</string>
+    <string name="room_participants_offline">Offline</string>
+    <string name="room_participants_idle">Idle</string>
+    <string name="room_participants_now">sada</string>
+    <string name="room_participants_ago">prije</string>
+
+    <string name="room_participants_header_admin_tools">ADMINISTRATORSKI ALATI</string>
+    <string name="room_participants_header_call">POZIV</string>
+    <string name="room_participants_header_direct_chats">DIREKTNI RAZGOVORI</string>
+    <string name="room_participants_header_devices">UREĐAJI</string>
+
+    <string name="room_participants_action_invite">Pozovi</string>
+    <string name="room_participants_action_leave">Napusti ovu sobu</string>
+    <string name="room_participants_action_remove">Ukloni iz ove sobe</string>
+    <string name="room_participants_action_ban">Ban</string>
+    <string name="room_participants_action_unban">Deban</string>
+    <string name="room_participants_action_set_default_power_level">Resetuj na normlanog korisnika</string>
+    <string name="room_participants_action_set_moderator">Dodijeli moderatorsku ulogu</string>
+    <string name="room_participants_action_set_admin">Dodijeli ulogu administratora</string>
+    <string name="room_participants_action_ignore">Sakrij sve poruke od ovog korisnika</string>
+    <string name="room_participants_action_unignore">Prikaži sve poruke od ovog korisnika</string>
+    <string name="room_participants_invite_search_another_user">ID Korisnika, Ime ili email</string>
+    <string name="room_participants_action_mention">Spomeni</string>
+    <string name="room_participants_action_devices_list">Prikaži listu uređaja</string>
+    <string name="room_participants_power_level_prompt">Nećete moći poništiti ovu promjenu jer će te korisniku dati ista dopuštenja kao što imate i vi.
+Da li ste sigurani?</string>
+
+    <string name="room_participants_invite_prompt_msg">Da li ste sigurni da želite pozvati% u ovaj razgovor?</string>
+
+    <string name="people_search_invite_by_id"><u>Pozovi preko ID-a</u></string>
+    <string name="people_search_local_contacts">LOKALNI KONTAKTI (%d)</string>
+    <string name="people_search_user_directory">KORISNIČKI IMENIK (%s)</string>
+    <string name="people_search_filter_text">Samo Matrix korisnici</string>
+
+    <string name="people_search_invite_by_id_dialog_title">Pozovi korisnika preko ID-a</string>
+    <string name="people_search_invite_by_id_dialog_description">Unesite jednu ili više email adresa ili Matrix ID</string>
+    <string name="people_search_invite_by_id_dialog_hint">Email il Matrix ID</string>
+
+    <string name="room_menu_search">Pretraga</string>
+    <string name="room_one_user_is_typing">%s tipka…</string>
+    <string name="room_two_users_are_typing">%1$s &amp; %2$s tipkaju…</string>
+    <string name="room_many_users_are_typing">%1$s &amp; %2$s &amp; ostali tipkaju…</string>
+    <string name="room_message_placeholder_encrypted">Pošalji kao šifriranu poruku…</string>
+    <string name="room_message_placeholder_not_encrypted">Pošalji kao poruku (nešifrirana)…</string>
+    <string name="room_offline_notification">Konekcija na server je prekinuta.</string>
+    <string name="room_unsent_messages_notification">Poruke nisu poslane. %1$s or %2$s sada?</string>
+    <string name="room_unknown_devices_messages_notification">Poruke se ne šalju zbog nepoznatih uređaja. Sada je %1$s ili %2$s?</string>
+    <string name="room_prompt_resend">Pošalji sve ponovo</string>
+    <string name="room_prompt_cancel">poništi sve</string>
+    <string name="room_resend_unsent_messages">Ponovo pošalji sve neposlane poruke</string>
+    <string name="room_delete_unsent_messages">Izbriši neposlane poruke</string>
+    <string name="room_message_file_not_found">Datoteka nije pronađena</string>
+    <string name="room_do_not_have_permission_to_post">Nemate dopuštenje da komunicirate u ovoj sobi</string>
+    <string name="room_new_message_notification">1 nova poruka</string>
+    <string name="room_new_messages_notification">%1$d novih poruka</string>
+
+    <string name="ssl_trust">Povjerenje</string>
+    <string name="ssl_do_not_trust">Ne vjerujte</string>
+    <string name="ssl_logout_account">Odjava</string>
+    <string name="ssl_remain_offline">Ignoriši</string>
+    <string name="ssl_fingerprint_hash">Otisak prsta (%s):</string>
+    <string name="ssl_could_not_verify">Nije bilo moguće potvrditi identitet udaljenog servera.</string>
+    <string name="ssl_cert_not_trust">Ovo može značiti da netko zlonamjerno presreće vaš promet ili da vaš telefon odbija certifikat koji pruža udaljeni server.</string>
+    <string name="ssl_cert_new_account_expl">Ako je administrator servera naveo da se to očekuje, provjerite da li se otisak prsta u ispod podudara s otisakom prsta koji su obezbjedili.</string>
+    <string name="ssl_unexpected_existing_expl">Certifikat je promijenjen s onoga koji vaš telefon smatra pouzdanim. Ovo je VRLO NEUBIČAJENO. Preporučuje se da NE PRIHVAĆATE ovaj novi certifikat.</string>
+    <string name="ssl_expected_existing_expl">Potvrda se promijenila s prethodno pouzdane u onu koja nije pouzdana. Postoji mogučnost da je server obnovio svoj certifikat. Obratite se administratoru servera za očekivani otisak prsta.</string>
+    <string name="ssl_only_accept">SAMO prihvatiti certifikat ako je administrator servera objavio otisak prsta koji odgovara gore navedenom.</string>
+    <string name="ssl_fingerprint_example">00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</string>
+
+    <string name="room_details_title">Detalji Sobe</string>
+    <string name="room_details_people">Ljudi</string>
+    <string name="room_details_files">Fajlovi</string>
+    <string name="room_details_settings">Postavke</string>
+    <string name="room_details_selected">označeno</string>
+    <string name="malformed_id">Malformirani ID. Trebao bi biti email adresa ili Matrix ID poput \"@localpart: domain\"</string>
+    <string name="room_details_people_invited_group_name">POZVAN</string>
+    <string name="room_details_people_present_group_name">PRIKLJUČEN</string>
+
+    <string name="room_event_action_report_prompt_reason">Razlog za prijavljivanje ovog sadržaja</string>
+    <string name="room_event_action_report_prompt_ignore_user">Želite li sakriti sve poruke tog korisnika?</string>
+    <string name="room_event_action_cancel_upload">Otkaži Prijenos</string>
+    <string name="room_event_action_cancel_download">Otkaži Preuzimanje</string>
+
+    <string name="room_displayname_invite_from">Pozovite iz %s</string>
+    <string name="room_displayname_room_invite">Poziv u Sobu</string>
+    <string name="room_displayname_two_members">%1$s i %2$s</string>
+    <string name="room_displayname_more_than_two_members">%1$s i %2$d ostali</string>
+    <string name="room_displayname_no_title">Prazna soba</string>
+
+    <string name="search_hint">Pretraga</string>
+    <string name="search_members_hint">Filtriraj članove sobe</string>
+    <string name="search_no_results">Nema rezultata</string>
+    <string name="tab_title_search_rooms">SOBE</string>
+    <string name="tab_title_search_messages">PORUKE</string>
+    <string name="tab_title_search_people">LJUDI</string>
+    <string name="tab_title_search_files">FAJLOVI</string>
+
+    <string name="room_recents_join">PRIDRUŽI SE</string>
+    <string name="room_recents_directory">DIREKTORIJ</string>
+    <string name="room_recents_favourites">FAVORITI</string>
+    <string name="room_recents_conversations">SOBE</string>
+    <string name="room_recents_low_priority">NISKI PRIORITET</string>
+    <string name="room_recents_invites">POZIVI</string>
+    <string name="room_recents_start_chat">Započni razgovor</string>
+    <string name="room_recents_create_room">Napravi sobu</string>
+    <string name="room_recents_join_room">Pridruži se sobi</string>
+    <string name="room_recents_join_room_title">Pridriži se u sobu</string>
+    <string name="room_recents_join_room_prompt">Upišite ID sobe ili alias sobe</string>
+
+    <string name="directory_search_results_title">Pretražite imenik</string>
+    <string name="directory_search_room">%1$d soba</string>
+    <string name="directory_search_rooms">%1$d sobe</string>
+    <string name="directory_search_room_for">%1$d soba nađena za %2$s</string>
+    <string name="directory_search_rooms_for">%1$s soba pronađena za %2$s</string>
+    <string name="directory_searching_title">Traži direktorij..</string>
+
+    <string name="room_settings_favourite">Favorit</string>
+    <string name="room_settings_de_prioritize">De-prioritiziraj</string>
+    <string name="room_settings_direct_chat">Direktni Razgovor</string>
+    <string name="room_settings_leave_conversation">Napusti Razgovor</string>
+    <string name="room_settings_forget">Zaboravi</string>
+
+    <string name="room_sliding_menu_messages">Poruke</string>
+    <string name="room_sliding_menu_settings">Postavke</string>
+    <string name="room_sliding_menu_version">"Verzija "</string>
+    <string name="room_sliding_menu_term_and_conditions">Uvjeti korištenja</string>
+    <string name="room_sliding_menu_third_party_notices">Obavijesti treće strane</string>
+    <string name="room_sliding_menu_copyright">Copyright</string>
+    <string name="room_sliding_menu_privacy_policy">Privatnost</string>
+
+    <string name="settings_profile_picture">Profilna Slika</string>
+    <string name="settings_display_name">Ime</string>
+    <string name="settings_email_address">Email</string>
+    <string name="settings_add_email_address">Dodaj email adresu</string>
+    <string name="settings_phone_number">Telefon</string>
+    <string name="settings_add_phone_number">Dodaj broj telefona</string>
+    <string name="settings_summary_app_info_link">Infomacije o aplikacijskom sustavu</string>
+    <string name="settings_title_app_info_link">Informacije o aplikaciji</string>
+
+    <string name="settings_notification_ringtone">Zvuk notifikacije</string>
+    <string name="settings_enable_all_notif">Omogući obavijesti za ovaj račun</string>
+    <string name="settings_enable_this_device">Omogući obavijesti za ovaj uređaj</string>
+    <string name="settings_turn_screen_on">Uključite zaslon na 3 sekunde</string>
+
+    <string name="settings_containing_my_display_name">Poruke sadrže moje ime</string>
+    <string name="settings_containing_my_user_name">Poruke sadrže moje koristničko ime</string>
+    <string name="settings_messages_in_one_to_one">Poruke u jedan-na-jedan razgovorima</string>
+    <string name="settings_messages_in_group_chat">POruke u grupnim razgovorima</string>
+    <string name="settings_invited_to_room">Kada sam pozvan u sobu</string>
+    <string name="settings_call_invitations">Pozivnice za poziv</string>
+    <string name="settings_messages_sent_by_bot">Poruke koje šalje bot</string>
+
+    <string name="settings_start_on_boot">Započni na boot</string>
+    <string name="settings_background_sync">Pozadinska sinkronizacija</string>
+    <string name="settings_enable_background_sync">Omogući pozadinsku sinkronizaciju</string>
+    <string name="settings_set_sync_timeout">Sinkronizacijski zahtjev istekao</string>
+    <string name="settings_set_sync_delay">Napravi pauzu između dva sinkronizacijska zahtjeva</string>
+    <string name="settings_second">sekunda</string>
+    <string name="settings_seconds">sekunde</string>
+
+    <string name="settings_version">Verzija</string>
+    <string name="settings_olm_version">olm verzija</string>
+    <string name="settings_app_term_conditions">Uvjeti korištenja</string>
+    <string name="settings_third_party_notices">Obavijesti treće strane</string>
+    <string name="settings_copyright">Copyright</string>
+    <string name="settings_privacy_policy">Privatnost</string>
+    <string name="settings_clear_cache">Očisti keš</string>
+    <string name="settings_clear_medias_cache">Očisti medija keš</string>
+    <string name="settings_keep_media">Dodaj medij</string>
+
+    <string name="settings_user_settings">Korisničke postavke</string>
+    <string name="settings_notifications">Notifikacije</string>
+    <string name="settings_ignored_users">Ignorisani korisnici</string>
+    <string name="settings_other">Ostale</string>
+    <string name="settings_advanced">Napredno</string>
+    <string name="settings_cryptography">Kriptografija</string>
+    <string name="settings_notifications_targets">Ciljevi obavijesti</string>
+    <string name="settings_contact">Lokalni kontakti</string>
+    <string name="settings_contacts_app_permission">Dopuštenje za kontakte</string>
+    <string name="settings_contacts_phonebook_country">Zemlja kontakta</string>
+    <string name="settings_home_display">Naslovni displej</string>
+    <string name="settings_pin_missed_notifications">Prikačite sobe sa propuštenim obavijestima</string>
+    <string name="settings_pin_unread_messages">Prikačite sobe sa nepročitanim porukama</string>
+    <string name="settings_devices_list">Uređaj</string>
+    <string name="settings_hide_read_receipts">Sakrijte pročitane račune</string>
+    <string name="settings_dont_send_typings_notifs">Nemojte slati obavijesti o tipizaciji</string>
+    <string name="settings_always_show_timestamps">Uvijek prikažite vremenske oznake poruka</string>
+    <string name="settings_12_24_timestamps">Prikaži vremenske oznake u 12-satnom obliku (npr. 14:30)</string>
+    <string name="settings_hide_join_leave_messages">Sakrij poruke o pridruživanju / napuštanju (pozivnice / izbacivanja / neovlaštne zabrane)</string>
+    <string name="settings_hide_avatar_display_name_changes_messages">Sakrij avatar i promjene imena</string>
+
+    <string name="settings_analytics">Analiza</string>
+    <string name="settings_opt_out_of_analytics">Isključite se iz analize</string>
+    <string name="attachment_remaining_time_seconds">%d s</string>
+    <string name="attachment_remaining_time_minutes">%1$a %2$i</string>
+
+    <string name="format_time_s">s</string>
+    <string name="settings_opt_out_of_analytics_summary">Hepek prikuplja anonimnu analitiku kako bi nam omogućio poboljšanje aplikacije.</string>
+
+
+    <string name="settings_disable_markdown">Onemogućite formatiranje oznaka</string>
+    <string name="settings_data_save_mode">Način spremanja podataka</string>
+
+    <string name="devices_details_dialog_title">Pojedinosti uređaja</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="devices_details_name_title">Ime</string>
+    <string name="devices_details_device_name">Ime uređaja</string>
+    <string name="devices_details_last_seen_title">Posljednji put viđeno</string>
+    <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
+    <string name="devices_details_time_format">SS:mm:ss</string>
+    <string name="devices_delete_dialog_text">Ova operacija zahtijeva dodatnu provjeru autentičnosti.
+Da biste nastavili, unesite lozinku.</string>
+    <string name="devices_delete_dialog_title">Ovjera</string>
+    <string name="devices_delete_pswd">Lozinka:</string>
+    <string name="devices_delete_submit_button_label">Pošalji</string>
+
+    <string name="settings_logged_in">Prijavljen kao</string>
+    <string name="settings_home_server">Lokalni Server</string>
+    <string name="settings_identity_server">Identifikacioni Server</string>
+
+    <string name="settings_user_interface">Korisnički interfejs</string>
+    <string name="settings_interface_language">Jezik interfejsa</string>
+    <string name="settings_select_language">Izaberi jezik</string>
+
+    <string name="account_email_validation_title">Čekanje na verifikaciju</string>
+    <string name="account_email_validation_message">Proverite svoj email i kliknite na link u email-u. Nakon što to učinite, kliknite na dugme nastavi.</string>
+    <string name="account_email_validation_error">Nije moguće proveriti email adresu. Proverite svoj email i kliknite na link u emailu. Nakon što to uradite, kliknite na dugme nastavi</string>
+    <string name="account_email_already_used_error">Ova email adresa je već u upotrebi</string>
+    <string name="account_email_not_found_error">Neuspješno slanje emaila: Ova adresa email adresa nije pronađena</string>
+    <string name="account_phone_number_already_used_error">Ovaj telefonski broj je već u upotrebi</string>
+
+    <string name="settings_change_password">Promenite lozinku</string>
+    <string name="settings_old_password">stara lozinka</string>
+    <string name="settings_new_password">nova lozinka</string>
+    <string name="settings_confirm_password">potvrdi lozinku</string>
+    <string name="settings_fail_to_update_password">Neuspešno ažuriranje lozinke</string>
+    <string name="settings_password_updated">Vaša lozinka je ažurirana</string>
+    <string name="settings_unignore_user">Prikaži sve poruke iz %s?</string>
+
+    <string name="settings_delete_notification_targets_confirmation">Da li ste sigurni da želite ukloniti ovaj cilj obaveštenja?</string>
+
+    <string name="settings_delete_threepid_confirmation">Da li ste sigurni da želite ukloniti %1$s %2$s?</string>
+
+    <string name="settings_select_country">Izaberite zemlju</string>
+
+    <string name="settings_phone_number_country_label">Zemlja</string>
+    <string name="settings_phone_number_country_error">Izaberite zemlju</string>
+    <string name="settings_phone_number_label">Broj telefona</string>
+    <string name="settings_phone_number_error">Nevažeći broj telefona za izabranu zemlju</string>
+    </resources>
diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml
new file mode 100644
index 0000000000..682fb67e8e
--- /dev/null
+++ b/vector/src/main/res/values-ca/strings.xml
@@ -0,0 +1,875 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<resources>
+    <!-- use to retrieve the supported languages list -->
+    <!-- should the same value as the file name -->
+
+    <string name="resouces_language">ca</string>
+    <string name="resouces_country">ES</string>
+
+    <!-- theme -->
+    <string name="light_theme">Tema clar</string>
+    <string name="dark_theme">Tema fosc</string>
+    <string name="black_them">Tema negre</string>
+
+    <!-- permanent notification subtitle -->
+    <string name="notification_sync_in_progress">Sincronitzant</string>
+    <string name="notification_listen_for_events">Escolta esdeveniments</string>
+    <string name="notification_noisy_notifications">Notificacions sorolloses</string>
+    <string name="notification_silent_notifications">Notificacions silencioses</string>
+
+    <!-- titles -->
+    <string name="title_activity_home">Missatges</string>
+    <string name="title_activity_room">Sala</string>
+    <string name="title_activity_settings">Configuració</string>
+    <string name="title_activity_member_details">Detalls dels participants</string>
+    <string name="title_activity_historical">Històric</string>
+    <string name="title_activity_bug_report">Informe d\'errors</string>
+    <string name="title_activity_group_details">Detalls de la comunitat</string>
+
+    <!-- button names -->
+    <string name="ok">D\'acord</string>
+    <string name="cancel">Cancel·la</string>
+    <string name="save">Desa</string>
+    <string name="leave">Surt de la sala</string>
+    <string name="send">Envia</string>
+    <string name="copy">Còpia</string>
+    <string name="resend">Reenvia</string>
+    <string name="redact">Elimina</string>
+    <string name="quote">Cita</string>
+    <string name="share">Comparteix</string>
+    <string name="later">Més tard</string>
+    <string name="forward">Reenvia</string>
+    <string name="permalink">Enllaç permanent</string>
+    <string name="view_source">Mostra el codi</string>
+    <string name="view_decrypted_source">Visualitza el codi font desencriptat</string>
+    <string name="delete">Elimina</string>
+    <string name="rename">Reanomena</string>
+    <string name="report_content">Mostra el contingut</string>
+    <string name="active_call">Trucada activa</string>
+    <string name="ongoing_conference_call"> Conferència en curs. Uneix-te per veu o vídeo.</string>
+    <string name="ongoing_conference_call_voice">veu</string>
+    <string name="ongoing_conference_call_video">vídeo</string>
+    <string name="cannot_start_call">La trucada no es pot iniciar, prova-ho més tard</string>
+    <string name="missing_permissions_warning">Pot ser que algunes funcions no apareguin per manca de permisos...</string>
+    <string name="missing_permissions_to_start_conf_call">Es necessiten permisos per convidar a iniciar una conferència en aquesta sala</string>
+    <string name="missing_permissions_title_to_start_conf_call">No es pot iniciar la trucada</string>
+    <string name="device_information">Informació del dispositiu</string>
+    <string name="room_no_conference_call_in_encrypted_rooms">No es poden fer conferències en sales encriptades</string>
+    <string name="send_anyway">Envia igualment</string>
+    <string name="or">o</string>
+    <string name="and">i</string>
+    <string name="invite">Convida</string>
+    <string name="offline">Fora de línia</string>
+
+    <!-- actions -->
+    <string name="action_sign_out">Surt</string>
+    <string name="action_sign_out_confirmation">Per motius de seguretat, en sortir s\'eliminaran totes les claus d\'encriptació d\'extrem a extrem, amb això l\'històric del xat encriptat quedarà il·legible si es torna a entrar. Seleccioneu l\'acció d\'exportar abans de sortir per tal de fer una còpia de seguretat.</string>
+    <string name="action_voice_call">Trucada de veu</string>
+    <string name="action_video_call">Vídeotrucada</string>
+    <string name="action_global_search">Cerca global</string>
+    <string name="action_mark_all_as_read">Marca-ho tot com a llegit</string>
+    <string name="action_historical">Històric</string>
+    <string name="action_quick_reply">Resposta ràpida</string>
+    <string name="action_open">Obre</string>
+    <string name="action_close">Tanca</string>
+    <string name="copied_to_clipboard">S\'ha copiat al porta-retalls</string>
+    <string name="disable">Desactiva</string>
+
+    <!-- dialog titles -->
+    <string name="dialog_title_confirmation">Confirmació</string>
+    <string name="dialog_title_warning">Avís</string>
+
+    <!-- Bottom navigation buttons -->
+    <string name="bottom_action_home">Inici</string>
+    <string name="bottom_action_favourites">Preferits</string>
+    <string name="bottom_action_people">Persones</string>
+    <string name="bottom_action_rooms">Sales</string>
+
+    <!-- Home screen -->
+    <string name="home_filter_placeholder_home">Cerca sales</string>
+    <string name="home_filter_placeholder_favorites">Cerca preferits</string>
+    <string name="home_filter_placeholder_people">Cerca persones</string>
+    <string name="home_filter_placeholder_rooms">Cerca sales</string>
+    <string name="home_filter_placeholder_groups">Cerca comunitats</string>
+
+    <!-- Home fragment -->
+    <string name="invitations_header">Convida</string>
+    <string name="low_priority_header">Prioritat baixa</string>
+
+    <!-- People fragment -->
+    <string name="direct_chats_header">Converses</string>
+    <string name="local_address_book_header">Llibreta d\'adreces local</string>
+    <string name="user_directory_header">Directori de l\'usuari</string>
+    <string name="matrix_only_filter">Només contactes de Matrix</string>
+    <string name="no_conversation_placeholder">Cap conversa</string>
+    <string name="no_contact_access_placeholder">No es va donar permís a Riot per accedir als contactes locals</string>
+    <string name="no_result_placeholder">Cap resultat</string>
+
+    <!-- Rooms fragment -->
+    <string name="rooms_header">Sales</string>
+    <string name="rooms_directory_header">Directori de sales</string>
+    <string name="no_room_placeholder">No hi ha cap sala</string>
+    <string name="no_public_room_placeholder">No hi ha cap sala pública disponible</string>
+    <plurals name="public_room_nb_users">
+        <item quantity="one">1 usuari</item>
+        <item quantity="other">%d usuaris</item>
+    </plurals>
+
+    <!-- Groups fragment -->
+    <string name="groups_invite_header">Convida</string>
+    <string name="groups_header">Comunitats</string>
+    <string name="no_group_placeholder">No hi ha cap grup</string>
+
+    <string name="send_bug_report_include_logs">Envia els registres</string>
+    <string name="send_bug_report_include_crash_logs">Envia els registres de fallada</string>
+    <string name="send_bug_report_include_screenshot">Envia una captura de pantalla</string>
+    <string name="send_bug_report">Informa d\'un error</string>
+    <string name="send_bug_report_description">Descriviu l\'error. Què heu fet? Què esperàveu que passés? Què ha passat realment?</string>
+    <string name="send_bug_report_placeholder">Descriviu el problema aquí</string>
+    <string name="send_bug_report_logs_description">Els registres d\'aquest client s\'enviaran amb aquest informe d\'error per tal de diagnosticar problemes. Desmarqueu si preferiu enviar només el text:</string>
+    <string name="send_bug_report_alert_message">Sembla que esteu prou frustrat com per estar sacsejant el telèfon. Voleu enviar un informe d\'error?</string>
+    <string name="send_bug_report_app_crashed">En l\'última execució l\'aplicació va fallar. Voleu enviar un informe d\'error?</string>
+
+    <string name="send_bug_report_sent">L\'informe d\'error s\'ha enviat correctament</string>
+    <string name="send_bug_report_failed">No s\'ha pogut enviar l\'informe d\'error (%s)</string>
+    <string name="send_bug_report_progress">En curs (%s%%)</string>
+
+    <string name="send_files_in">Envia a</string>
+    <string name="read_receipt">Llegeix</string>
+
+    <string name="join_room">Uneix-te a la sala</string>
+    <string name="username">Nom d\'usuari</string>
+    <string name="create_account">Registra\'m</string>
+    <string name="login">Entra</string>
+    <string name="logout">Surt</string>
+    <string name="hs_url">URL del servidor</string>
+    <string name="identity_url">URL de la identitat del servidor</string>
+    <string name="user">usuari</string>
+    <string name="users">usuaris</string>
+    <string name="search">Cerca</string>
+
+    <string name="start_new_chat">Inicia un xat nou</string>
+    <string name="start_voice_call">Inicia una trucada de veu</string>
+    <string name="start_video_call">Inicia una vídeotrucada</string>
+
+    <string name="start_new_chat_prompt_msg">Esteu segur que voleu començar una conversa amb %s?</string>
+    <string name="start_voice_call_prompt_msg">Esteu segur que voleu començar una trucada de veu?</string>
+    <string name="start_video_call_prompt_msg">Esteu segur que voleu començar una trucada de vídeo?</string>
+
+    <string name="option_send_files">Envia fitxers</string>
+    <string name="option_take_photo_video">Fes una foto o un vídeo</string>
+    <string name="option_take_photo">Fes una foto</string>
+    <string name="option_take_video">Fes un vídeo</string>
+
+    <!-- Authentication -->
+    <string name="auth_login">Entra</string>
+    <string name="auth_register">Registra\'mr</string>
+    <string name="auth_submit">Tramet</string>
+    <string name="auth_skip">Omet</string>
+    <string name="auth_send_reset_email">Envia el correu de reinici</string>
+    <string name="auth_return_to_login">Torna a la pantalla d\'inici de sessió</string>
+    <string name="auth_user_id_placeholder">Correu electrònic o nom d\'usuari</string>
+    <string name="auth_password_placeholder">Contrasenya</string>
+    <string name="auth_new_password_placeholder">Contrasenya nova</string>
+    <string name="auth_user_name_placeholder">Nom d\'usuari</string>
+    <string name="auth_add_email_message">"Afegiu un correu electrònic al vostre compte per tal que altres usuaris us trobin i per poder reiniciar la contrasenya."</string>
+    <string name="auth_add_phone_message">"Afegiu un número de telefon al vostre compte per tal que altres usuaris us trobin."</string>
+    <string name="auth_add_email_phone_message">"Afegiu un correu electrònic i/o un númerode telefon al vostre compte per tal que altres usuaris us trobin.\n\nSi afegiu un correu electrònic també us permetrà poder reiniciar la contrasenya."</string>
+    <string name="auth_add_email_and_phone_message">"Afegiu un correu electrònic i un número de telefon al vostre compte per tal que altres usuaris us trobin.\n\nSi afegiu un correu electrònic també us permetrà poder reiniciar la contrasenya."</string>
+    <string name="auth_email_placeholder">Correu electrònic</string>
+    <string name="auth_opt_email_placeholder">Correu electrònic (opcional)</string>
+    <string name="auth_phone_number_placeholder">Número de telefon</string>
+    <string name="auth_opt_phone_number_placeholder">Número de telefon (opcional)</string>
+    <string name="auth_repeat_password_placeholder">Repetiu la contrasenya</string>
+    <string name="auth_repeat_new_password_placeholder">Confirmeu la nova contrasenya</string>
+    <string name="auth_invalid_login_param">El nom d\'usuari i/o la contrasenya són incorrectes</string>
+    <string name="auth_invalid_user_name">Els noms d\'usuari només poden contenir lletres, números, punts, guionets i subratllats</string>
+    <string name="auth_invalid_password">La contrasenya és massa curta (mín 6)</string>
+    <string name="auth_missing_password">Falta la contrasenya</string>
+    <string name="auth_invalid_email">"El correu electrònic no és vàlid"</string>
+    <string name="auth_invalid_phone">"El número de telefon no és vàlid"</string>
+    <string name="auth_email_already_defined">Aquest correu electrònic ja existeix.</string>
+    <string name="auth_missing_email">Falta el correu electrònic</string>
+    <string name="auth_missing_phone">Falta el número de telefon</string>
+    <string name="auth_missing_email_or_phone">Falta el correu electrònic o el número de telefon</string>
+    <string name="auth_invalid_token">El testimoni no és vàlid</string>
+    <string name="auth_password_dont_match">Les contrasenyes no coincideixen</string>
+    <string name="auth_forgot_password">Heu oblidat la contrasenya?</string>
+    <string name="auth_use_server_options">Usa les opcions personalitzades del servidor (avançat)</string>
+    <string name="auth_email_validation_message">Comproveu el correu electrònic per continuar el procés de registre</string>
+    <string name="auth_threepid_warning_message">Registrar-se amb el correu elecrònic i el número de telefon alhora no es podrà fer fins que existeixi l\'api. Es farà el registre amb el número de telefon.\n\nPodreu afegir el correu electrònic en els paràmetres del perfil.</string>
+    <string name="auth_recaptcha_message">Aquest servidor es vol assegurar que no sou un robot</string>
+    <string name="auth_username_in_use">Aquest nom d\'usuari ja existeix</string>
+    <string name="auth_home_server">Servidor:</string>
+    <string name="auth_identity_server">Identitat del servidor:</string>
+    <string name="auth_reset_password_next_step_button">He verificat el correu electrònic</string>
+    <string name="auth_reset_password_message">Introduïu el correu electrònic associat al compte per reiniciar la contrasenya:</string>
+    <string name="auth_reset_password_missing_email">Heu d\'introduir el correu electrònic associat al vostre compte.</string>
+    <string name="auth_reset_password_missing_password">S\'ha d\'introduir una contrasenya nova.</string>
+    <string name="auth_reset_password_email_validation_message">S\'ha enviat un correu electrònic a %s. Seguiu l\'enllaç que conté i feu click aquí sota.</string>
+    <string name="auth_reset_password_error_unauthorized">No s\'ha pogut verificar l\'adreça del correu electrònic: assegureu-vos que heu fet clic a l\'enllaç del correu electrònic</string>
+    <string name="auth_reset_password_success_message">La contrasenya s\'ha reiniciat.\n\nLes sessions de tots els dispositius han estat tancades i no rebreu més notificacions automàtiques. Per tal de reactivar les notificacions, torneu a entrar en cada dispositiu.</string>
+
+    <!-- Login Screen -->
+    <string name="login_error_must_start_http">La URL ha de començar per http[s]://</string>
+    <string name="login_error_network_error">No s\'ha pogut iniciar la sessió: error de xarxa</string>
+    <string name="login_error_unable_login">No s\'ha pogut iniciar la sessió</string>
+    <string name="login_error_registration_network_error">No s\'ha pogut fer el registre: error de xarxa</string>
+    <string name="login_error_unable_register">No s\'ha pogut fer el registre</string>
+    <string name="login_error_unable_register_mail_ownership">No s\'ha pogut fer el registre: s\'ha produït una errada en la propietat del correu electrònic</string>
+    <string name="login_error_invalid_home_server">Introduïu una URL vàlida</string>
+    <string name="login_mobile_device">Mòbil</string>
+
+    <string name="login_error_forbidden">El nom d\'usuari/contrasenya és invàlid</string>
+    <string name="login_error_unknown_token">No s\'ha reconegut el testimoni d\'accés</string>
+    <string name="login_error_bad_json">JSON mal format</string>
+    <string name="login_error_not_json">No contenia un JSON vàlid</string>
+    <string name="login_error_limit_exceeded">S\'han enviat massa peticions</string>
+    <string name="login_error_user_in_use">Aquest nom d\'usuari ja està en ús</string>
+    <string name="login_error_login_email_not_yet">L\'enllaç del correu electrònic que encara no heu fet clic</string>
+
+    <!-- crypto warnings -->
+    <string name="e2e_need_log_in_again">Heu de tornar a iniciar sessió per tal de generar claus de xifrat d\'extrema a extrem per a aquest dispositiu i enviar la clau pública al servidor.\nAixò només s\'ha de fer un cop.</string>
+
+    <!-- read receipts list Screen -->
+    <string name="read_receipts_list">Llegit per</string>
+
+    <!-- Mels -->
+    <string name="membership_changes">%d canvis de membres</string>
+
+    <!-- accounts list Screen -->
+
+    <!-- image size selection -->
+    <string name="compression_options">Envia la imatge </string>
+    <string name="compression_opt_list_original">Original</string>
+    <string name="compression_opt_list_large">Gran</string>
+    <string name="compression_opt_list_medium">Mitjana</string>
+    <string name="compression_opt_list_small">Petita</string>
+
+    <!-- media upload / download messages -->
+    <string name="attachment_cancel_download">"Voleu cancel·lar la baixada?</string>
+    <string name="attachment_cancel_upload">Voleu cancel·lar la pujada?</string>
+    <string name="attachment_remaining_time_seconds">%d s</string>
+    <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
+
+    <!-- room creation dialog Screen -->
+    <string name="yesterday">Ahir</string>
+    <string name="today">Avui</string>
+
+    <!-- room info dialog Screen -->
+    <string name="room_info_room_name">Nom de la sala</string>
+    <string name="room_info_room_topic">Tema de la sala</string>
+
+    <!-- call string -->
+    <string name="call">Truca</string>
+    <string name="call_connected">Trucada establerta</string>
+    <string name="call_connecting">Establint la trucada…</string>
+    <string name="call_ended">Trucada finalitzada</string>
+    <string name="call_ring">Trucant…</string>
+    <string name="incoming_call">Trucada d\'entrada</string>
+    <string name="incoming_video_call">Vídeotrucada d\'entrada</string>
+    <string name="incoming_voice_call">Trucada de veu d\'entrada</string>
+    <string name="call_in_progress">Trucada en curs</string>
+
+    <string name="call_error_user_not_responding">No s\'està responent a la trucada.</string>
+    <string name="call_error_ice_failed">Ha fallat la connexió de mitjans</string>
+    <string name="call_error_camera_init_failed">No es pot iniciar la càmera</string>
+    <string name="call_error_answered_elsewhere">s\'ha contestat la trucada des d\'un altre lloc</string>
+
+    <!-- medias picker string -->
+    <string name="media_picker_both_capture_title">Fes una foto o un vídeo"</string>
+    <string name="media_picker_cannot_record_video">No es poden gravar vídeos"</string>
+
+    <!-- permissions Android M -->
+    <string name="permissions_rationale_popup_title">Informació</string>
+    <string name="permissions_rationale_msg_storage">Per poder enviar i desar adjunts, el Riot necessita permís d\'accés a la galeria de fotos i vídeos.\n\nA la següent finestra emergent, doneu-li el permís d\'accés i així podreu enviar fitxers des del telefon.</string>
+    <string name="permissions_rationale_msg_camera">Per poder fer fotos i vídeotrucades, el Riot necessita permís d\'accés a la càmera.</string>
+    <string name="permissions_rationale_msg_camera_explanation">\n\nA la següent finestra emergent, doneu permís d\'accés per tal de poder fer la trucada.</string>
+    <string name="permissions_rationale_msg_record_audio">Per tal de fer trucades de veu, el Riot necessita permís d\'accés al microfon.</string>
+    <string name="permissions_rationale_msg_record_audio_explanation">\n\nA la següent finestra emergent, doneu permís d\'accés per tal de poder fer la trucada.</string>
+    <string name="permissions_rationale_msg_camera_and_audio">Per tal de fer vídeotrucades, el Riot necessita permís d\'accés a la càmera i al microfon.\n\nA la següent finestra emergent, doneu permís d\'accés per tal de poder fer la trucada.</string>
+    <string name="permissions_rationale_msg_contacts">Per tal de trobar altres usuaris de Matrix a partir dels seus correus electrònics o dels seus números de telefon, el Riot necessita permís d\'accés a l\'agenda de contactes.\n\nA la següent finestra emergent, doneu permís d\'accés per trobar amb quins contactes de la teva agenda pots contactar a partir de Riot.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Per tal de trobar altres usuaris de Matrix a partir dels seus correus electrònics o dels seus números de telefon, el Riot necessita permís d\'accés a l\'agenda de contactes.\n\nPermeteu que Riot accedeixi als vostres contactes?</string>
+
+    <string name="permissions_action_not_performed_missing_permissions">No s\'ha realitzat l\'acció per falta de permisos</string>
+
+    <!-- medias slider string -->
+    <string name="media_slider_saved">Desat</string>
+    <string name="media_slider_saved_message">Desa a les baixades</string>
+    <string name="yes">SÍ</string>
+    <string name="no">NO</string>
+    <string name="_continue">Continua</string>
+
+    <!-- Actions -->
+    <string name="remove">Elimina</string>
+    <string name="join">Uneix-te</string>
+    <string name="preview">Previsualitza</string>
+    <string name="reject">Rebutja</string>
+
+    <!-- Room -->
+    <string name="room_jump_to_first_unread">Vés al primer missatge no llegit.</string>
+
+    <!-- Room Preview -->
+    <string name="room_preview_invitation_format">L\'usuari de nom %s t\'ha convidat a unir-te a aquesta sala</string>
+    <string name="room_preview_unlinked_email_warning">La invitació s\'ha enviat a però aquest correu electrònic no està associat a aquest compte %s.\nPotser voleu iniciar una sessió amb un compte diferent o afegir aquest correu electrònic a aquest compte.</string>
+    <string name="room_preview_try_join_an_unknown_room">Esteu intentant accedir a %s. Voldríeu unir-vos per tal de participar en la discussió?</string>
+    <string name="room_preview_try_join_an_unknown_room_default">una sala</string>
+    <string name="room_preview_room_interactions_disabled">Aquesta és una previsualització de la sala. Les interacions de la sala estan deshabilitades.</string>
+
+    <!-- Chat creation -->
+    <string name="room_creation_title">Xat nou</string>
+    <string name="room_creation_add_member">Afegeix un participant</string>
+    <string name="room_header_active_members">%1$d/%2$d participants actius</string>
+    <string name="room_title_members">%1$d participants</string>
+    <string name="room_title_one_member">1 participant</string>
+    <string name="room_e2e_alert_title">Avís</string>
+    <string name="room_e2e_alert_message">El xifrat d\'extrem a extrem està en beta i no és del tot fiable.\n\nNo s\'hi ha de confiar per a dades segures.\n\nEls dispositius encara no poden desxifrar l\'històric de tot allò que ha passat abans d\'unir-te a una sala.\n\nEls missatges xifrats no són visibles per aquells clients que no implementen xifratge.</string>
+
+    <!--  Time -->
+    <string name="format_time_s">s</string>
+    <string name="format_time_m">m</string>
+    <string name="format_time_h">h</string>
+    <string name="format_time_d">d</string>
+
+    <!--  Chat participants -->
+    <string name="room_participants_leave_prompt_title">Surt de la sala</string>
+    <string name="room_participants_leave_prompt_msg">Esteu segur que voleu sortir de la sala?</string>
+    <string name="room_participants_remove_prompt_msg">Esteu segur que voleu eliminar %s d\'aques xat?</string>
+    <string name="room_participants_create">Crea</string>
+
+    <string name="room_participants_online">En línia</string>
+    <string name="room_participants_offline">Fora de línia</string>
+    <string name="room_participants_idle">Inactiu</string>
+    <string name="room_participants_now">ara</string>
+    <string name="room_participants_ago">fa</string>
+
+    <string name="room_participants_header_admin_tools">EINES D\'ADMINISTRACIÓ</string>
+    <string name="room_participants_header_call">TRUCADA</string>
+    <string name="room_participants_header_direct_chats">XATS DIRECTES</string>
+    <string name="room_participants_header_devices">DISPOSITIUS</string>
+
+    <string name="room_participants_action_invite">Convida</string>
+    <string name="room_participants_action_leave">Deixa aquesta sala</string>
+    <string name="room_participants_action_remove">Elimina d\'aquesta sala</string>
+    <string name="room_participants_action_ban">Veta</string>
+    <string name="room_participants_action_unban">Treu el vet</string>
+    <string name="room_participants_action_set_default_power_level">Fes-lo usuari normal</string>
+    <string name="room_participants_action_set_moderator">Fes-lo moderador</string>
+    <string name="room_participants_action_set_admin">Fes-lo administrador</string>
+    <string name="room_participants_action_ignore">Amaga tots els missatges d\'aquest usuari</string>
+    <string name="room_participants_action_unignore">Mostra tots els missatges d\'aquest usuari</string>
+    <string name="room_participants_invite_search_another_user">ID de l\'usuari, nom o correu electrònic</string>
+    <string name="room_participants_action_mention">Menciona</string>
+    <string name="room_participants_action_devices_list">Mostra la llista de dispositius</string>
+    <string name="room_participants_power_level_prompt">No podreu desfer aquest canvi ja que esteu donant a aquest usuari els mateixos permisos que teniu.\nN\'esteu segur?</string>
+
+    <string name="room_participants_invite_prompt_msg">"Esteu segur que voleu convidar a %s a aquest xat?"</string>
+    <string name="room_participants_kick_prompt_msg">Esteu segur que voleu fer fora aquest usuari de la conversa?</string>
+    <string name="room_participants_ban_prompt_msg">Esteu segur que voleu vetar aquest usuari en aquesta conversa?</string>
+
+    <!-- invitation -->
+    <string name="people_search_invite_by_id"><u>Convida per ID</u></string>
+    <string name="people_search_local_contacts">CONTACTES LOCALS (%d)</string>
+    <string name="people_search_user_directory">DIRECTORI D\'USUARI (%s)</string>
+    <string name="people_search_filter_text">Només usuaris de Matrix</string>
+
+    <string name="people_search_invite_by_id_dialog_title">Convida un usuari per ID</string>
+    <string name="people_search_invite_by_id_dialog_description">Entreu un o més correus electrònics o IDs de Matrix</string>
+    <string name="people_search_invite_by_id_dialog_hint">Correu electrònic o ID de Matrix</string>
+
+    <!--  Chat -->
+    <string name="room_menu_search">Cerca</string>
+    <string name="room_one_user_is_typing">%s està escrivint…</string>
+    <string name="room_two_users_are_typing">%1$s &amp; %2$s estan escrivint…</string>
+    <string name="room_many_users_are_typing">%1$s &amp; %2$s &amp; altres estan escrivint…</string>
+    <string name="room_message_placeholder_encrypted">Envia un missatge xifrat…</string>
+    <string name="room_message_placeholder_not_encrypted">Envia un missatge (desxifrat)…</string>
+    <string name="room_offline_notification">La connexió amb el servidor s\'ha perdut.</string>
+    <string name="room_unsent_messages_notification">Els missatges no s\'han enviat. %1$s o %2$s ara?</string>
+    <string name="room_unknown_devices_messages_notification">Els missatges no s\'han enviat perquè hi ha disposistius desconeguts. %1$s o %2$s ara?</string>
+    <string name="room_prompt_resend">Reenvia-ho tot</string>
+    <string name="room_prompt_cancel">cancel·la-ho tot</string>
+    <string name="room_resend_unsent_messages">Reenvia els missatges no enviats</string>
+    <string name="room_delete_unsent_messages">Elimina els missatges no enviats</string>
+    <string name="room_message_file_not_found">No s\'ha trobat el fitxer</string>
+    <string name="room_do_not_have_permission_to_post">No teniu permís per escriure en aquesta sala</string>
+    <string name="room_new_message_notification">1 missatge nou</string>
+    <string name="room_new_messages_notification">%1$d missatges nous</string>
+
+    <!-- unrecognized SSL certificate -->
+    <string name="ssl_trust">Confia</string>
+    <string name="ssl_do_not_trust">No hi confiïs</string>
+    <string name="ssl_logout_account">Surt</string>
+    <string name="ssl_remain_offline">Ignora</string>
+    <string name="ssl_fingerprint_hash">Empremta digital (%s):</string>
+    <string name="ssl_could_not_verify">No s\'ha pogut verificar la identitat del servidor remot.</string>
+    <string name="ssl_cert_not_trust">Això pot voler dir que algú està interceptant el tràfic maliciosament o que aquest telefon no confia en el certificat proporcionat pel servidor remot.</string>
+    <string name="ssl_cert_new_account_expl">Si l\'administrador del servidor diu que això és correcte, assegureu-vos que la següent empremta digital coincideix amb la que us ha donat.</string>
+    <string name="ssl_unexpected_existing_expl">El certificat ha canviat respecte aquell en el qual el telefon confia. Això NO ÉS GENS HABITUAL. Es recomana que NO ACCEPTEU el certificat nou.</string>
+    <string name="ssl_expected_existing_expl">El certificat en el que confiàveu ha canviat per un en el que no confieu. El servidor pot haver renovat el certificat. Contacteu amb l\'administrador del servidor per saber l\'empremta digital esperada.</string>
+    <string name="ssl_only_accept">NOMÉS accepteu el certificat si l\'administrador del servidor ha publicat una empremta digital que coincideixi amb l\'anterior.</string>
+    <string name="ssl_fingerprint_example">00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</string>
+
+    <!-- Room Details -->
+    <string name="room_details_title">Detalls de la sala</string>
+    <string name="room_details_people">Participants</string>
+    <string name="room_details_files">Fitxers</string>
+    <string name="room_details_settings">Configuració</string>
+    <string name="room_details_selected">seleccionat</string>
+    <string name="malformed_id">L\'ID és incorrecte. Ha de ser una adreça de correu electrònic o un identificador de Matrix com \'@partlocal:domini\'</string>
+    <string name="room_details_people_invited_group_name">CONVIDATS</string>
+    <string name="room_details_people_present_group_name">S\'HAN UNIT</string>
+
+    <!-- Room events -->
+    <string name="room_event_action_report_prompt_reason">Motiu per informar d\'aquest contingut</string>
+    <string name="room_event_action_report_prompt_ignore_user">Voleu amagar tots els missatges d\'aquest usuari?</string>
+    <string name="room_event_action_cancel_upload">Cancel·la la pujada</string>
+    <string name="room_event_action_cancel_download">Cancel·la la baixada</string>
+
+    <!-- Room display name -->
+    <string name="room_displayname_invite_from">Convideu des de %s</string>
+    <string name="room_displayname_room_invite">Convideu a la sala</string>
+    <string name="room_displayname_two_members">%1$s i %2$s</string>
+    <string name="room_displayname_more_than_two_members">%1$s i %2$d més</string>
+    <string name="room_displayname_no_title">Sala buida</string>
+
+    <!-- Search -->
+    <string name="search_hint">Cerca</string>
+    <string name="search_members_hint">Filtra els participants de la sala</string>
+    <string name="search_no_results">No hi ha resultats</string>
+    <string name="tab_title_search_rooms">SALES</string>
+    <string name="tab_title_search_messages">MISSATGES</string>
+    <string name="tab_title_search_people">PARTICIPANTS</string>
+    <string name="tab_title_search_files">FITXERS</string>
+
+    <!-- Room recents -->
+    <string name="room_recents_join">UNEIX-TE</string>
+    <string name="room_recents_directory">DIRECTORI</string>
+    <string name="room_recents_favourites">PREFERITS</string>
+    <string name="room_recents_conversations">SALES</string>
+    <string name="room_recents_low_priority">PRIORITAT BAIXA</string>
+    <string name="room_recents_invites">CONVIDA</string>
+    <string name="room_recents_start_chat">Inicia un xat</string>
+    <string name="room_recents_create_room">Crea una sala</string>
+    <string name="room_recents_join_room">Uneix-te a la sala</string>
+    <string name="room_recents_join_room_title">Uneix-te a una sala</string>
+    <string name="room_recents_join_room_prompt">Escriviu un id de sala o un àlies de sala</string>
+
+    <!-- Directory -->
+    <string name="directory_search_results_title">Navega pel directpri</string>
+    <string name="directory_search_room">%1$d sala</string>
+    <string name="directory_search_rooms">%1$d sales</string>
+    <string name="directory_search_room_for">%1$d sala trobada per %2$s</string>
+    <string name="directory_search_rooms_for">%1$s sales trobades per %2$s</string>
+    <string name="directory_searching_title">Cercant al directori..</string>
+
+    <!-- home room settings -->
+    <string name="room_settings_favourite">Preferit</string>
+    <string name="room_settings_de_prioritize">Treu prioritat</string>
+    <string name="room_settings_direct_chat">Xat directe</string>
+    <string name="room_settings_leave_conversation">Deixa la conversa</string>
+    <string name="room_settings_forget">Oblida</string>
+    <string name="room_settings_add_homescreen_shortcut">Afegeix una drecera de la pantalla d\'inici</string>
+
+    <!-- home sliding menu -->
+    <string name="room_sliding_menu_messages">Missatges</string>
+    <string name="room_sliding_menu_settings">Configuració</string>
+    <string name="room_sliding_menu_version">Versió </string>
+    <string name="room_sliding_menu_term_and_conditions">Termes i condicions</string>
+    <string name="room_sliding_menu_third_party_notices">Avisos de terceres parts</string>
+    <string name="room_sliding_menu_copyright">Copyright</string>
+    <string name="room_sliding_menu_privacy_policy">Política de privacitat</string>
+
+    <!-- Vector Settings -->
+
+    <string name="settings_profile_picture">Foto del perfil</string>
+    <string name="settings_display_name">Nom a mostrar</string>
+    <string name="settings_email_address">Correu electrònic</string>
+    <string name="settings_add_email_address">Afegeix una adreça de correu electrònic</string>
+    <string name="settings_phone_number">Telèfon</string>
+    <string name="settings_add_phone_number">Afegeix un número de telèfon</string>
+    <string name="settings_summary_app_info_link">Pantalla d\'informació del sistema de l\'aplicació</string>
+    <string name="settings_title_app_info_link">Informació de l\'aplicació</string>
+
+    <string name="settings_notification_ringtone">So de les notificación</string>
+    <string name="settings_enable_all_notif">Habilita les notificacions d\'aquest compte</string>
+    <string name="settings_enable_this_device">Habilita les notificacions d\'aquest dispositiu</string>
+    <string name="settings_turn_screen_on">Encén la pantalla durant 3 segons</string>
+
+    <string name="settings_containing_my_display_name">Missatges que contenen el meu nom</string>
+    <string name="settings_containing_my_user_name">Missatges que contenen el meu nom d\'usuari</string>
+    <string name="settings_messages_in_one_to_one">Missatges en xats entre dos</string>
+    <string name="settings_messages_in_group_chat">Missatges en xats de grup</string>
+    <string name="settings_invited_to_room">Quan em convidin a una sala</string>
+    <string name="settings_call_invitations">Invitacions de trucada</string>
+    <string name="settings_messages_sent_by_bot">Missatges enviats per un bot</string>
+
+    <string name="settings_start_on_boot">Inicia en arrencar</string>
+    <string name="settings_background_sync">Sincronització en segon pla</string>
+    <string name="settings_enable_background_sync">Habilita la sincronització en segon pla</string>
+    <string name="settings_set_sync_timeout">Temps màxim d\'espera de la petició de sincronització</string>
+    <string name="settings_set_sync_delay">Temps entre dues peticions de sincronització</string>
+    <string name="settings_second">segon</string>
+    <string name="settings_seconds">segons</string>
+
+    <string name="settings_version">Versió</string>
+    <string name="settings_olm_version">Versió d\'OLM</string>
+    <string name="settings_app_term_conditions">Termes i condicions</string>
+    <string name="settings_third_party_notices">Avisos de terceres parts</string>
+    <string name="settings_copyright">Copyright</string>
+    <string name="settings_privacy_policy">Política de privacitat</string>
+    <string name="settings_clear_cache">Esborra la memòria cau</string>
+    <string name="settings_clear_medias_cache">Esborra la memòria cau multimèdia</string>
+    <string name="settings_keep_media">Manté els elements multimèdia</string>
+
+    <string name="settings_user_settings">Configuració de l\'usuari</string>
+    <string name="settings_notifications">Notificacions</string>
+    <string name="settings_ignored_users">Usuaris ignorats</string>
+    <string name="settings_other">Altres</string>
+    <string name="settings_advanced">Avançat</string>
+    <string name="settings_cryptography">Criptografia</string>
+    <string name="settings_notifications_targets">Objectius de les notificacions</string>
+    <string name="settings_contact">Contactes locals</string>
+    <string name="settings_contacts_app_permission">Permís dels contactes</string>
+    <string name="settings_contacts_phonebook_country">País de l\'agenda de telèfons</string>
+    <string name="settings_home_display">Pantalla d\'inici</string>
+    <string name="settings_pin_missed_notifications">Destaca les sales amb notificacions sense llegir</string>
+    <string name="settings_pin_unread_messages">Destaca les sales amb missatges sense llegir</string>
+    <string name="settings_devices_list">Dispositius</string>
+    <string name="settings_inline_url_preview">Habilita les previsualitzacions de les URL per defecte</string>
+    <string name="settings_hide_read_receipts">Amaga les entrades llegides</string>
+    <string name="settings_dont_send_typings_notifs">No enviïs notificacions d\'esciptura</string>
+    <string name="settings_always_show_timestamps">Mostra sempre l\'hora dels missatges</string>
+    <string name="settings_12_24_timestamps">Mostra l\'hora en el format de 12 hores (per exemple 2:30pm)</string>
+    <string name="settings_hide_join_leave_messages">Amaga els missatges d\'entrada i sortida de participants</string>
+    <string name="settings_hide_avatar_display_name_changes_messages">Amaga les fotos de perfil i els canvis de nom visible</string>
+    <string name="settings_disable_markdown">Desactivar el Markdown quan s\'enviï</string>
+    <string name="settings_vibrate_on_mention">Vibra quan et mencionin</string>
+
+    <!-- analytics -->
+    <string name="settings_analytics">Analítiques</string>
+    <string name="settings_opt_out_of_analytics">No acceptis analítiques</string>
+    <string name="settings_opt_out_of_analytics_summary">Riot recull analítiques anònimes per ajudar a millorar l\'aplicació.</string>
+
+    <string name="settings_data_save_mode">Mode de desament de dades</string>
+
+    <string name="devices_details_dialog_title">Detalls del dispositiu</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="devices_details_name_title">Nom</string>
+    <string name="devices_details_device_name">Nom del dispositiu</string>
+    <string name="devices_details_last_seen_title">Últim cop vist</string>
+    <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
+    <string name="devices_details_time_format">HH:mm:ss</string>
+    <string name="devices_delete_dialog_text">Aquesta operació necessita que us autentiqueu.\nPer tal de continuar, introduïu la vostra contrasenya.</string>
+    <string name="devices_delete_dialog_title">Autenticació</string>
+    <string name="devices_delete_pswd">Contrasenya:</string>
+    <string name="devices_delete_submit_button_label">Tramet</string>
+
+    <string name="settings_logged_in">Registrat com a</string>
+    <string name="settings_home_server">Servidor</string>
+    <string name="settings_identity_server">Identitat del servidor</string>
+
+    <string name="settings_user_interface">Interfície d\'usuari</string>
+    <string name="settings_interface_language">Idioma de la interfície</string>
+    <string name="settings_select_language">Tria un idioma</string>
+
+    <string name="account_email_validation_title">Verificació pendent</string>
+    <string name="account_email_validation_message">Mireu el correu electrònic feu clic en l\'enllaç que s\'ha enviat. Un cop fet això, feu clic per continuar.</string>
+    <string name="account_email_validation_error">No ha estat possible verificar l\'adreça de correu electrònic. Mireu el correu electrònic feu clic en l\'enllaç que s\'ha enviat. Un cop fet això, feu clic per continuar</string>
+    <string name="account_email_already_used_error">Aquest correu electrònic ja està en us</string>
+    <string name="account_email_not_found_error">No s\'ha pogut enviar el missatge: no s\'ha trobat el destinatari</string>
+    <string name="account_phone_number_already_used_error">Aquest número de telèfon ja està en us</string>
+
+    <string name="settings_change_password">Canvia la contrasenya</string>
+    <string name="settings_old_password">contrasenya antiga</string>
+    <string name="settings_new_password">contrasenya nova</string>
+    <string name="settings_confirm_password">confirma la contrasenya</string>
+    <string name="settings_fail_to_update_password">No s\'ha pogut actualitzar la contrasenya</string>
+    <string name="settings_password_updated">La contrasenya s\'ha actualitzat</string>
+    <string name="settings_unignore_user">Mostra tots els missatges des de %s?</string>
+
+    <string name="settings_delete_notification_targets_confirmation">Esteu segur que voleu esborrar aquesta notificació?</string>
+
+    <string name="settings_delete_threepid_confirmation">Esteu segur que voleu esborrar el %1$s %2$s?</string>
+
+    <string name="settings_select_country">Escull un país</string>
+
+    <string name="settings_phone_number_country_label">País</string>
+    <string name="settings_phone_number_country_error">Escolliu un país</string>
+    <string name="settings_phone_number_label">Número de telèfon</string>
+    <string name="settings_phone_number_error">El número de telèfon no és vàlid per al país escollit</string>
+    <string name="settings_phone_number_verification">Verificació del telèfon</string>
+    <string name="settings_phone_number_verification_instruction">"S\'ha enviat un SMS amb un codi d\'activació. Introduïu aquest a continuació."</string>
+    <string name="settings_phone_number_verification_error_empty_code">Introduïu un codi d\'activació</string>
+    <string name="settings_phone_number_verification_error">S\'ha produït un error mentre es validava el número de telèfon</string>
+    <string name="settings_phone_number_code">Codi</string>
+
+
+    <string name="settings_flair">Estil</string>
+
+    <!-- medias saving settings -->
+    <string name="media_saving_period_3_days">Tres dies</string>
+    <string name="media_saving_period_1_week">Una setmana</string>
+    <string name="media_saving_period_1_month">Un mes</string>
+    <string name="media_saving_period_forever">Per sempre</string>
+
+    <!-- Room Settings -->
+
+    <!-- room global settings-->
+    <string name="room_settings_room_photo">Foto de la sala</string>
+    <string name="room_settings_room_name">Nom de la sala</string>
+    <string name="room_settings_topic">Tema</string>
+    <string name="room_settings_room_tag">Etiqueta de la sala</string>
+    <string name="room_settings_tag_pref_dialog_title">Etiquetat com a:</string>
+
+    <!-- Room settings: Room tag -->
+    <string name="room_settings_tag_pref_entry_favourite">Preferit</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Prioritat baixa</string>
+    <string name="room_settings_tag_pref_entry_none">Cap</string>
+    <string name="room_settings_tag_pref_no_tag">sense etiquetar</string>
+    <string name="room_settings_tag_pref_entry_value_favourite">preferit</string>
+    <string name="room_settings_tag_pref_entry_value_low_priority">baixa</string>
+    <string name="room_settings_tag_pref_entry_value_none">cap</string>
+
+    <!-- room settings : access and visibility -->
+    <string name="room_settings_category_access_visibility_title">Accés i visibilitat</string>
+    <string name="room_settings_directory_visibility">Mostra aquesta sala al directori de sales</string>
+    <string name="room_settings_room_access_rules_pref_title">Accés a la sala</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Permisos de lectura de l\'històric de la sala</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Qui pot llegir l\'històric?</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">Qui pot accedir a la sala?</string>
+
+    <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
+    <string name="room_settings_read_history_entry_anyone">Ningú</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Només els participants (a partir del moment en què es selecciona aquesta opció)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Només els participants (des de que són convidats)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Només els participants (des de que s\'uneixen a la sala)</string>
+
+    <!-- Room settings: "Who can access this room?" (access rule) -->
+    <string name="room_settings_room_access_warning">La sala ha de tenir una adreça per tal d\'unir-s\'hi.</string>
+    <string name="room_settings_room_access_entry_only_invited">Només les persones convidades</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Qualsevol que conegui l\'enllaç de la sala, excepte els convidats</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Qualsevol que conegui l\'enllaç de la sala, inclosos els convidats</string>
+
+    <!-- Room settings: banned users -->
+    <string name="room_settings_banned_users_title">Usuaris vetats</string>
+
+    <!-- advanced -->
+    <string name="room_settings_category_advanced_title">Avançat</string>
+    <string name="room_settings_room_internal_id">Id intern de la sala</string>
+    <string name="room_settings_addresses_pref_title">Adreces</string>
+    <string name="room_settings_labs_pref_title">Laboratori</string>
+    <string name="room_settings_labs_warning_message">Aquestes característiques són experimentals i poden fallar de forma inesperada. Useu amb precaució.</string>
+    <string name="room_settings_labs_end_to_end">Encriptació d\'extrem a extrem</string>
+    <string name="room_settings_labs_end_to_end_is_active">L\'encriptació d\'extrem a extrem està acitva</string>
+    <string name="room_settings_labs_end_to_end_warnings">Necessiteu desconnectar-vos per poder habilitar l\'encriptació.</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">Encripta només per a dispositius verificats</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">No enviïs missatges encriptats en aquesta sala des d\'aquest dispositiu a dispositius no verificats.</string>
+
+    <!-- Room settings: advanced addresses -->
+    <string name="room_settings_addresses_no_local_addresses">Aquesta sala no té adreces locals</string>
+    <string name="room_settings_addresses_add_new_address">Adreça nova (per exemple #foo:matrix.org")</string>
+
+    <string name="room_settings_no_flair"> Aquesta sala no pertany a cap comunitat</string>
+    <string name="room_settings_add_new_group">Nova ID de comunitat (per exemple +foo:matrix.org")</string>
+    <string name="room_settings_invalid_group_format_dialog_title">l\'ID de comunitat és invalid</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' no és una ID de comunitat vàlida</string>
+
+
+    <string name="room_settings_addresses_invalid_format_dialog_title">Format d\'àlies invàlid</string>
+    <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' no és un format d\'àlies vàlid</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_msg">No tindreu especificada una adreça principal. El nom de la sala per defecte serà un nom a l\'atzar"</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_title">Avisos de l\'adreça principal</string>
+
+    <string name="room_settings_set_main_address">Estableix com a adreça principal</string>
+    <string name="room_settings_unset_main_address">Treu com a adreça principal</string>
+    <string name="room_settings_copy_room_id">Copia l\'ID de la sala</string>
+    <string name="room_settings_copy_room_address">Copia l\'adreça de la sala</string>
+
+    <string name="room_settings_addresses_e2e_enabled">L\'encriptació està activada en aquesta sala.</string>
+    <string name="room_settings_addresses_e2e_disabled">L\'encriptació està desactivada en aquesta sala.</string>
+    <string name="room_settings_addresses_e2e_encryption_warning">Activa l\'encriptació \n(avís: no es podrà tornar a desactivar!)</string>
+    <string name="room_settings_addresses_e2e_prompt_title">Avís!</string>
+    <string name="room_settings_addresses_e2e_prompt_message">L\'encriptació d\'extrem a extrem està en fase beta i no és del tot fiable.\n\nEncara no hi heu de confiar per enviar dades de manera segura.\n\nEls dispositius encara no poden desencriptar l\'històric anterior a unir-se a la sala.\n\nUn cop s\'ha activat l\'encriptació no es pot tornar a desactivar (de moment).\n\nEls missatges encriptats no són visibles en clients que encara no implementen l\'encriptació.</string>
+
+    <!-- Directory -->
+    <string name="directory_title">Directori</string>
+    <string name="settings_theme">Tema</string>
+
+    <!-- matrix error -->
+    <string name="failed_to_load_timeline_position">%s ha intentat carregar un moment concret de la línia de temps d\'aquesta sala però no l\'ha trobat.</string>
+
+    <!-- encryption dialog -->
+    <string name="encryption_information_title">Informació de l\'encriptació d\'extrem a extrem</string>
+
+    <string name="encryption_information_device_info">Informació d\'esdeveniment</string>
+    <string name="encryption_information_user_id">Id de l\'usuari</string>
+    <string name="encryption_information_curve25519_identity_key">Clau de la identitat Curve25519</string>
+    <string name="encryption_information_claimed_ed25519_fingerprint_key">Empremta digital Ed25519 reclamada</string>
+    <string name="encryption_information_algorithm">Algoritme</string>
+    <string name="encryption_information_session_id">ID de la sessió</string>
+    <string name="encryption_information_decryption_error">Error de desencriptació</string>
+
+    <string name="encryption_information_sender_device_information">Informació del dispositiu que envia</string>
+    <string name="encryption_information_device_name">Nom del dispositiu</string>
+    <string name="encryption_information_name">Nom</string>
+    <string name="encryption_information_device_id">ID del dispositiu</string>
+    <string name="encryption_information_device_key">Clau del dispositiu</string>
+    <string name="encryption_information_verification">Verificació</string>
+    <string name="encryption_information_ed25519_fingerprint">Empremta digital Ed25519</string>
+
+    <string name="encryption_export_e2e_room_keys">Exporta les claus de la sala E2E</string>
+    <string name="encryption_export_room_keys">Exporta les claus de la sala</string>
+    <string name="encryption_export_room_keys_summary">Exporta les claus a un fitxer local</string>
+    <string name="encryption_export_export">Exporta</string>
+    <string name="encryption_export_enter_passphrase">Introduïu una contrasenya</string>
+    <string name="encryption_export_confirm_passphrase">Confirmeu la contrasenya</string>
+    <string name="encryption_export_saved_as">Les claus E2E de la sala s\'han desat a \'%s\'</string>
+
+    <string name="encryption_import_e2e_room_keys">Importa les claus E2E de la sala</string>
+    <string name="encryption_import_room_keys">Importa les claus de la sala</string>
+    <string name="encryption_import_room_keys_summary">Importa les claus de la sala des d\'un fitxer local</string>
+    <string name="encryption_import_import">Importa</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Encripta només per a dispositius verificats</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">No enviïs mai missatges encriptats a dispositius no verificats des d\'aquest dispositiu</string>
+
+    <string name="encryption_information_not_verified">NO verificat</string>
+    <string name="encryption_information_verified">Verificat</string>
+    <string name="encryption_information_blocked">Bloquejat</string>
+
+    <string name="encryption_information_unknown_device">dispositiu desconegut</string>
+    <string name="encryption_information_none">cap</string>
+
+    <string name="encryption_information_verify">Verifica</string>
+    <string name="encryption_information_unverify">No verifiquis</string>
+    <string name="encryption_information_block">Bloqueja</string>
+    <string name="encryption_information_unblock">Deixa de bloquejar</string>
+
+    <string name="encryption_information_verify_device">Verifica el dispositiu</string>
+    <string name="encryption_information_verify_device_warning"> Per tal de verificar que es pot confiar amb aquest dispositiu, contacteu amb el seu propietari per algun altre mitjà (per exemple en persona o trucant-lo) i pregunteu-li si la clau que veu a les seves preferències d\'usuari coincideix amb la clau següent:</string>
+    <string name="encryption_information_verify_device_warning2">Si coincideix, prem el botó per verificar. Si no coincideix, algú està interceptant aquest dispositiu i probablement voleu prémer el botó per bloquejar-lo. En un futur aquest procés de verificació serà més sofisticat.</string>
+    <string name="encryption_information_verify_key_match">Verifica que les claus coincideixen</string>
+
+    <string name="e2e_enabling_on_app_update">El Riot ara permet l\'ús d\'encriptació d\'extrem a extrem però us heu de tronar a connectar per tal d\'activar-la.\n\nHo podeu fer ara o més tard des de les preferències de l\'aplicació.</string>
+
+    <!-- unknown devices management -->
+    <string name="unknown_devices_alert_title">La sala conté dispositius desconeguts</string>
+    <string name="unknown_devices_alert_message">Aquesta sala conté dispositius desconeguts que no han estat verificats.\nAixò vol dir que no hi ha cap garantia que aquests dispositius siguin dels usuaris corresponents.\nEs recomana que feu el procés de verificació per a cada dispositiu abans de continuar, tot i que, si ho preferiu, podeu reenviar el missatge sense verificar.\n\nDispositius desconeguts:</string>
+
+    <!-- directory activity  -->
+    <string name="select_room_directory">Escolliu un directori de sale</string>
+    <string name="directory_server_fail_to_retrieve_server">És possible que el servidor no estigui disponible o que estigui sobrecarregat</string>
+    <string name="directory_server_type_homeserver">Introdueix un servidor per veure les seves sales públiques</string>
+    <string name="directory_server_placeholder">URL del servidor</string>
+    <string name="directory_server_all_rooms_on_server">Totes les sales del servidor %s</string>
+    <string name="directory_server_native_rooms">Totes les sales natives de %s</string>
+
+    <!-- Notifications -->
+    <string name="notification_unread_notified_messages">%d notificacions de missatges sense llegir</string>
+    <string name="notification_unread_notified_messages_in_room">%1$d notificacions sense llegir de missatges en %2$d sales"</string>
+
+    <!-- historical -->
+    <string name="historical_placeholder">Busca a l\'històric</string>
+
+    <!-- text size selection -->
+    <string name="font_size">Mida de la font</string>
+    <string name="tiny">Molt petita</string>
+    <string name="small">Petita</string>
+    <string name="normal">Normal</string>
+    <string name="large">Gran</string>
+    <string name="larger">Molt gran</string>
+    <string name="largest">Més gran</string>
+    <string name="huge">Enorme</string>
+
+    <!-- Widget-->
+    <string name="widget_no_power_to_manage">No teniu permisos per a gestionar ginys en aquesta sala</string>
+    <string name="widget_creation_failure">Ha fallat la creació del giny</string>
+    <string name="event_formatter_widget_added">%1$s afegit per %2$s</string>
+    <string name="event_formatter_widget_removed">%1$s retirat per %2$s</string>
+    <string name="settings_labs_create_conference_with_jitsi">Fes conferències amb jitsi</string>
+    <string name="widget_delete_message_confirmation">Confirmeu que voleu esborrar el giny?</string>
+    <string name="active_widgets">%1$d ginys actius</string>
+
+    // Widget Integration Manager
+    <string name="widget_integration_unable_to_create">No s\'ha pogut crear el giny.</string>
+    <string name="widget_integration_failed_to_send_request">No s\'ha pogut enviar la sol·licitud.</string>
+    <string name="widget_integration_positive_power_level">El nivell de potència ha de ser un enter positiu.</string>
+    <string name="widget_integration_must_be_in_room">No us tobeu a aqueta sala.</string>
+    <string name="widget_integration_no_permission_in_room">No teniu el permis per fer això en aquesta sala.</string>
+    <string name="widget_integration_missing_room_id">Falta l\'ID de la sala en la sol·licitud.</string>
+    <string name="widget_integration_missing_user_id">Falta l\'ID d\'usuari en la sol·licitud.</string>
+    <string name="widget_integration_room_not_visible">La sala %s no és visible.</string>
+    <string name="settings_labs_matrix_apps">Aplicacions de Matrix</string>
+    <string name="room_add_matrix_apps">Afegeix aplicacions de Matrix</string>
+    <string name="settings_labs_native_camera">Utilitza la càmera nativa</string>
+
+    // share keys
+    <string name="you_added_a_new_device">El nou dispositiu \'%s\' que heu afegit, sol·licita les claus d\'encriptació.</string>
+    <string name="your_unverified_device_requesting">El vostre dispositiu \'%s\' sense verificar, sol·licita les claus d\'encriptació.</string>
+    <string name="start_verification">Inicia la verificació</string>
+    <string name="share_without_verifying">Comparteix sense verificar</string>
+    <string name="ignore_request">Ignora la sol·licitut</string>
+
+    // conference call
+    <string name="conference_call_warning_title">Avís!</string>
+    <string name="conference_call_warning_message">Les trucades per a conferències estan en desenvolupament i poden no ser fiables.</string>
+
+    // slash commands
+    <string name="command_error">Error de comandament</string>
+    <string name="unrecognized_command">Ordre no reconegut: %s</string>
+
+    // notification statuses
+    <string name="notification_off">Apagat</string>
+    <string name="notification_on">Encès</string>
+    <string name="notification_noisy">Sorrollós</string>
+
+    <string name="encrypted_message">Missatge encriptat</string>
+
+    // groups creation
+    <string name="create">Crea</string>
+    <string name="create_community">Crea una comunitat</string>
+    <string name="community_name">Nom de la comunitat</string>
+    <string name="community_name_hint">Exemple</string>
+    <string name="community_id">ID de la comunitat</string>
+    <string name="community_id_hint">exemple</string>
+
+    // group details
+    <string name="group_details_home">Inici</string>
+    <string name="group_details_people">Usuaris</string>
+    <string name="group_details_rooms">Sales</string>
+    <string name="no_users_placeholder">Sense usuaris</string>
+
+    <string name="rooms">Sales</string>
+    <string name="joined">S\'hi ha unit</string>
+    <string name="invited">Ha sigut convidat</string>
+    <string name="filter_group_members">Filtre de participants de grups</string>
+    <string name="filter_group_rooms">Filte de grups de sales</string>
+
+    <string name="group_one_member">1 membre</string>
+    <string name="group_members">%d membres</string>
+
+    <string name="group_one_room">Una sala</string>
+    <string name="group_rooms">%d sales</string>
+    <string name="group_no_long_description">L\'administrador de la comunitat no ha fet una descripció llarga per aquesta comunitat.</string>
+
+    <string name="one_new_message">Un nou missatge</string>
+    <string name="new_messages">%d nous missatges</string>
+
+    <string name="has_been_kicked">%2$s l\'ha fet fora de la sala %1$s</string>
+    <string name="has_been_banned">%2$s l\'ha expulsat de la sala %1$s</string>
+    <string name="reason_colon">Raó: %1$s</string>
+    <string name="rejoin">Tornar-hi a entrar</string>
+    <string name="forget_room">Oblida la sala</string>
+<string name="loading">Carregant...</string>
+
+    <string name="action_exit">Surt</string>
+    <string name="bottom_action_groups">Comunitats</string>
+
+    <string name="groups_list">Llista de grups</string>
+
+    <string name="room_settings_all_messages_noisy">Tots els missatges (sorollós)</string>
+    <string name="room_settings_all_messages">Tots els missatges</string>
+    <string name="room_settings_mention_only">Només citacions</string>
+    <string name="room_settings_mute">Silencia</string>
+    <string name="room_settings_room_notifications_title">Notificacions</string>
+    </resources>
diff --git a/vector/src/main/res/values-da/strings.xml b/vector/src/main/res/values-da/strings.xml
index 2fa19158d3..aa3afd4da2 100644
--- a/vector/src/main/res/values-da/strings.xml
+++ b/vector/src/main/res/values-da/strings.xml
@@ -233,9 +233,6 @@ Beklager ulejligheden.</string>
     <string name="room_info_room_name">Rum navn</string>
     <string name="room_info_room_topic">Rum emne</string>
 
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <string name="call">Opkald</string>
     <string name="call_connected">Opkald forbundet</string>
     <string name="call_connecting">Opkald forbinder…</string>
@@ -250,11 +247,6 @@ Beklager ulejligheden.</string>
     <string name="call_error_ice_failed">Medie Forbindelse Mislykkedes</string>
     <string name="call_error_camera_init_failed">Kan ikke starte kameraet</string>
     <string name="call_error_answered_elsewhere">opkald besvaret et andet sted</string>
-    <string name="call_error_peer_hangup_elsewhere">opkald afsluttet et andet sted</string>
-    <string name="call_error_peer_cancelled_call">opkald afbrudt</string>
-
-    <string name="action_accept">ACCEPTER</string>
-    <string name="action_ignore">IGNORÉR</string>
 
     <string name="media_picker_both_capture_title">Tag et billede eller optag en video</string>
     <string name="media_picker_cannot_record_video">Kan ikke optage video</string>
@@ -391,4 +383,19 @@ Er du sikker?</string>
     <string name="ssl_cert_not_trust">Dette kan betyde at nogen med onde hensigter opsnapper din trafik eller at din telefon ikke stoler på certifikatet som serveren sendte.</string>
     <string name="ssl_cert_new_account_expl">Hvis serveradministratoren har sagt det er forventeligt skal du sikre dig at fingeraftrykket forneden passer med det fingeraftryk de har oplyst.</string>
     <string name="ssl_unexpected_existing_expl">Certifikatet har ændret sig fra det din telefon stolede på. Dette er HØJST USÆDVANLIGT. Det anbefales at du IKKE ACCEPTERE dette nye certifikat.</string>
+    <string name="title_activity_bug_report">Nug rapport</string>
+
+    <string name="read_receipts_list">Kvitteringer for læsning</string>
+
+    <string name="ssl_expected_existing_expl">Certifikatet er ændret fra et tidligere betroet, til et der ikke er betroet. Serveren kan have fornyet sit certifikat. Kontakt server administratoren for det forventede fingeraftryk.</string>
+    <string name="ssl_only_accept">Accepter kun certifikatet hvis server administratoren har publiceret et fingeraftryk der matcher det ovenstående.</string>
+    <string name="ssl_fingerprint_example">00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</string>
+
+    <string name="room_details_title">Detaljer for rummet</string>
+    <string name="room_details_people">Personer</string>
+    <string name="room_details_files">Filer</string>
+    <string name="room_details_settings">Indstillinger</string>
+    <string name="room_details_selected">valgte</string>
+    <string name="malformed_id">Ugyldigt ID. Det skal være en e-mail adresse eller et Matrix ID som \'@lokaldel:domæne\'</string>
+    <string name="room_details_people_invited_group_name">INVITERET</string>
     </resources>
diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml
index 5bb41f9872..1db6eea8e9 100644
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@@ -236,10 +236,6 @@ Du wurdest auf allen Geräten abgemeldet und wirst keine Push-Benachrichtigungen
     <string name="room_info_room_name">Raumname</string>
     <string name="room_info_room_topic">Raum-Thema</string>
 
-    <!-- Settings keys -->
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <!-- call string -->
     <string name="call_connected">Anruf verbunden</string>
     <string name="call_connecting">Verbindungsaufbau…</string>
@@ -254,11 +250,6 @@ Du wurdest auf allen Geräten abgemeldet und wirst keine Push-Benachrichtigungen
     <string name="call_error_ice_failed">Medien-Verbindung fehlgeschlagen</string>
     <string name="call_error_camera_init_failed">Kann Kamera nicht initialisieren</string>
     <string name="call_error_answered_elsewhere">Anruf woanders entgegengenommen</string>
-    <string name="call_error_peer_hangup_elsewhere">Anruf woanders aufgelegt</string>
-    <string name="call_error_peer_cancelled_call">Anruf abgebrochen</string>
-
-    <string name="action_accept">Akzeptieren</string>
-    <string name="action_ignore">Ignorieren</string>
 
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Foto oder Video aufnehmen</string>
@@ -457,7 +448,6 @@ Bist du sicher?</string>
     <string name="directory_searching_title">Verzeichnis wird durchsucht..</string>
 
     <!-- home room settings -->
-    <string name="room_settings_notifications">Benachrichtigungen</string>
     <string name="room_settings_favourite">Favorit</string>
     <string name="room_settings_de_prioritize">Niedrige Priorität</string>
     <string name="room_settings_direct_chat">Direkter Chat</string>
@@ -580,7 +570,6 @@ Bist du sicher?</string>
     <string name="room_settings_topic">Thema</string>
     <string name="room_settings_room_tag">Raum-Markierung</string>
     <string name="room_settings_tag_pref_dialog_title">Markiert als:</string>
-    <string name="room_settings_mute_notifs">Benachrichtigungen stummschalten</string>
 
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Favorit</string>
@@ -750,7 +739,7 @@ Unbekannte Geräte:</string>
     <string name="settings_hide_read_receipts">Lesebestätigungen verbergen</string>
     <string name="settings_dont_send_typings_notifs">Sende nicht, dass ich tippe</string>
     <string name="settings_always_show_timestamps">Nachrichten-Zeitstempel immer anzeigen</string>
-    <string name="settings_disable_markdown">Markdown-Formatierung deaktivieren</string>
+    <string name="settings_disable_markdown">Markdown-Formatierung beim Senden deaktivieren</string>
 
     <string name="media_saving_period_3_days">3 Tage</string>
     <string name="media_saving_period_1_week">1 Woche</string>
@@ -786,9 +775,7 @@ Unbekannte Geräte:</string>
     <string name="active_widgets">%1$d aktive Widgets</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">Du benötigst die Berechtigung, Benutzer einzuladen, um diese Aktion ausführen zu können.</string>
     <string name="widget_integration_unable_to_create">Widget konnte nicht erstellt werden.</string>
-    <string name="widget_integration_room_not_recognised">Dieser Raum wurde nicht erkannt.</string>
     <string name="widget_integration_positive_power_level">Berechtigungslevel muss eine positive ganze Zahl sein.</string>
     <string name="widget_integration_must_be_in_room">Du bist nicht Mitglied in diesem Raum.</string>
     <string name="widget_integration_no_permission_in_room">Du hast keine Berechtigung, diese Aktion in diesem Raum auszuführen.</string>
@@ -796,8 +783,7 @@ Unbekannte Geräte:</string>
     <string name="widget_integration_room_not_visible">Raum %s ist nicht sichtbar.</string>
     <string name="settings_labs_matrix_apps">Matrix-Apps</string>
     <string name="room_add_matrix_apps">Matrix-Apps hinzufügen</string>
-    <string name="add_matrix_apps_not_supported">Wird auf diesem Gerät nicht unterstützt</string>
-<string name="settings_notification_ringtone">Benachrichtigungston</string>
+    <string name="settings_notification_ringtone">Benachrichtigungston</string>
     <string name="widget_integration_failed_to_send_request">Anfrage konnte nicht gesendet werden.</string>
     <string name="widget_integration_missing_user_id">Anfrage enthält keine user_id.</string>
     <string name="light_theme">Helles Thema</string>
@@ -832,4 +818,94 @@ Unbekannte Geräte:</string>
 
 <string name="settings_analytics">Anonymisierte Analysedaten</string>
     <string name="settings_opt_out_of_analytics">Zustimmung zur Übermittlung von anonymisierten Analysedaten verweigern</string>
+    <string name="title_activity_bug_report">Fehlerbericht</string>
+
+    <string name="conference_call_warning_title">Warnung!</string>
+    <string name="conference_call_warning_message">Konferenzgespräche werden noch entwickelt und sind vielleicht nicht zuverlässig.</string>
+
+    // slash commands
+    <string name="command_error">Befehlsfehler</string>
+    <string name="unrecognized_command">Unbekanntes Kommando: %s</string>
+
+    // notification statuses
+    <string name="notification_off">Aus</string>
+    <string name="notification_on">An</string>
+    <string name="notification_noisy">Laut</string>
+
+    <string name="encrypted_message">Verschlüsselte Nachricht</string>
+
+<string name="title_activity_group_details">Community-Details</string>
+
+    <string name="loading">Lädt...</string>
+
+    <string name="action_exit">Schließen</string>
+    <string name="bottom_action_groups">Communities</string>
+
+    <string name="home_filter_placeholder_groups">Nach Communities suchen</string>
+
+    <string name="groups_invite_header">Einladen</string>
+    <string name="groups_header">Communities</string>
+    <string name="no_group_placeholder">Keine Gruppen</string>
+
+    <string name="start_new_chat_prompt_msg">Bist du sicher, dass du einen neuen Chat mit %s starten möchtest?</string>
+    <string name="start_voice_call_prompt_msg">Bist du sicher, dass du einen Sprachanruf starten möchtest?</string>
+    <string name="start_video_call_prompt_msg">Bist du sicher, dass du einen Videoanruf starten möchtest?</string>
+
+    <string name="groups_list">Gruppenliste</string>
+
+    <string name="room_participants_kick_prompt_msg">Bist du sicher, dass du diesen Nutzer aus diesem Chat kicken möchtest?</string>
+    <string name="room_participants_ban_prompt_msg">Bist du sicher, dass du diesen Nutzer aus diesem Chat verbannen möchtest?</string>
+
+    <string name="room_settings_all_messages_noisy">Alle Nachrichten (laut)</string>
+    <string name="room_settings_all_messages">Alle Nachrichten</string>
+    <string name="room_settings_mention_only">Nur Erwähnungen</string>
+    <string name="room_settings_mute">Stumm</string>
+    <string name="settings_inline_url_preview">Aktiviere URL-Vorschau im Chat standardmäßig</string>
+    <string name="settings_vibrate_on_mention">Vibriere beim Erwähnen</string>
+
+    <string name="room_settings_room_notifications_title">Benachrichtigungen</string>
+    <string name="room_settings_no_flair">" Dieser Raum zeigt keine Flairs für irgendeine Community"</string>
+    <string name="room_settings_add_new_group">Neue Community-ID (z.B. +foo:matrix.org)</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Ungültige Community-ID</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' ist keine valide Community-ID</string>
+
+
+    <string name="create">Erstellen</string>
+    <string name="create_community">Erstelle Community</string>
+    <string name="community_name">Community-Name</string>
+    <string name="community_name_hint">Beispiel</string>
+    <string name="community_id">Community-ID</string>
+    <string name="community_id_hint">Beispiel</string>
+
+    // group details
+    <string name="group_details_home">Startseite</string>
+    <string name="group_details_people">Personen</string>
+    <string name="group_details_rooms">Räume</string>
+    <string name="no_users_placeholder">Keine Benutzer</string>
+
+    <string name="rooms">Räume</string>
+    <string name="joined">Beigetreten</string>
+    <string name="invited">Eingeladen</string>
+    <string name="filter_group_members">Filter Gruppen-Mitglieder</string>
+    <string name="filter_group_rooms">Filter Gruppen-Räume</string>
+
+    <string name="group_one_member">1 Mitglied</string>
+    <string name="group_members">%d Mitglieder</string>
+
+    <string name="group_one_room">1 Raum</string>
+    <string name="group_rooms">%d Räume</string>
+    <string name="group_no_long_description">Der Community-Administrator hat keine lange Beschreibung für diese Community zur Verfügung gestellt.</string>
+
+    <string name="one_new_message">1 neue Nachricht</string>
+    <string name="new_messages">%d neue Nachrichten</string>
+
+    <string name="has_been_kicked">Du wurdest von %2$s aus %1$s gekickt</string>
+    <string name="has_been_banned">Du wurdest von %2$s aus %1$s verbannt</string>
+    <string name="reason_colon">Grund: %1$s</string>
+    <string name="rejoin">Erneut beitreten</string>
+    <string name="forget_room">Raum vergessen</string>
+<string name="room_settings_add_homescreen_shortcut">Startbildschirm-Verknüpfung hinzufügen</string>
+
+    <string name="settings_flair">Flair</string>
+
     </resources>
diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml
index 904654776d..973720bf04 100644
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@@ -106,7 +106,7 @@ Seleccione exportar para crear un archivo de respaldo antes de cerrar la sesión
     <string name="send_bug_report_description">Por favor describe el error. ¿Qué hiciste? ¿Qué esperabas que sucediera, qué sucedió realmente?</string>
     <string name="send_bug_report_placeholder">Describe tu problema aquí</string>
     <string name="send_bug_report_logs_description">Para la diagnostica de problemas, informes de este cliente se enviarán junto a este reporte de error. Si prefiere solamente enviar el texto de arriba, desmarque:</string>
-    <string name="send_bug_report_alert_message">Pareces estar temblando de frustración. ¿Te gustaria enviar un reporte de error?</string>
+    <string name="send_bug_report_alert_message">Pareces estar temblando de frustración. ¿Te gustaría enviar un reporte de error?</string>
     <string name="send_bug_report_sent">El reporte de error ha sido enviado</string>
     <string name="send_bug_report_failed">El reporte de error no se pudo enviar (%s)</string>
     <string name="send_bug_report_progress">Progreso (%s%%)</string>
@@ -234,10 +234,6 @@ Disculpe por la inconveniencia.</string>
     <string name="room_info_room_name">Nombre de la Sala</string>
     <string name="room_info_room_topic">Tema de la Sala</string>
 
-    <!-- Settings keys -->
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <!-- call string -->
     <string name="call_connected">Llamada conectada</string>
     <string name="call_connecting">La llamada se esá conectando…</string>
@@ -250,13 +246,8 @@ Disculpe por la inconveniencia.</string>
 
     <string name="call_error_user_not_responding">El lado remoto no pudo contestar.</string>
     <string name="call_error_ice_failed">Conexión de media falló</string>
-    <string name="call_error_camera_init_failed">La camara no se pudo encender</string>
+    <string name="call_error_camera_init_failed">La cámara no se pudo encender</string>
     <string name="call_error_answered_elsewhere">llamada fue contestada en otra parte</string>
-    <string name="call_error_peer_hangup_elsewhere">la llamada fue colgado en otra parte</string>
-    <string name="call_error_peer_cancelled_call">la llamada fue cancelada</string>
-
-    <string name="action_accept">ACEPTAR</string>
-    <string name="action_ignore">IGNORAR</string>
 
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Tomar una foto o grabar un video"</string>
@@ -265,11 +256,11 @@ Disculpe por la inconveniencia.</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Información</string>
     <string name="permissions_rationale_msg_storage">Riot necesita tu permiso para entrar en tu almacenaje de fotos y videos para enviar y guardar archivos.\n\nPor favor permite el acceso en el siguiente mensaje para poder enviar archivos desde su dispostivo.</string>
-    <string name="permissions_rationale_msg_camera">Riot necesita tu permiso para usar tu camara para tomar fotos y hacer llamadas de video.</string>
+    <string name="permissions_rationale_msg_camera">Riot necesita tu permiso para usar tu cámara para tomar fotos y hacer llamadas de video.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
     <string name="permissions_rationale_msg_record_audio">Riot necesita tu permiso para usar tu micrófono para hacer llamadas de voz.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot necesita tu permiso para usar su camara y micrófono para hacer llamadas de video.\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
+    <string name="permissions_rationale_msg_camera_and_audio">Riot necesita tu permiso para usar su cámara y micrófono para hacer llamadas de video.\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
     <string name="permissions_rationale_msg_contacts">Riot necesita tu permiso para leer tus contactos y directorio para encontrar a otros usuarios por sus correos electrónicos y números telefónicos.\n\nPor favor permite el acceso en el siguiente mensaje para encontrar usuarios de Riot en su directorio.</string>
     <string name="permissions_msg_contacts_warning_other_androids">Riot necesita tu permiso para leer los contactos de tu directorio para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.\n\n¿Permitir el acceso a Riot para leer tus contactos ?</string>
 
@@ -296,7 +287,7 @@ Disculpe por la inconveniencia.</string>
     <string name="room_preview_unlinked_email_warning">Esta invitación fue enviado a %s, que no esta asociado con esta cuenta.\nTal vez desea entrar con otra cuenta, o añadir este correo electrónico a esta cuenta.</string>
     <string name="room_preview_try_join_an_unknown_room">Estás intentando entrar a %s. ¿Desea entrar para participar en la conversación?</string>
     <string name="room_preview_try_join_an_unknown_room_default">una sala</string>
-    <string name="room_preview_room_interactions_disabled">Esto es un preestreno de esta sala. Los interacciones estan impedidos.</string>
+    <string name="room_preview_room_interactions_disabled">Esto es un preestreno de esta sala. Los interacciones están impedidos.</string>
 
     <!-- Chat creation -->
     <string name="room_creation_title">Chat Nuevo</string>
@@ -449,7 +440,6 @@ Mensajes cifrados no serán visibles en cuentas que no implementan el cifrado.</
     <string name="directory_searching_title">Buscando directorio..</string>
 
     <!-- home room settings -->
-    <string name="room_settings_notifications">Notificaciones</string>
     <string name="room_settings_favourite">Destacar</string>
     <string name="room_settings_de_prioritize">Despriorizar</string>
     <string name="room_settings_direct_chat">Chat Directo</string>
@@ -573,7 +563,6 @@ Mensajes cifrados no serán visibles en cuentas que no implementan el cifrado.</
     <string name="room_settings_topic">Tema</string>
     <string name="room_settings_room_tag">Etiqueta de la Sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetado como:</string>
-    <string name="room_settings_mute_notifs">Callar Notificaciones</string>
 
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Destacar</string>
@@ -625,7 +614,7 @@ Mensajes cifrados no serán visibles en cuentas que no implementan el cifrado.</
 
     <string name="room_settings_addresses_invalid_format_dialog_title">Formato de alias no válido</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' no es formato válido de alias</string>
-    <string name="room_settings_addresses_disable_main_address_prompt_msg">No habra dirección principal seleccionado. La dirección principal de esta sala por defecto sera seleccionado al azar"</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_msg">No habra dirección principal seleccionado. La dirección principal de esta sala por defecto será seleccionado al azar"</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Avisos de la dirección principal</string>
 
     <string name="room_settings_set_main_address">Escojer como Dirección Principal</string>
@@ -699,7 +688,7 @@ Los mensajes cifrados no serán visibles en cuentas que no implementan el cifrad
 
     <string name="encryption_information_verify_device">Verificar dispositivo</string>
     <string name="encryption_information_verify_device_warning">Para verificar que este dispositivo es confiable, por favor contacte el dueño de este dispositivo por otro medio (e.g. cara-a-cara o por llamada) y verifique que la clave de este dispositivo que ellos ven en su página de configuraciones coincide con el de abajo:</string>
-    <string name="encryption_information_verify_device_warning2">Si coinciden, seleccione Verificar. Si no, otro esta interceptando este dispositivo y vas a querer bloquearlo.\nEn el futuro, este procceso sera mas sofisticado.</string>
+    <string name="encryption_information_verify_device_warning2">Si coinciden, seleccione Verificar. Si no, otro esta interceptando este dispositivo y vas a querer bloquearlo.\nEn el futuro, este procceso será mas sofisticado.</string>
     <string name="encryption_information_verify_key_match">Verifico que las claves coinciden</string>
 
     <string name="e2e_enabling_on_app_update">Riot ahora cuenta con cifrado de extremo-a-extremo pero necesitas reingresar tu cuenta para encenderlo.
diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml
index 1b5f6816ab..128048f27b 100644
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@@ -27,7 +27,7 @@
     <string name="forward">Enviar</string>
     <string name="permalink">Enlace permanente</string>
     <string name="view_source">Ver fuente</string>
-    <string name="view_decrypted_source">Mostrar fuente descifrada</string>
+    <string name="view_decrypted_source">Mostrar fuente desencriptada</string>
     <string name="delete">Borrar</string>
     <string name="rename">Renombrar</string>
     <string name="report_content">Reportar contenido</string>
@@ -53,7 +53,7 @@ Seleccione exportar para crear un archivo de respaldo antes de cerrar la sesión
     <string name="action_voice_call">Llamada de Voz</string>
     <string name="action_video_call">Llamada de Vídeo</string>
     <string name="action_global_search">Búsqueda global</string>
-    <string name="action_mark_all_as_read">Marcar todos como visto</string>
+    <string name="action_mark_all_as_read">Marcar todo como visto</string>
     <string name="action_historical">Histórico</string>
     <string name="action_quick_reply">Respuesta rápida</string>
     <string name="action_open">Abrir</string>
@@ -106,7 +106,7 @@ Seleccione exportar para crear un archivo de respaldo antes de cerrar la sesión
     <string name="send_bug_report_description">Por favor describe el error. ¿Qué hiciste? ¿Qué esperabas que sucediera? ¿Qué sucedió realmente?</string>
     <string name="send_bug_report_placeholder">Describe tu problema aquí</string>
     <string name="send_bug_report_logs_description">Para diagnosticar los problemas, informes de este cliente se enviarán junto a este reporte de error. Si prefiere solamente enviar el texto de arriba, desmarque:</string>
-    <string name="send_bug_report_alert_message">Pareces estar temblando de frustración. ¿Te gustaria enviar un reporte de error?</string>
+    <string name="send_bug_report_alert_message">Pareces estar temblando de frustración. ¿Te gustaría enviar un reporte de error?</string>
     <string name="send_bug_report_sent">El reporte de error ha sido enviado</string>
     <string name="send_bug_report_failed">El reporte de error no se pudo enviar (%s)</string>
     <string name="send_bug_report_progress">Progreso (%s%%)</string>
@@ -151,7 +151,7 @@ Seleccione exportar para crear un archivo de respaldo antes de cerrar la sesión
 El correo electrónico te permitirá restablecer tu contraseña.</string>
     <string name="auth_add_email_and_phone_message">Añadir un correo electrónico y un número de teléfono a tu cuenta para que otros te descubran.
 
-El correo electrónico te permitira reiniciar tu contraseña.</string>
+El correo electrónico te permitirá reiniciar tu contraseña.</string>
     <string name="auth_email_placeholder">Correo electrónico</string>
     <string name="auth_opt_email_placeholder">Correo electrónico (opcional)</string>
     <string name="auth_phone_number_placeholder">Número de teléfono</string>
@@ -173,7 +173,7 @@ El correo electrónico te permitira reiniciar tu contraseña.</string>
     <string name="auth_forgot_password">¿Olvidaste tu contraseña?</string>
     <string name="auth_use_server_options">¿Usar opciones de servidor propietarias? (avanzado)</string>
     <string name="auth_email_validation_message">Consulte su correo electrónico para poder continuar con la inscripción</string>
-    <string name="auth_threepid_warning_message">La inscripción con correo electrónico y número de teléfono no está implementada hasta que exista el API. Solamente se tomará en cuenta el número de teléfono.
+    <string name="auth_threepid_warning_message">La inscripción con correo electrónico y número de teléfono no está implementada hasta que exista la API. Solamente se tomará en cuenta el número de teléfono.
 
 Podrá añadir su correo electrónico a su cuenta en las configuraciones.</string>
     <string name="auth_recaptcha_message">Este servidor quiere verificar que no seas robot</string>
@@ -182,7 +182,7 @@ Podrá añadir su correo electrónico a su cuenta en las configuraciones.</strin
     <string name="auth_identity_server">Servidor de Identidad:</string>
     <string name="auth_reset_password_next_step_button">Verifiqué mi correo electrónico</string>
     <string name="auth_reset_password_message">Para restablecer su contraseña, introduzca el correo electrónico de esta cuenta:</string>
-    <string name="auth_reset_password_missing_email">El correo electrónico de esta cuenta es requrido.</string>
+    <string name="auth_reset_password_missing_email">El correo electrónico de esta cuenta es requerido.</string>
     <string name="auth_reset_password_missing_password">Una contraseña nueva es requerida.</string>
     <string name="auth_reset_password_email_validation_message">Un correo fue enviado a %s. Una vez que sigas el enlace, seleccione abajo.</string>
     <string name="auth_reset_password_error_unauthorized">Verificación de correo electrónico falló: asegúrese que siguió el enlace</string>
@@ -242,10 +242,6 @@ Disculpe por la inconveniencia.</string>
     <string name="room_info_room_name">Nombre de la Sala</string>
     <string name="room_info_room_topic">Tema de la Sala</string>
 
-    <!-- Settings keys -->
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <!-- call string -->
     <string name="call_connected">Llamada conectada</string>
     <string name="call_connecting">La llamada se esá conectando…</string>
@@ -260,11 +256,6 @@ Disculpe por la inconveniencia.</string>
     <string name="call_error_ice_failed">Conexión de media falló</string>
     <string name="call_error_camera_init_failed">La cámara no se pudo encender</string>
     <string name="call_error_answered_elsewhere">llamada fue contestada en otra parte</string>
-    <string name="call_error_peer_hangup_elsewhere">la llamada fue colgado en otra parte</string>
-    <string name="call_error_peer_cancelled_call">la llamada fue cancelada</string>
-
-    <string name="action_accept">ACEPTAR</string>
-    <string name="action_ignore">IGNORAR</string>
 
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Tomar una foto o grabar un video"</string>
@@ -273,11 +264,11 @@ Disculpe por la inconveniencia.</string>
     <!-- permissions Android M -->
     <string name="permissions_rationale_popup_title">Información</string>
     <string name="permissions_rationale_msg_storage">Riot necesita tu permiso para entrar en tu almacenaje de fotos y videos para enviar y guardar archivos.\n\nPor favor permite el acceso en el siguiente mensaje para poder enviar archivos desde su dispostivo.</string>
-    <string name="permissions_rationale_msg_camera">Riot necesita tu permiso para usar tu camara para tomar fotos y hacer llamadas de video.</string>
+    <string name="permissions_rationale_msg_camera">Riot necesita tu permiso para usar tu cámara para tomar fotos y hacer llamadas de video.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
     <string name="permissions_rationale_msg_record_audio">Riot necesita tu permiso para usar tu micrófono para hacer llamadas de voz.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">Riot necesita tu permiso para usar su camara y micrófono para hacer llamadas de video.\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
+    <string name="permissions_rationale_msg_camera_and_audio">Riot necesita tu permiso para usar su cámara y micrófono para hacer llamadas de video.\n\nPor favor permite el acceso en el siguiente mensaje para poder hacer la llamada.</string>
     <string name="permissions_rationale_msg_contacts">Riot necesita tu permiso para leer tus contactos y directorio para encontrar a otros usuarios por sus correos electrónicos y números telefónicos.\n\nPor favor permite el acceso en el siguiente mensaje para encontrar usuarios de Riot en su directorio.</string>
     <string name="permissions_msg_contacts_warning_other_androids">Riot necesita tu permiso para leer los contactos de tu directorio para encontrar otros usuarios de Matrix por sus correos electrónicos y números telefónicos.\n\n¿Permitir el acceso a Riot para leer tus contactos ?</string>
 
@@ -304,7 +295,7 @@ Disculpe por la inconveniencia.</string>
     <string name="room_preview_unlinked_email_warning">Esta invitación fue enviado a %s, que no esta asociado con esta cuenta.\nTal vez desea entrar con otra cuenta, o añadir este correo electrónico a esta cuenta.</string>
     <string name="room_preview_try_join_an_unknown_room">Estás intentando entrar a %s. ¿Desea entrar para participar en la conversación?</string>
     <string name="room_preview_try_join_an_unknown_room_default">una sala</string>
-    <string name="room_preview_room_interactions_disabled">Esto es un preestreno de esta sala. Los interacciones estan impedidos.</string>
+    <string name="room_preview_room_interactions_disabled">Esto es un preestreno de esta sala. Los interacciones están impedidos.</string>
 
     <!-- Chat creation -->
     <string name="room_creation_title">Chat Nuevo</string>
@@ -350,7 +341,7 @@ Los mensajes cifrados no serán visibles en cuentas que no implementen el cifrad
     <string name="room_participants_action_ban">Prohibir</string>
     <string name="room_participants_action_unban">Desprohibir</string>
     <string name="room_participants_action_set_default_power_level">Reestablecer como usuario normal</string>
-    <string name="room_participants_action_set_moderator">Hacerlo moderador</string>
+    <string name="room_participants_action_set_moderator">Hacer moderador</string>
     <string name="room_participants_action_set_admin">Hacerlo administrador</string>
     <string name="room_participants_action_ignore">Ocultar todos los mensajes de este usuario</string>
     <string name="room_participants_action_unignore">Mostrar todos los mensajes de este usuario</string>
@@ -457,7 +448,6 @@ Los mensajes cifrados no serán visibles en cuentas que no implementen el cifrad
     <string name="directory_searching_title">Buscando directorio..</string>
 
     <!-- home room settings -->
-    <string name="room_settings_notifications">Notificaciones</string>
     <string name="room_settings_favourite">Destacar</string>
     <string name="room_settings_de_prioritize">Despriorizar</string>
     <string name="room_settings_direct_chat">Chat Directo</string>
@@ -568,7 +558,7 @@ Los mensajes cifrados no serán visibles en cuentas que no implementen el cifrad
     <string name="settings_phone_number_label">Número de teléfono</string>
     <string name="settings_phone_number_error">Número de teléfono inválido por el país escojido</string>
     <string name="settings_phone_number_verification">Verficación de número telefónico</string>
-    <string name="settings_phone_number_verification_instruction">"Enviamos un SMS con un código de activación. Por favor escribe ese código abajo."</string>
+    <string name="settings_phone_number_verification_instruction">Hemos enviado un SMS con un código de activación. Por favor escribe ese código abajo.</string>
     <string name="settings_phone_number_verification_error_empty_code">Escribe un código de activación</string>
     <string name="settings_phone_number_verification_error">Error en la validación de tu número telefónico</string>
     <string name="settings_phone_number_code">Código</string>
@@ -581,7 +571,6 @@ Los mensajes cifrados no serán visibles en cuentas que no implementen el cifrad
     <string name="room_settings_topic">Tema</string>
     <string name="room_settings_room_tag">Etiqueta de la Sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetado como:</string>
-    <string name="room_settings_mute_notifs">Callar Notificaciones</string>
 
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Destacar</string>
@@ -633,7 +622,7 @@ Los mensajes cifrados no serán visibles en cuentas que no implementen el cifrad
 
     <string name="room_settings_addresses_invalid_format_dialog_title">Formato de alias no válido</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' no es formato válido de alias</string>
-    <string name="room_settings_addresses_disable_main_address_prompt_msg">No habra dirección principal seleccionado. La dirección principal de esta sala por defecto sera seleccionado al azar"</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_msg">No habra dirección principal seleccionado. La dirección principal de esta sala por defecto será seleccionado al azar"</string>
     <string name="room_settings_addresses_disable_main_address_prompt_title">Avisos de la dirección principal</string>
 
     <string name="room_settings_set_main_address">Escojer como Dirección Principal</string>
@@ -691,7 +680,7 @@ Los mensajes cifrados no serán visibles en cuentas que no implementan el cifrad
     <string name="encryption_import_room_keys">Importar claves de salas</string>
     <string name="encryption_import_room_keys_summary">Importar las claves de un archivo local</string>
     <string name="encryption_import_import">Importar</string>
-    <string name="encryption_never_send_to_unverified_devices_title">Cifrar a dispositivos verificados solamente</string>
+    <string name="encryption_never_send_to_unverified_devices_title">Encriptar a dispositivos verificados solamente</string>
     <string name="encryption_never_send_to_unverified_devices_summary">Nunca enviar mensajes cifrados a dispositivos no verificados de este dispositivo</string>
 
     <string name="encryption_information_not_verified">NO Verificado</string>
@@ -708,7 +697,7 @@ Los mensajes cifrados no serán visibles en cuentas que no implementan el cifrad
 
     <string name="encryption_information_verify_device">Verificar dispositivo</string>
     <string name="encryption_information_verify_device_warning">Para verificar que este dispositivo es confiable, por favor contacte el dueño de este dispositivo por otro medio (e.g. cara-a-cara o por llamada) y verifique que la clave de este dispositivo que ellos ven en su página de configuraciones coincide con el de abajo:</string>
-    <string name="encryption_information_verify_device_warning2">Si coinciden, seleccione Verificar. Si no, otro esta interceptando este dispositivo y vas a querer bloquearlo.\nEn el futuro, este procceso sera mas sofisticado.</string>
+    <string name="encryption_information_verify_device_warning2">Si coinciden, seleccione Verificar. Si no, otro esta interceptando este dispositivo y vas a querer bloquearlo.\nEn el futuro, este procceso será mas sofisticado.</string>
     <string name="encryption_information_verify_key_match">Verifico que las claves coinciden</string>
 
     <string name="e2e_enabling_on_app_update">Riot ahora cuenta con cifrado de extremo-a-extremo pero necesitas reentrar tu cuenta para prenderlo.
@@ -744,7 +733,7 @@ Lo puedes hacer ahora o luego desde las configuraciones de la aplicación.</stri
     <string name="settings_hide_read_receipts">Ocultar los marcadores de lectura</string>
     <string name="settings_dont_send_typings_notifs">No enviar notificaciones de estar escribiendo</string>
     <string name="settings_always_show_timestamps">Siempre mostrar la marca de tiempo de los mensajes</string>
-    <string name="settings_disable_markdown">Deshabilitar el formateo en markdown</string>
+    <string name="settings_disable_markdown">Deshabilitar el formateo en markdown cuando se envía</string>
 
     <string name="media_saving_period_3_days">3 días</string>
     <string name="media_saving_period_1_week">1 semana</string>
@@ -767,4 +756,150 @@ Lo puedes hacer ahora o luego desde las configuraciones de la aplicación.</stri
     <string name="huge">Grandísimo</string>
 <string name="user_directory_header">directorio del usuario</string>
     <string name="people_search_user_directory">DIRECTORIO DEL USUARIO (%s)</string>
+    <string name="light_theme">Tema claro</string>
+    <string name="dark_theme">Tema oscuro</string>
+    <string name="black_them">Tema negro</string>
+
+    <string name="notification_sync_in_progress">Sincronizando</string>
+    <string name="notification_listen_for_events">Escuchando por eventos</string>
+    <string name="notification_noisy_notifications">Notificaciones ruidosas</string>
+    <string name="notification_silent_notifications">Notificaciones silenciosas</string>
+
+    <string name="title_activity_bug_report">Informe de error</string>
+
+    <string name="option_take_photo">Tomar foto</string>
+    <string name="option_take_video">Tomar video</string>
+
+    <string name="login_mobile_device">Móvil</string>
+
+    <string name="call">LLamar</string>
+    <string name="settings_notification_ringtone">Sonido de notificación</string>
+    <string name="settings_containing_my_display_name">Mensajes que contengan mi nombre público</string>
+    <string name="settings_containing_my_user_name">Mensajes que contengan mi nombre de usuario</string>
+    <string name="settings_12_24_timestamps">Mostrar la hora en formato de 12 horas (ej: 2:30pm)</string>
+    <string name="settings_hide_join_leave_messages">Esconder mensajes de unirse/partir (invitaciones/kicks/baneos no son afectados)</string>
+    <string name="settings_hide_avatar_display_name_changes_messages">Esconder cambios de avatar y nombres públicos</string>
+
+    <string name="settings_analytics">Análisis anónimo de uso</string>
+    <string name="settings_opt_out_of_analytics">Darse de baja del análisis anónimo de uso</string>
+    <string name="settings_opt_out_of_analytics_summary">Riot recolecta datos de uso anónimamente para ayudar a mejorar la aplicación.</string>
+
+
+    <string name="widget_no_power_to_manage">Necesitas permisos para administrar los widgets de esta sala</string>
+    <string name="widget_creation_failure">La creación del widget ha fallado</string>
+    <string name="event_formatter_widget_added">%1$s añadido por %2$s</string>
+    <string name="event_formatter_widget_removed">%1$s removido por %2$s</string>
+    <string name="settings_labs_create_conference_with_jitsi">Crear llamada de conferencia con jitsi</string>
+    <string name="widget_delete_message_confirmation">¿Estás seguro de querer eliminar el widget?</string>
+    <string name="active_widgets">%1$d widget activos</string>
+
+    // Widget Integration Manager
+    <string name="widget_integration_unable_to_create">El widget no ha podido ser creado.</string>
+    <string name="widget_integration_failed_to_send_request">La consulta no ha podido ser enviada.</string>
+    <string name="widget_integration_positive_power_level">El nivel de poder tiene que ser un número entero positivo.</string>
+    <string name="widget_integration_must_be_in_room">No estás en esta sala.</string>
+    <string name="widget_integration_no_permission_in_room">No tienes suficientes permisos para realizar esa acción en esta sala.</string>
+    <string name="widget_integration_missing_room_id">A la petición le falta el ID de sala.</string>
+    <string name="widget_integration_missing_user_id">A la petición le falta el ID de usuario.</string>
+    <string name="widget_integration_room_not_visible">La sala %s no es visible.</string>
+    <string name="settings_labs_matrix_apps">Matrix Apps</string>
+    <string name="room_add_matrix_apps">Añadir Matrix apps</string>
+    <string name="settings_labs_native_camera">Usar cámara nativa</string>
+
+    // share keys
+    <string name="you_added_a_new_device">Has añadido un nuevo dispositivo \'%s\', que esta solicitando claves de encriptación.</string>
+    <string name="your_unverified_device_requesting">Tu dispositivo no validado \'%s\' está solicitando claves de encriptación.</string>
+    <string name="start_verification">Empezar verificación</string>
+    <string name="share_without_verifying">Compartir sin verificación</string>
+    <string name="ignore_request">Ignorar solicitud</string>
+
+    // conference call
+    <string name="conference_call_warning_title">Aviso!</string>
+    <string name="conference_call_warning_message">Las llamadas de conferencia están en desarrollo y pueden no ser fiables.</string>
+
+    // slash commands
+    <string name="command_error">Error de comando</string>
+    <string name="unrecognized_command">Comando no reconocido: %s</string>
+
+    // notification statuses
+    <string name="notification_off">Off</string>
+    <string name="notification_on">On</string>
+    <string name="notification_noisy">Alto</string>
+
+    <string name="encrypted_message">Mensaje encriptado</string>
+
+<string name="title_activity_group_details">Detalles de la comunidad</string>
+
+    <string name="loading">Cargando...</string>
+
+    <string name="action_exit">Salir</string>
+    <string name="bottom_action_groups">Comunidades</string>
+
+    <string name="home_filter_placeholder_groups">Buscar comunidades</string>
+
+    <string name="groups_invite_header">Invitar</string>
+    <string name="groups_header">Comunidades</string>
+    <string name="no_group_placeholder">No hay grupos</string>
+
+    <string name="start_new_chat_prompt_msg">Está seguro que quiere empezar una nueva conversación con %s?</string>
+    <string name="start_voice_call_prompt_msg">Está seguro que quiere empezar una llamada de voz?</string>
+    <string name="start_video_call_prompt_msg">Està seguro que quiere empezar una llamada de vídeo?</string>
+
+    <string name="groups_list">Lista de grupos</string>
+
+    <string name="room_participants_kick_prompt_msg">Está seguro que quiere echar este usuario de la conversación?</string>
+    <string name="room_participants_ban_prompt_msg">Está seguro que quiere vetar este usuario de esta convesación?</string>
+
+    <string name="room_settings_all_messages_noisy">Todos los mensajes (ruidoso)</string>
+    <string name="room_settings_all_messages">Todos los mensajes</string>
+    <string name="room_settings_mention_only">Solo citas</string>
+    <string name="room_settings_mute">Silenciar</string>
+    <string name="room_settings_add_homescreen_shortcut">Añadir un atajo en la pantalla de inicio</string>
+
+    <string name="settings_inline_url_preview">Habilita las previsualizaciones de las URL por defecto</string>
+    <string name="settings_vibrate_on_mention">Vibrar cuando te citen</string>
+
+    <string name="settings_flair">Talento</string>
+
+    <string name="room_settings_room_notifications_title">Notificaciones</string>
+    <string name="room_settings_no_flair">" Esta sala no pertenece a ninguna comunidad"</string>
+    <string name="room_settings_add_new_group">Nueva ID de la comunidad (por ejemplo +foo:matrix.org)</string>
+    <string name="room_settings_invalid_group_format_dialog_title">El ID de la comunidad es inválido</string>
+    <string name="forget_room">Olvidar sala</string>
+<string name="rejoin">Volver a entrar</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'℅s\' no es un ID de comunidad válido</string>
+
+
+    <string name="create">Crear</string>
+    <string name="create_community">Crear una comunidad</string>
+    <string name="community_name">Nombre de la comunidad</string>
+    <string name="community_name_hint">Ejemplo</string>
+    <string name="community_id">ID de la comunidad</string>
+    <string name="community_id_hint">ejemplo</string>
+
+    // group details
+    <string name="group_details_home">Inicio</string>
+    <string name="group_details_people">Usuarios</string>
+    <string name="group_details_rooms">Salas</string>
+    <string name="no_users_placeholder">Sin usuarios</string>
+
+    <string name="rooms">Salas</string>
+    <string name="joined">Se ha unido</string>
+    <string name="invited">Ha sido invitado</string>
+    <string name="filter_group_members">Filtro de miembros del grupo</string>
+    <string name="filter_group_rooms">Filtro de salas del grupo</string>
+
+    <string name="group_one_member">1 miembro</string>
+    <string name="group_members">%d miembros</string>
+
+    <string name="group_one_room">1 sala</string>
+    <string name="group_rooms">%d salas</string>
+    <string name="one_new_message">1 nuevo mensaje</string>
+    <string name="new_messages">%d nuevos mensajes</string>
+
+    <string name="has_been_kicked">Ha sido echado de la sala %1$s por %2$s</string>
+    <string name="has_been_banned">Ha sido vetado en %1$s por %2$s</string>
+    <string name="reason_colon">Razon: %1$s</string>
+    <string name="group_no_long_description">El administrador de la comunidad no ha redactado una descripción larga para esta comunidad.</string>
+
     </resources>
diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml
index 8363e77704..6d81e53056 100644
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <string name="resouces_language">eu</string>
-    <string name="resouces_country">EB</string>
+    <string name="resouces_country">ES</string>
 
     <string name="title_activity_home">Mezuak</string>
     <string name="title_activity_room">Gela</string>
@@ -195,9 +195,9 @@ Saiotik atera zaizu gailu guztietan eta ez dituzu jakinarazpenak jasoko. Jakinar
     <string name="login_error_user_in_use">Erabiltzaile-izen hau hartuta dago</string>
     <string name="login_error_login_email_not_yet">Oraindik erabili ez den e-maileko esteka</string>
 
-    <string name="read_receipts_list">Irakurri jasotzaileen zerrenda</string>
+    <string name="read_receipts_list">Irakurragirien zerrenda</string>
 
-    <string name="membership_changes">%d kidetza aldaketak</string>
+    <string name="membership_changes">%d kidetza aldaketa</string>
 
     <string name="compression_options">"Bidali honela "</string>
     <string name="compression_opt_list_original">Jatorrizkoa</string>
@@ -214,7 +214,7 @@ Saiotik atera zaizu gailu guztietan eta ez dituzu jakinarazpenak jasoko. Jakinar
     <string name="today">Gaur</string>
 
     <string name="room_info_room_name">Gelaren izena</string>
-    <string name="room_info_room_topic">Gelaren gaia</string>
+    <string name="room_info_room_topic">Gelaren mintzagaia</string>
 
     <string name="call_connected">Deia konektatuta</string>
     <string name="call_connecting">Deia konektatzen…</string>
@@ -229,11 +229,6 @@ Saiotik atera zaizu gailu guztietan eta ez dituzu jakinarazpenak jasoko. Jakinar
     <string name="call_error_ice_failed">Media konexioak huts egin du</string>
     <string name="call_error_camera_init_failed">Ezin izan da kamera hasieratu</string>
     <string name="call_error_answered_elsewhere">deia beste nonbait erantzun da</string>
-    <string name="call_error_peer_hangup_elsewhere">deia beste nonbait amaitu da</string>
-    <string name="call_error_peer_cancelled_call">deia utzita</string>
-
-    <string name="action_accept">ONARTU</string>
-    <string name="action_ignore">EZIKUSI</string>
 
     <string name="media_picker_both_capture_title">Atera argazkia edo bideoa</string>
     <string name="media_picker_cannot_record_video">Ezin izan da bideoa grabatu</string>
@@ -282,7 +277,7 @@ Baimendu Riotek zure kontaktuak atzitzea?</string>
 
     <string name="room_preview_unlinked_email_warning">Zure gonbidapena bidali da %s helbidera, hau ez dago kontu honetara lotuta.
 Beste kontu batekin hasi dezakezu saioa, edo e-mail hau kontu honetara gehitu.</string>
-    <string name="room_preview_try_join_an_unknown_room">%s atzitzen saiatzen ari zara. Elkartu nahi duzu elkarrizketan parte hartzeko?</string>
+    <string name="room_preview_try_join_an_unknown_room">%s taldera sartzen saiatzen ari zara. Elkartu taldera elkarrizketan parte hartzeko?</string>
     <string name="room_preview_try_join_an_unknown_room_default">gela bat</string>
     <string name="room_preview_room_interactions_disabled">Hau gelaren aurrebista bat da. Gelako elkarrekintzak desgaituta daude.</string>
 
@@ -366,7 +361,7 @@ Ziur zaude?</string>
     <string name="room_resend_unsent_messages">Birbidali bidali gabeko mezuak</string>
     <string name="room_delete_unsent_messages">Ezabatu bidali gabeko mezuak</string>
     <string name="room_message_file_not_found">Ez da fitxategia aurkitu</string>
-    <string name="room_do_not_have_permission_to_post">Ez duzu gela honetan idazteko baimena</string>
+    <string name="room_do_not_have_permission_to_post">Ez duzu gela honetara mezuak bidaltzeko baimenik</string>
     <string name="room_new_message_notification">mezu berri 1</string>
     <string name="room_new_messages_notification">%1$d mezu berri</string>
 
@@ -429,7 +424,6 @@ Ziur zaude?</string>
     <string name="directory_search_rooms_for">%1$s gela aurkitu dira %2$s bilaketarako</string>
     <string name="directory_searching_title">Direktorioa bilatzen..</string>
 
-    <string name="room_settings_notifications">Jakinarazpenak</string>
     <string name="room_settings_favourite">Gogokoa</string>
     <string name="room_settings_de_prioritize">Jaitsi lehentasuna</string>
     <string name="room_settings_direct_chat">Txat zuzena</string>
@@ -438,13 +432,13 @@ Ziur zaude?</string>
 
     <string name="room_sliding_menu_messages">Mezuak</string>
     <string name="room_sliding_menu_settings">Ezarpenak</string>
-    <string name="room_sliding_menu_version">"Bertsioa "</string>
+    <string name="room_sliding_menu_version">"Bertsioa: "</string>
     <string name="room_sliding_menu_term_and_conditions">Termino eta baldintzak</string>
-    <string name="room_sliding_menu_copyright">Copyright</string>
+    <string name="room_sliding_menu_copyright">Copyright-a</string>
     <string name="room_sliding_menu_privacy_policy">Pribatutasun politika</string>
 
     <string name="settings_profile_picture">Profil-argazkia</string>
-    <string name="settings_display_name">Pantaila izena</string>
+    <string name="settings_display_name">Pantaila-izena</string>
     <string name="settings_email_address">E-mail</string>
     <string name="settings_add_email_address">Gehitu e-mail helbidea</string>
     <string name="settings_phone_number">Telefonoa</string>
@@ -470,10 +464,10 @@ Ziur zaude?</string>
     <string name="settings_second">segundo</string>
     <string name="settings_seconds">segundo</string>
 
-    <string name="settings_version">Bertsioa</string>
+    <string name="settings_version">Bertsioa:</string>
     <string name="settings_olm_version">olm bertsioa</string>
     <string name="settings_app_term_conditions">Termino eta baldintzak</string>
-    <string name="settings_copyright">Copyright</string>
+    <string name="settings_copyright">Copyright-a</string>
     <string name="settings_privacy_policy">Pribatutasun politika</string>
     <string name="settings_clear_cache">Garbitu cachea</string>
     <string name="settings_clear_medias_cache">Garbitu media cachea</string>
@@ -489,10 +483,10 @@ Ziur zaude?</string>
     <string name="settings_contacts_app_permission">Kontaktuen baimena</string>
     <string name="settings_contacts_phonebook_country">Telefono-liburuaren herrialdea</string>
     <string name="settings_home_display">Hasiera pantaila</string>
-    <string name="settings_pin_missed_notifications">Finkatu galdutako jakinarazpenak dituzten gelak</string>
+    <string name="settings_pin_missed_notifications">Finkatu ikusi gabeko jakinarazpenak dituzten gelak</string>
     <string name="settings_pin_unread_messages">Finkatu irakurri gabeko mezuak dituzten gelak</string>
     <string name="settings_devices_list">Gailuak</string>
-    <string name="settings_hide_read_receipts">Ezkutatu irakurtze-agiria</string>
+    <string name="settings_hide_read_receipts">Ezkutatu irakurragiriak</string>
     <string name="settings_dont_send_typings_notifs">Ez bidali idatzi bitarteko jakinarazpenak</string>
     <string name="settings_always_show_timestamps">Erakutsi beti mezuen denbora-zigilua</string>
     <string name="devices_details_dialog_title">Gailuaren xehetasunak</string>
@@ -539,12 +533,10 @@ Jarraitzeko, idatzi zure pasahitza.</string>
 
     <string name="settings_phone_number_country_label">Herrialdea</string>
     <string name="settings_phone_number_country_error">Hautatu herrialde bat</string>
-    <string name="settings_key_display_all_events">ezarpen_gakoa_erakutsi_gertaera_guztiak</string>
-    <string name="settings_key_use_rage_shake">ezarpen_gakoa_erabili_amorru_astintzea</string>
 
-    <string name="room_sliding_menu_third_party_notices">Hirugarrengoen jakinarazpenak</string>
-    <string name="settings_third_party_notices">Hirugarrengoen jakinarazpenak</string>
-    <string name="settings_disable_markdown">Desgaitu markdown formatua</string>
+    <string name="room_sliding_menu_third_party_notices">Hirugarrengoen adierazpenak</string>
+    <string name="settings_third_party_notices">Hirugarrengoen adierazpenak</string>
+    <string name="settings_disable_markdown">Desgaitu markdown formatua bidaltzean</string>
 
     <string name="settings_phone_number_label">Telefono zenbakia</string>
     <string name="settings_phone_number_error">Telefono zenbaki baliogabea hautatutako herrialdean</string>
@@ -561,10 +553,9 @@ Jarraitzeko, idatzi zure pasahitza.</string>
 
     <string name="room_settings_room_photo">Gelaren argazkia</string>
     <string name="room_settings_room_name">Gelaren izena</string>
-    <string name="room_settings_topic">Gaia</string>
+    <string name="room_settings_topic">Mintzagaia</string>
     <string name="room_settings_room_tag">Gelaren etiketa</string>
     <string name="room_settings_tag_pref_dialog_title">Honela etiketatua:</string>
-    <string name="room_settings_mute_notifs">Mututu jakinarazpenak</string>
 
     <string name="room_settings_tag_pref_entry_favourite">Gogokoa</string>
     <string name="room_settings_tag_pref_entry_low_priority">Lehentasun baxua</string>
@@ -581,10 +572,10 @@ Jarraitzeko, idatzi zure pasahitza.</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Nork irakurri dezake historiala?</string>
     <string name="room_settings_room_access_rules_pref_dialog_title">Nor sartu daiteke gelara?</string>
 
-    <string name="room_settings_read_history_entry_anyone">Edonor</string>
-    <string name="room_settings_read_history_entry_members_only_option_time_shared">Kideak besterik ez (aukera hau hautatutako unetik)</string>
-    <string name="room_settings_read_history_entry_members_only_invited">Kideak besterik ez (gonbidatu zitzaienetik)</string>
-    <string name="room_settings_read_history_entry_members_only_joined">Kideak besterik ez (elkartu zirenetik)</string>
+    <string name="room_settings_read_history_entry_anyone">Edonork</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Kideek besterik ez (aukera hau hautatutako unetik)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Kideek besterik ez (gonbidatu zitzaienetik)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Kideek besterik ez (elkartu zirenetik)</string>
 
     <string name="room_settings_room_access_warning">Gelara estekatzeko honek helbide bat izan behar du.</string>
     <string name="room_settings_room_access_entry_only_invited">Gonbidatua izan den jendea besterik ez</string>
@@ -723,9 +714,9 @@ Zifratutako mezuak ez dira zifratzea oraindik ezarrita ez duten beste gailuetan
     <string name="larger">Oso handia</string>
     <string name="largest">Handiena</string>
     <string name="huge">Erraldoia</string>
-<string name="light_theme">Gai argia</string>
-    <string name="dark_theme">Gai iluna</string>
-    <string name="black_them">Gai beltza</string>
+<string name="light_theme">Itxura argia</string>
+    <string name="dark_theme">Itxura iluna</string>
+    <string name="black_them">Itxura beltza</string>
 
     <string name="notification_sync_in_progress">Sinkronizatzen</string>
     <string name="notification_listen_for_events">Entzun gertaerak</string>
@@ -733,7 +724,7 @@ Zifratutako mezuak ez dira zifratzea oraindik ezarrita ez duten beste gailuetan
     <string name="login_mobile_device">Mugikorra</string>
 
     <string name="settings_notification_ringtone">Jakinarazpen-soinua</string>
-    <string name="settings_12_24_timestamps">Erakutsi denbora-markak 12 ordutako formatuan (adib 2:30pm)</string>
+    <string name="settings_12_24_timestamps">Erakutsi denbora-zigiluak 12 ordutako formatuan (adib 2:30pm)</string>
     <string name="settings_hide_join_leave_messages">Ezkutatu elkartu/utzi mezuak (gonbidatu/kanporatu/debekatu mezuei eraginik ez)</string>
     <string name="settings_hide_avatar_display_name_changes_messages">Ezkutatu abatarraren eta pantaila-izenen aldaketak</string>
 
@@ -746,10 +737,8 @@ Zifratutako mezuak ez dira zifratzea oraindik ezarrita ez duten beste gailuetan
     <string name="active_widgets">%1$d trepeta aktibo</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">Erabiltzaileak gonbidatzeko baimena behar duzu hori egin ahal izateko.</string>
     <string name="widget_integration_unable_to_create">Ezin izan da trepeta sortu.</string>
     <string name="widget_integration_failed_to_send_request">Eskariaren bidalketak huts egin du.</string>
-    <string name="widget_integration_room_not_recognised">Ez da gela hau ezagutzen.</string>
     <string name="widget_integration_positive_power_level">Botere maila osoko zenbaki positibo bat izan behar da.</string>
     <string name="widget_integration_must_be_in_room">Ez zaude gela honetan.</string>
     <string name="widget_integration_no_permission_in_room">Ez duzu gela honetan hori egiteko baimenik.</string>
@@ -758,5 +747,118 @@ Zifratutako mezuak ez dira zifratzea oraindik ezarrita ez duten beste gailuetan
     <string name="widget_integration_room_not_visible">%s gela ez dago ikusgai.</string>
     <string name="settings_labs_matrix_apps">Matrix aplikazioak</string>
     <string name="room_add_matrix_apps">Gehitu Matrix aplikazioak</string>
-    <string name="add_matrix_apps_not_supported">Ez da gailu honetan onartzen</string>
-</resources>
+    <string name="notification_noisy_notifications">Jakinarazpen zaratatsuak</string>
+    <string name="notification_silent_notifications">Jakinarazpen isilak</string>
+
+    <string name="settings_containing_my_display_name">Nire pantaila-izena duten mezuak</string>
+    <string name="settings_containing_my_user_name">Nire erabiltzaile izena duten mezuak</string>
+    <string name="settings_analytics">Analitikak</string>
+    <string name="settings_opt_out_of_analytics">Ez hartu parte analitiketan</string>
+    <string name="settings_opt_out_of_analytics_summary">Riotek analitika anonimoak biltzen ditu aplikazioa hobetzeko.</string>
+
+
+    <string name="settings_labs_native_camera">Erabili kamera natiboa</string>
+
+    // share keys
+    <string name="you_added_a_new_device">\'%s\' gailu berria gehitu duzu, eta zifratze-gakoak eskatzen ari da.</string>
+    <string name="your_unverified_device_requesting">Egiaztatu gabeko zure \'%s\' gailua zifratze-gakoak eskatzen ari da.</string>
+    <string name="start_verification">Hasi egiaztaketa</string>
+    <string name="share_without_verifying">Partekatu egiaztatu gabe</string>
+    <string name="ignore_request">Ezikusi eskaria</string>
+
+    // conference call
+    <string name="conference_call_warning_title">Abisua!</string>
+    <string name="conference_call_warning_message">Konferentzia deiak garapenean daude eta agian ez dabiltza behar bezala.</string>
+
+    // slash commands
+    <string name="command_error">Komandoaren errorea</string>
+    <string name="unrecognized_command">Komando ezezaguna: %s</string>
+
+    // notification statuses
+    <string name="notification_off">Ez</string>
+    <string name="notification_on">Bai</string>
+    <string name="notification_noisy">Zaratatsua</string>
+
+    <string name="encrypted_message">Zifratutako mezua</string>
+
+<string name="title_activity_bug_report">Arazte-txostena</string>
+
+    <string name="option_take_photo">Atera argazkia</string>
+    <string name="option_take_video">Grabatu bideoa</string>
+
+    <string name="call">Deia</string>
+<string name="title_activity_group_details">Komunitatearen xehetasunak</string>
+
+    <string name="loading">Kargatzen...</string>
+
+    <string name="action_exit">Irten</string>
+    <string name="bottom_action_groups">Komunitateak</string>
+
+    <string name="home_filter_placeholder_groups">Bilatu komunitateak</string>
+
+    <string name="groups_invite_header">Gonbidatu</string>
+    <string name="groups_header">Komunitateak</string>
+    <string name="no_group_placeholder">Talderik ez</string>
+
+    <string name="start_new_chat_prompt_msg">Ziur txat berria hasi nahi duzula %s erabiltzailearekin?</string>
+    <string name="start_voice_call_prompt_msg">Ziur ahots-dei bat hasi nahi duzula?</string>
+    <string name="start_video_call_prompt_msg">Ziur bideo-dei bat hasi nahi duzula?</string>
+
+    <string name="groups_list">Taldeen zerrenda</string>
+
+    <string name="room_participants_kick_prompt_msg">Ziur erabiltzaile hau txat honetatik kanporatu nahi duzula?</string>
+    <string name="room_participants_ban_prompt_msg">Ziur erabiltzaile hau txat honetan debekatu nahi duzula?</string>
+
+    <string name="room_settings_all_messages_noisy">Mezu guztiak (zaratatsua)</string>
+    <string name="room_settings_all_messages">Mezu guztiak</string>
+    <string name="room_settings_mention_only">Aipamenak bakarrik</string>
+    <string name="room_settings_mute">Mututu</string>
+    <string name="room_settings_add_homescreen_shortcut">Gehitu hasiera pantailako laster-bidea</string>
+
+    <string name="settings_inline_url_preview">Gaitu URL-en aurrebistak lehenetsita</string>
+    <string name="settings_vibrate_on_mention">Bibratu aipatzean</string>
+
+    <string name="room_settings_room_notifications_title">Jakinarazpenak</string>
+    <string name="room_settings_add_new_group">Komunitatearen ID berria (adib. +foo:matrix.org)</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Komunitatearen ID baliogabea</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' ez da baliozko komunitate ID bat</string>
+
+
+    <string name="create">Sortu</string>
+    <string name="create_community">Sortu komunitatea</string>
+    <string name="community_name">Komunitatearen izena</string>
+    <string name="community_name_hint">Adibidea</string>
+    <string name="community_id">Komunitatearen IDa</string>
+    <string name="community_id_hint">adibidea</string>
+
+    // group details
+    <string name="group_details_home">Hasiera</string>
+    <string name="group_details_people">Jendea</string>
+    <string name="group_details_rooms">Gelak</string>
+    <string name="no_users_placeholder">Erabiltzailerik ez</string>
+
+    <string name="rooms">Gelak</string>
+    <string name="joined">Elkartuta</string>
+    <string name="invited">Gonbidatuta</string>
+    <string name="filter_group_members">Iragazi taldeko kideak</string>
+    <string name="filter_group_rooms">Iragazi taldeko gelak</string>
+
+    <string name="group_one_member">kide 1</string>
+    <string name="group_members">%d kide</string>
+
+    <string name="group_one_room">gela 1</string>
+    <string name="group_rooms">%d gela</string>
+    <string name="group_no_long_description">Komunitatearen administratzaileak ez du deskripzio luzerik eman komunitate honentzat.</string>
+
+    <string name="one_new_message">mezu berri 1</string>
+    <string name="new_messages">%d mezu berri</string>
+
+    <string name="has_been_kicked">%1$s gelatik kanporatu zaitu %2$s erabiltzaileak</string>
+    <string name="has_been_banned">%1$s gelatik debekatu zaitu %2$s erabiltzaileak</string>
+    <string name="reason_colon">Arrazoia: %1$s</string>
+    <string name="rejoin">Berriro elkartu</string>
+    <string name="forget_room">Ahaztu gela</string>
+<string name="settings_flair">Ikurra</string>
+
+    <string name="room_settings_no_flair">" Gela honek ez ditu komunitateetako ikurrak erakusten"</string>
+    </resources>
diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml
index 330f5d33b8..16a6295eae 100755
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@@ -51,12 +51,13 @@
 
     <!-- actions -->
     <string name="action_sign_out">Kirjaudu ulos</string>
-    <string name="action_sign_out_confirmation">Turvallisuussyistä uloskirjautuminen poistaa salausavaimet. Ilman salausavaimia et voi lukea viestihistoriaa salatuissa huoneissa.\nValitse \"vie\" tehdäksesi varmuuskopio avaimista.</string>
+    <string name="action_sign_out_confirmation">Turvallisuussyistä uloskirjautuminen poistaa salausavaimet. Ilman salausavaimia et voi lukea viestihistoriaa salatuissa huoneissa.
+Valitse \"vie\" varmuuskopioidaksesi avaimet ennen uloskirjautumista.</string>
     <string name="action_voice_call">Äänipuhelu</string>
     <string name="action_video_call">Videopuhelu</string>
-    <string name="action_global_search">Haku kaikkialta</string>
+    <string name="action_global_search">Laaja haku</string>
     <string name="action_mark_all_as_read">Merkitse kaikki luetuiksi</string>
-    <string name="action_historical">Historiallinen</string>
+    <string name="action_historical">Historia</string>
     <string name="action_quick_reply">Pikavastaus</string>
     <string name="action_open">Avaa</string>
     <string name="action_close">Sulje</string>
@@ -76,7 +77,7 @@
     <!-- Home screen -->
     <string name="home_filter_placeholder_home">Hae huoneita</string>
     <string name="home_filter_placeholder_favorites">Hae suosikkeja</string>
-    <string name="home_filter_placeholder_people">Hae henkilöitä</string>
+    <string name="home_filter_placeholder_people">Etsi henkilöitä</string>
     <string name="home_filter_placeholder_rooms">Hae huoneita</string>
 
     <!-- Home fragment -->
@@ -87,7 +88,7 @@
     <string name="direct_chats_header">Keskustelut</string>
     <string name="local_address_book_header">Paikallinen osoitekirja</string>
     <string name="matrix_only_filter">Ainoastaan Matrix-yhteyshenkilöt</string>
-    <string name="no_conversation_placeholder">Ei keskusteluja</string>
+    <string name="no_conversation_placeholder">Ei keskusteluita</string>
     <string name="no_contact_access_placeholder">Et sallinut Riotille pääsyä paikallisiin yhteystietoihisi</string>
     <string name="no_result_placeholder">Ei tuloksia</string>
 
@@ -104,17 +105,17 @@
     <string name="send_bug_report_include_logs">Lähetä lokit</string>
     <string name="send_bug_report_include_crash_logs">Lähetä kaatumislokit</string>
     <string name="send_bug_report_include_screenshot">Send screenshot</string>
-    <string name="send_bug_report">Bugiraportti</string>
-    <string name="send_bug_report_description">Kuvaile bugia. Mitä teit? Mitä odotit tapahtuvan? Mitä tapahtui?</string>
+    <string name="send_bug_report">Virheraportti</string>
+    <string name="send_bug_report_description">Kuvaile virhettä. Mitä teit? Mitä odotit tapahtuvan? Mitä tapahtui?</string>
     <string name="send_bug_report_placeholder">Kuvaile ongelmaa</string>
     <string name="send_bug_report_logs_description">Ongelman diagnosointia varten sovelluksen lokit lähetetään mukaan. Jos haluat lähettää vain ylläolevan tekstin, valitse:</string>
-    <string name="send_bug_report_alert_message">Haluatko lähettää bugiraportin?</string>
-    <string name="send_bug_report_sent">Bugiraportti lähetettiin</string>
-    <string name="send_bug_report_failed">Bugiraporttia ei voitu lähettää (%s)</string>
+    <string name="send_bug_report_alert_message">Haluatko lähettää virheraportin?</string>
+    <string name="send_bug_report_sent">Virheraportti lähetettiin</string>
+    <string name="send_bug_report_failed">Virheraporttia ei voitu lähettää (%s)</string>
     <string name="send_bug_report_progress">Lähetetään (%s%%)</string>
     <string name="send_bug_report_app_crashed">Sovellus kaatui viimeksi. Haluatko tehdä kaatumisesta ilmoituksen?</string>
 
-    <string name="send_files_in">Lähetä [johonkin]</string>
+    <string name="send_files_in">Lähetä</string>
     <string name="read_receipt">Luettu</string>
 
     <string name="join_room">Liity huoneeseen</string>
@@ -208,7 +209,7 @@
     <string name="login_error_login_email_not_yet">Sähköpostiisi lähetetty linkki, jota ei ole vielä seurattu</string> <!-- ??? -->
 
     <!-- crypto warnings -->
-    <string name="e2e_need_log_in_again">Sinun pitää kirjautua sisään uudelleen luodaksesi salausavaimet tälle laitteelle.\nTämä tapahtuu vain kerran.\nPahoittelemme häiriötä.</string>
+    <string name="e2e_need_log_in_again">Sinun pitää kirjautua uudelleen, luodaksesi salausavaimet tälle laitteelle.</string>
 
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Lukukuittaukset</string>
@@ -239,10 +240,6 @@
     <string name="room_info_room_name">Huoneen nimi</string>
     <string name="room_info_room_topic">Huoneen aihe</string>
 
-    <!-- Settings keys -->
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <!-- call string -->
     <string name="call_connected">Yhdistetty</string>
     <string name="call_connecting">Yhdistetään…</string>
@@ -257,11 +254,7 @@
     <string name="call_error_ice_failed">Mediayhteys epäonnistui</string>
     <string name="call_error_camera_init_failed">Kameran alustus epäonnistui</string>
     <string name="call_error_answered_elsewhere">puheluun vastattiin muualta</string>
-    <string name="call_error_peer_hangup_elsewhere">puhelu lopetettiin muualla</string>
-    <string name="call_error_peer_cancelled_call">puhelu peruttiin</string>
 
-    <string name="action_accept">VASTAA</string>
-    <string name="action_ignore">JÄTÄ HUOMIOTTA</string>
     <!-- ??? this entire section -->
 
     <!-- medias picker string -->
@@ -312,7 +305,13 @@
     <string name="room_title_members">%1$d jäsentä</string>
     <string name="room_title_one_member">1 jäsen</string>
     <string name="room_e2e_alert_title">Varoitus!</string>
-    <string name="room_e2e_alert_message">Salaus on vielä betassa eikä välttämättä ole luotettava.\n\nÄlä vielä käytä sitä salaista tietoa varten.\n\nLaitteet eivät voi vielä lukea salattua historiaa ennen kuin ne ovat itse liittyneet huoneeseen.\n\nSalatut viestit eivät näy sovelluksissa jotka eivät vielä tue salausta.</string> <!-- ??? -->
+    <string name="room_e2e_alert_message">Salaus on testikäytössä, eikä välttämättä toimi luotettavasti.
+
+Älä käytä sitä salaista tietoa varten.
+
+Laitteet eivät voi näyttää salattuja viestejä ajalta ennen huoneeseen liittymistä.
+
+Salatut viestit eivät näy sovelluksissa, jotka eivät tue salausta.</string> <!-- ??? -->
 
     <!--  Time -->
     <string name="format_time_s">" sek"</string>
@@ -389,7 +388,7 @@
     <string name="ssl_remain_offline">Jätä huomiotta</string> <!-- ??? -->
     <string name="ssl_fingerprint_hash">Sormenjälki (%s):</string>
     <string name="ssl_could_not_verify">Palvelimen identiteettiä ei voitu varmistaa.</string> <!-- ??? -->
-    <string name="ssl_cert_not_trust">Tämä voi tarkoittaa että joku yrittää kaapata sinun viestintääsi, tai että laitteesi ei luota palvelimen varmenteeseen.</string>
+    <string name="ssl_cert_not_trust">Tämä voi tarkoittaa että joku yrittää kaapata sinun viestintääsi tai että laitteesi ei luota palvelimen varmenteeseen.</string>
     <string name="ssl_cert_new_account_expl">Jos palvelimen ylläpitäjä sanoo että tämä on odotettua, varmista että alla oleva sormenjälki on sama kuin hänen antama.</string>
     <string name="ssl_unexpected_existing_expl">Sertifikaatti johon laitteesi luotti aikaisemmin on vaihtunut. Tämä on HYVIN EPÄTAVALLISTA. Suositellaan että ET hyväksy tätä uutta sertifikaattia.</string>
     <string name="ssl_expected_existing_expl">Sertifikaatti on vaihtunut luotetusta sertifikaatista uuteen. Palvelin on voinut uudistaa sertifikaattinsa. Ota yhteyttä palvelimen ylläpitäjään ja selvitä oikean sertifikaatin sormenjälki.</string>
@@ -415,7 +414,7 @@
     <string name="room_event_action_cancel_download">Peru lataus</string>
 
     <!-- Room display name -->
-    <string name="room_displayname_invite_from">Kutsu %s[:lta]</string> <!-- Grammar problem -->
+    <string name="room_displayname_invite_from">Kutsu käyttäjältä %s</string> <!-- Grammar problem -->
     <string name="room_displayname_room_invite">Huonekutsu</string>
     <string name="room_displayname_two_members">%1$s ja %2$s</string>
     <string name="room_displayname_more_than_two_members">%1$s ja %2$d muuta</string>
@@ -452,7 +451,6 @@
     <string name="directory_searching_title">Haetaan luettelosta..</string>
 
     <!-- home room settings -->
-    <string name="room_settings_notifications">Ilmoitukset</string>
     <string name="room_settings_favourite">Suosikki</string>
     <string name="room_settings_de_prioritize">Matala tärkeys</string>
     <string name="room_settings_direct_chat">Yksityiskeskustelu</string>
@@ -465,7 +463,7 @@
     <string name="room_sliding_menu_version">Versio: </string>
     <string name="room_sliding_menu_term_and_conditions">Käyttöehdot</string>
     <string name="room_sliding_menu_third_party_notices">Kolmannen osapuolen tiedot</string>
-    <string name="room_sliding_menu_copyright">Tekijänoikeus</string>
+    <string name="room_sliding_menu_copyright">Tekijänoikeustiedot</string>
     <string name="room_sliding_menu_privacy_policy">Tietosuojakäytäntö</string>
 
     <!-- Vector Settings -->
@@ -516,7 +514,7 @@
     <string name="settings_contact">Paikalliset yhteystiedot</string>
     <string name="settings_contacts_app_permission">Osoitekirjakäyttölupa</string>
     <string name="settings_contacts_phonebook_country">Osoitekirjan maa</string>
-    <string name="settings_home_display">Kotinäyttö</string>
+    <string name="settings_home_display">Koti</string>
     <string name="settings_pin_missed_notifications">Pin rooms with missed notifications</string>
     <string name="settings_pin_unread_messages">Pin rooms with unread messages</string>
     <string name="settings_devices_list">Laitteet</string>
@@ -576,7 +574,6 @@
     <string name="room_settings_topic">Aihe</string>
     <string name="room_settings_room_tag">Huoneen luokittelu</string>
     <string name="room_settings_tag_pref_dialog_title">Luokiteltu:</string>
-    <string name="room_settings_mute_notifs">Mykistä ilmoitukset</string>
 
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Suosikki</string>
@@ -617,8 +614,8 @@
     <string name="room_settings_labs_pref_title">Kokeelliset asetukset</string>
     <string name="room_settings_labs_warning_message">Nämä ovat kokeellisia asetuksia jotka voivat mennä rikki. Käytä varoen.</string>
     <string name="room_settings_labs_end_to_end">Salaus</string>
-    <string name="room_settings_labs_end_to_end_is_active">Salaus on aktivoitu</string>
-    <string name="room_settings_labs_end_to_end_warnings">Aktivoidaksesi salaus, kirjaudu ensin ulos.</string>
+    <string name="room_settings_labs_end_to_end_is_active">Salaus on käytössä</string>
+    <string name="room_settings_labs_end_to_end_warnings">Kirjaudu ulos salauksen aktivoimiseksi.</string>
     <string name="room_settings_never_send_to_unverified_devices_title">Lähetä salatut viestit vain vahvistetuille laitteille</string>
     <string name="room_settings_never_send_to_unverified_devices_summary">Salattuja viestejä ei lähetetä vahvistamattomille laitteille tässä huoneessa.</string>
 
@@ -638,9 +635,16 @@
 
     <string name="room_settings_addresses_e2e_enabled">Tämä huone on salattu.</string>
     <string name="room_settings_addresses_e2e_disabled">Tämä huone ei ole salattu.</string>
-    <string name="room_settings_addresses_e2e_encryption_warning">Ota käyttöön salaus \n(huom: salausta ei voi poistaa käytöstä!)</string>
+    <string name="room_settings_addresses_e2e_encryption_warning">Käytä salausta
+(HUOM! Salausta ei voi poistaa käytöstä!)</string>
     <string name="room_settings_addresses_e2e_prompt_title">Varoitus!</string>
-    <string name="room_settings_addresses_e2e_prompt_message">Salaus on vielä betassa eikä välttämättä ole luotettava.\n\nÄlä vielä käytä sitä salaista tietoa varten.\n\nLaitteet eivät voi vielä lukea salattua historiaa ennen kuin ne ovat itse liittyneet huoneeseen.\n\nSalatut viestit eivät näy sovelluksissa jotka eivät vielä tue salausta.</string> <!-- ??? -->
+    <string name="room_settings_addresses_e2e_prompt_message">Salaus on testikäytössä, eikä välttämättä toimi luotettavasti.
+
+Älä käytä sitä salaista tietoa varten.
+
+Laitteet eivät voi näyttää salattuja viestejä ajalta ennen huoneeseen liittymistä.
+
+Salatut viestit eivät näy sovelluksissa, jotka eivät tue salausta.</string> <!-- ??? -->
 
     <!-- Directory -->
     <string name="directory_title">Luettelo</string>
@@ -673,7 +677,7 @@
     <string name="encryption_export_export">Vie</string>
     <string name="encryption_export_enter_passphrase">Anna salasana</string>
     <string name="encryption_export_confirm_passphrase">Vahvista salasana</string>
-    <string name="encryption_export_saved_as">Huoneen salausavaimet säästettiin tiedostoon \'%s\'</string>
+    <string name="encryption_export_saved_as">Huoneen salausavaimet tallennettiin tiedostoon \'%s\'</string>
 
     <string name="encryption_import_e2e_room_keys">Tuo salatun huoneen avaimet</string>
     <string name="encryption_import_room_keys">Tuo huoneen avaimet</string>
@@ -699,7 +703,9 @@
     <string name="encryption_information_verify_device_warning2">Jos avain täsmää, paina \"vahvista\". Jos ei täsmää, se tarkoittaa että laitteen viestejä kaapataan. Tässä tapauksessa paina \"kiellä\".\nTulevaisuudessa tämä vahvistusprosessi tulee olemaan hienostuneempi.</string>
     <string name="encryption_information_verify_key_match">Vahvistan että avaimet täsmäävät</string>
 
-    <string name="e2e_enabling_on_app_update">Riot tukee nyt viestien salausta. Kirjaudu sisään uudelleen ottaaksesi käyttöön salaus.\n\nVoit tehdä sen nyt tai myöhemmin sovelluksen asetuksissa.</string>
+    <string name="e2e_enabling_on_app_update">Riot tukee viestien salausta. Kirjaudu sisään uudelleen ottaaksesi salaus käyttöön.
+
+Voit tehdä sen nyt tai myöhemmin sovelluksen asetuksissa.</string>
 
     <!-- unknown devices management -->
     <string name="unknown_devices_alert_title">Huoneessa on tuntemattomia laitteita</string>
@@ -711,14 +717,14 @@
     <string name="directory_server_type_homeserver">Syötä kotipalvelin jolta listataan julkiset huoneet</string>
     <string name="directory_server_placeholder">Kotipalvelimen URL</string>
     <string name="directory_server_all_rooms_on_server">Kaikki huoneet palvelimella %s</string>
-    <string name="directory_server_native_rooms">Kaikki kotoperäiset %s huoneet</string>
+    <string name="directory_server_native_rooms">Kaikki alkuperäiset %s huoneet</string>
 
     <!-- Notifications -->
     <string name="notification_unread_notified_messages">%d lukematonta ilmoitettua viestiä</string>
     <string name="notification_unread_notified_messages_in_room">%1$d unread messages in %2$d rooms"</string>
 
     <!-- historical -->
-    <string name="historical_placeholder">Hae historiallista</string>
+    <string name="historical_placeholder">Hae historiasta</string>
 <string name="user_directory_header">Käyttäjähakemisto</string>
     <string name="people_search_user_directory">KÄYTTÄJÄHAKEMISTO (%s)</string>
     <string name="settings_start_on_boot">Käynnistä automaattisesti</string>
@@ -752,4 +758,76 @@
     <string name="huge">Valtava</string>
 <string name="offline">Offline</string>
 
-    </resources>
+    <string name="light_theme">Vaalea teema</string>
+    <string name="dark_theme">Tumma teema</string>
+    <string name="black_them">Musta teema</string>
+
+    <string name="notification_sync_in_progress">Synkronoidaan</string>
+    <string name="notification_listen_for_events">Seuraa tapahtumia</string>
+    <string name="notification_noisy_notifications">Korostetut ilmoitukset</string>
+    <string name="notification_silent_notifications">Hiljaiset ilmoitukset</string>
+
+    <string name="title_activity_bug_report">Virheraportti</string>
+
+    <string name="option_take_photo">Ota kuva</string>
+    <string name="option_take_video">Kaappaa video</string>
+
+    <string name="login_mobile_device">Mobiili</string>
+
+    <string name="call">Puhelu</string>
+    <string name="settings_notification_ringtone">Ilmoitusääni</string>
+    <string name="settings_containing_my_display_name">Viesti sisältää näyttönimeni</string>
+    <string name="settings_containing_my_user_name">Viesti sisältää käyttäjänimeni</string>
+    <string name="settings_12_24_timestamps">Näytä aikaleimat 12h muodossa (esim. 2:30pm)</string>
+    <string name="settings_hide_join_leave_messages">Piilota liittymis-/poistumisilmoitukset (ei vaikuta kutsuihin/poistoihin/estoihin)</string>
+    <string name="settings_hide_avatar_display_name_changes_messages">Piilota kuvan ja näyttönimen muutokset</string>
+
+    <string name="settings_analytics">Analytiikka</string>
+    <string name="settings_opt_out_of_analytics">Älä jaa analytiikkatietoja</string>
+    <string name="settings_opt_out_of_analytics_summary">Riot kerää anonyymiä analytiikkaa sovelluksen parantamiseksi.</string>
+
+
+    <string name="widget_no_power_to_manage">Tarvitse oikeudet pienoissovellusten hallintaan tässä huoneessa</string>
+    <string name="widget_creation_failure">Pienoissovelluksen luonti epäonnistui</string>
+    <string name="event_formatter_widget_added">%1$s listättiin %2$s toimesta</string>
+    <string name="event_formatter_widget_removed">%1$s poistettiin %2$s toimesta</string>
+    <string name="settings_labs_create_conference_with_jitsi">Luo konferenssipuhelu jitsin avulla</string>
+    <string name="widget_delete_message_confirmation">Haluatko varmasti poistaa pienoissovelluksen?</string>
+    <string name="active_widgets">%1$d aktiivista pienoissovellusta</string>
+
+    // Widget Integration Manager
+    <string name="widget_integration_unable_to_create">Pienoissovellusta ei voitu luoda.</string>
+    <string name="widget_integration_failed_to_send_request">Pyynnön lähetys epäonnistui.</string>
+    <string name="widget_integration_positive_power_level">Oikeustason täytyy olla positiivinen luku.</string>
+    <string name="widget_integration_must_be_in_room">Et ole tässä huoneessa.</string>
+    <string name="widget_integration_no_permission_in_room">Sinulla ei ole oikeutta suorittaa toimintoa tässä huoneessa.</string>
+    <string name="widget_integration_missing_room_id">room_id puuttuu pyynnöstä.</string>
+    <string name="widget_integration_missing_user_id">user_id puuttuu pyynnöstä.</string>
+    <string name="widget_integration_room_not_visible">Huone %s ei ole näkyvillä.</string>
+    <string name="settings_labs_matrix_apps">Matrix Sovellukset</string>
+    <string name="room_add_matrix_apps">Lisää Matrix sovellus</string>
+    <string name="settings_labs_native_camera">Käytä alkuperäistä kamerasovellusta</string>
+
+    // share keys
+    <string name="you_added_a_new_device">Lisäsit uuden laitteen \'%s\', joka pyytää salausavaimia.</string>
+    <string name="your_unverified_device_requesting">Tunnistamaton laite \'%s\' haluaa salausavaimet.</string>
+    <string name="start_verification">Aloita varmennus</string>
+    <string name="share_without_verifying">Jaa ilman varmennusta</string>
+    <string name="ignore_request">Hylkää pyyntö</string>
+
+    // conference call
+    <string name="conference_call_warning_title">Varoitus!</string>
+    <string name="conference_call_warning_message">Konferenssipuhelu on yhtä kehitysvaiheessa eikä välttämättä ole luotettava.</string>
+
+    // slash commands
+    <string name="command_error">Virheellinen komento</string>
+    <string name="unrecognized_command">Tuntematon komento: %s</string>
+
+    // notification statuses
+    <string name="notification_off">Off</string>
+    <string name="notification_on">On</string>
+    <string name="notification_noisy">Äänekäs</string>
+
+    <string name="encrypted_message">Salattu viesti</string>
+
+</resources>
diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml
index 1c4a77e5a8..fab1b4c0f6 100644
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@@ -29,10 +29,10 @@
     <string name="ongoing_conference_call">" Téléconférence en cours. La rejoindre en vocal ou en vidéo."</string>
     <string name="ongoing_conference_call_voice">vocal</string>
     <string name="ongoing_conference_call_video">vidéo</string>
-    <string name="cannot_start_call">Impossible de démarrer l\'appel, réessayez plus tard</string>
+    <string name="cannot_start_call">Impossible d\'initier l\'appel, réessayez plus tard</string>
     <string name="missing_permissions_warning">En raison de permissions manquantes, certaines fonctionnalités peuvent être absentes...</string>
-    <string name="missing_permissions_to_start_conf_call">Vous avez besoin de la permission d\'invitation pour démarrer une téléconférence dans ce salon</string>
-    <string name="missing_permissions_title_to_start_conf_call">Impossible de démarrer l\'appel</string>
+    <string name="missing_permissions_to_start_conf_call">Vous avez besoin de la permission d\'invitation pour initier une téléconférence dans ce salon</string>
+    <string name="missing_permissions_title_to_start_conf_call">Impossible d\'initier l\'appel</string>
     <string name="device_information">Informations sur l\'appareil</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Les téléconférences ne sont pas prises en charge dans les salons chiffrés</string>
     <string name="or">ou</string>
@@ -58,12 +58,12 @@ Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
 
     <string name="bottom_action_home">Accueil</string>
     <string name="bottom_action_favourites">Favoris</string>
-    <string name="bottom_action_people">Personnes</string>
+    <string name="bottom_action_people">Participants</string>
     <string name="bottom_action_rooms">Salons</string>
 
-    <string name="home_filter_placeholder_home">Rechercher des salons</string>
-    <string name="home_filter_placeholder_favorites">Rechercher des favoris</string>
-    <string name="home_filter_placeholder_people">Rechercher des personnes</string>
+    <string name="home_filter_placeholder_home">Rechercher dans ces salons</string>
+    <string name="home_filter_placeholder_favorites">Rechercher dans les favoris</string>
+    <string name="home_filter_placeholder_people">Rechercher dans les participants</string>
     <string name="home_filter_placeholder_rooms">Rechercher des salons</string>
 
     <string name="invitations_header">Invitations</string>
@@ -174,11 +174,6 @@ Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
     <string name="call_error_ice_failed">Échec de la connexion</string>
     <string name="call_error_camera_init_failed">Impossible d\'initialiser l\'appareil photo</string>
     <string name="call_error_answered_elsewhere">Appel répondu ailleurs</string>
-    <string name="call_error_peer_hangup_elsewhere">Appel raccroché ailleurs</string>
-    <string name="call_error_peer_cancelled_call">Appel annulé</string>
-
-    <string name="action_accept">ACCEPTER</string>
-    <string name="action_ignore">IGNORER</string>
 
     <string name="media_picker_cannot_record_video">Impossible d\'enregistrer une vidéo</string>
 
@@ -228,8 +223,8 @@ Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
     <string name="room_participants_action_devices_list">Afficher la liste des appareils</string>
     <string name="people_search_local_contacts">CONTACTS LOCAUX (%d)</string>
     <string name="people_search_filter_text">Utilisateurs Matrix uniquement</string>
-    <string name="people_search_invite_by_id_dialog_title">Inviter un utilisateur par identifiant</string>
-    <string name="people_search_invite_by_id_dialog_hint">E-mail ou ID Matrix</string>
+    <string name="people_search_invite_by_id_dialog_title">Inviter un utilisateur par son identifiant Matrix</string>
+    <string name="people_search_invite_by_id_dialog_hint">E-mail ou identifiant Matrix</string>
 
     <string name="room_menu_search">Rechercher</string>
     <string name="room_message_placeholder_encrypted">Envoyer un message chiffré…</string>
@@ -246,8 +241,8 @@ Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
     <string name="ssl_remain_offline">Ignorer</string>
     <string name="ssl_fingerprint_example">00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</string>
 
-    <string name="room_details_title">Détails du salon</string>
-    <string name="room_details_people">Personnes</string>
+    <string name="room_details_title">Information sur le salon</string>
+    <string name="room_details_people">Participants</string>
     <string name="room_details_files">Fichiers</string>
     <string name="room_details_settings">Paramètres</string>
     <string name="room_details_selected">choisi</string>
@@ -267,7 +262,7 @@ Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
     <string name="search_no_results">Aucun résultat</string>
     <string name="tab_title_search_rooms">SALONS</string>
     <string name="tab_title_search_messages">MESSAGES</string>
-    <string name="tab_title_search_people">PERSONNES</string>
+    <string name="tab_title_search_people">PARTICIPANTS</string>
     <string name="tab_title_search_files">FICHIERS</string>
 
     <string name="room_recents_join">REJOINDRE</string>
@@ -283,12 +278,11 @@ Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
     <string name="directory_search_results_title">Parcourir le répertoire</string>
     <string name="directory_searching_title">Recherche dans le répertoire…</string>
 
-    <string name="room_settings_notifications">Notifications</string>
     <string name="room_settings_favourite">Favori</string>
     <string name="room_settings_de_prioritize">Passer en faible priorité</string>
     <string name="room_settings_direct_chat">Discussion directe</string>
     <string name="room_settings_leave_conversation">Quitter la discussion</string>
-    <string name="room_settings_forget">Oublier</string>
+    <string name="room_settings_forget">Abandonner</string>
 
     <string name="room_sliding_menu_messages">Messages</string>
     <string name="room_sliding_menu_settings">Paramètres</string>
@@ -304,7 +298,7 @@ Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
     <string name="settings_add_email_address">Ajouter une adresse e-mail</string>
     <string name="settings_phone_number">Téléphone</string>
     <string name="settings_add_phone_number">Ajouter un numéro de téléphone</string>
-    <string name="settings_summary_app_info_link">Écran d\'information sur le système d\'application</string>
+    <string name="settings_summary_app_info_link">Information sur l\'application</string>
     <string name="settings_title_app_info_link">Informations sur l\'application</string>
 
     <string name="settings_enable_all_notif">Activer les notifications pour ce compte</string>
@@ -335,7 +329,7 @@ Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
     <string name="settings_cryptography">Chiffrement</string>
     <string name="settings_notifications_targets">Cibles de notification</string>
     <string name="settings_contact">Contacts locaux</string>
-    <string name="settings_contacts_app_permission">Autorisation sur les contacts</string>
+    <string name="settings_contacts_app_permission">Autoriser l\'accès aux contacts locaux</string>
     <string name="settings_contacts_phonebook_country">Pays pour le répertoire téléphonique</string>
     <string name="settings_home_display">Page d\'accueil</string>
     <string name="settings_pin_missed_notifications">Épingler les salons avec des notifications manquées</string>
@@ -373,7 +367,6 @@ Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
     <string name="room_settings_room_name">Nom du salon</string>
     <string name="room_settings_topic">Sujet</string>
     <string name="room_settings_room_tag">Étiquette du salon</string>
-    <string name="room_settings_mute_notifs">Désactiver les notifications</string>
 
     <string name="room_settings_tag_pref_entry_favourite">Favori</string>
     <string name="room_settings_tag_pref_entry_low_priority">Priorité basse</string>
@@ -390,7 +383,7 @@ Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
 
     <string name="room_settings_banned_users_title">Utilisateurs bannis</string>
 
-    <string name="room_settings_category_advanced_title">Avancée</string>
+    <string name="room_settings_category_advanced_title">Avancé</string>
     <string name="room_settings_room_internal_id">L\'identifiant interne de ce salon</string>
     <string name="room_settings_addresses_pref_title">Adresses</string>
     <string name="room_settings_labs_pref_title">Expérimental</string>
@@ -467,7 +460,7 @@ Cliquez sur exporter pour les sauvegarder avant de vous déconnecter.</string>
     <string name="send_bug_report_alert_message">Vous semblez secouer le téléphone avec frustration. Souhaitez-vous soumettre un rapport d\'erreur ?</string>
     <string name="send_bug_report_app_crashed">L\'application s\'est arrêtée anormalement la dernière fois. Souhaitez-vous soumettre un rapport d’erreur ?</string>
 
-    <string name="send_bug_report_sent">Le rapport d\'erreur a été envoyé avec succès</string>
+    <string name="send_bug_report_sent">Le rapport d\'erreur a bien été envoyé</string>
     <string name="send_bug_report_failed">L\'envoi du rapport d\'erreur a échoué (%s)</string>
     <string name="auth_add_email_message">Ajoutez une adresse e-mail à votre compte pour permettre aux utilisateurs de vous retrouver et pour pouvoir réinitialiser votre mot de passe.</string>
     <string name="auth_add_phone_message">Ajoutez un numéro de téléphone à votre compte pour permettre aux utilisateurs de vous retrouver.</string>
@@ -513,9 +506,6 @@ Veuillez nous excuser pour ce désagrément.</string>
     <string name="attachment_remaining_time_seconds">%d s</string>
     <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
 
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <string name="leave">Quitter</string>
     <string name="quote">Citer</string>
     <string name="call_error_user_not_responding">Le correspondant n\'a pas décroché.</string>
@@ -595,7 +585,7 @@ En êtes-vous sûr(e) ?</string>
     <string name="malformed_id">Identifiant au mauvais format. Une adresse e-mail ou un identifiant Matrix au format \"@utilisateur:domaine\" est attendu</string>
     <string name="room_event_action_report_prompt_ignore_user">Voulez-vous cacher tous les messages de cet utilisateur ?</string>
     <string name="room_displayname_two_members">%1$s et %2$s</string>
-    <string name="room_displayname_more_than_two_members">%1$s, %2$d et d\'autres</string>
+    <string name="room_displayname_more_than_two_members">%1$s et %2$d autres</string>
     <string name="room_recents_join_room_prompt">Saisissez un identifiant ou un alias de salon</string>
 
     <string name="directory_search_room">%1$d salon</string>
@@ -691,7 +681,7 @@ Appareils inconnus :</string>
     <string name="settings_select_language">Choisissez une langue</string>
 
     <string name="account_email_already_used_error">Cette adresse e-mail est déjà utilisée</string>
-    <string name="account_email_not_found_error">Impossible d\'envoyer l\'e-mail : cette adresse e-mail n\'a pas pu être trouvée</string>
+    <string name="account_email_not_found_error">Impossible d\'envoyer l\'e-mail : adresse non trouvée</string>
     <string name="account_phone_number_already_used_error">Ce numéro de téléphone est déjà utilisé</string>
 
     <string name="offline">Hors ligne</string>
@@ -707,7 +697,7 @@ Appareils inconnus :</string>
     <string name="settings_hide_read_receipts">Masquer les accusés de lecture</string>
     <string name="settings_dont_send_typings_notifs">Ne pas envoyer de notification d\'écriture</string>
     <string name="settings_always_show_timestamps">Toujours afficher l\'heure des messages</string>
-    <string name="settings_disable_markdown">Désactiver le formatage Markdown</string>
+    <string name="settings_disable_markdown">Désactiver le formatage Markdown lors de l\'envoi des messages</string>
     <string name="settings_data_save_mode">Mode économie de données</string>
 
     <string name="media_saving_period_3_days">3 jours</string>
@@ -729,7 +719,7 @@ Appareils inconnus :</string>
     <string name="dark_theme">Thème sombre</string>
     <string name="black_them">Thème noir</string>
 
-    <string name="notification_sync_in_progress">Synchronisation en cours</string>
+    <string name="notification_sync_in_progress">Synchronisation</string>
     <string name="notification_listen_for_events">Écoute d\'évènements</string>
 
     <string name="login_mobile_device">Portable</string>
@@ -748,10 +738,8 @@ Appareils inconnus :</string>
     <string name="active_widgets">%1$d widgets actifs</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">Vous devez avoir la permission d\'inviter des utilisateurs pour faire cela.</string>
     <string name="widget_integration_unable_to_create">Impossible de créer le widget.</string>
     <string name="widget_integration_failed_to_send_request">Échec de l\'envoi de la requête.</string>
-    <string name="widget_integration_room_not_recognised">Ce salon n\'est pas reconnu.</string>
     <string name="widget_integration_positive_power_level">Le rang doit être un entier positif.</string>
     <string name="widget_integration_must_be_in_room">Vous n\'êtes pas dans ce salon.</string>
     <string name="widget_integration_no_permission_in_room">Vous n\'avez pas la permission de faire cela dans ce salon.</string>
@@ -760,8 +748,7 @@ Appareils inconnus :</string>
     <string name="widget_integration_room_not_visible">Le salon %s n\'est pas visible.</string>
     <string name="settings_labs_matrix_apps">Applications Matrix</string>
     <string name="room_add_matrix_apps">Ajouter des applications Matrix</string>
-    <string name="add_matrix_apps_not_supported">Non pris en charge sur cet appareil</string>
-<string name="call">Appel</string>
+    <string name="call">Appel</string>
     <string name="settings_containing_my_display_name">Messages contenant mon nom affiché</string>
     <string name="settings_containing_my_user_name">Messages contenant mon nom d\'utilisateur</string>
     <string name="you_added_a_new_device">Vous avez ajouté un nouvel appareil \"%s\", qui demande les clés de chiffrement.</string>
@@ -770,7 +757,7 @@ Appareils inconnus :</string>
     <string name="share_without_verifying">Partager sans vérifier</string>
     <string name="ignore_request">Ignorer la demande</string>
 
-<string name="notification_noisy_notifications">Notifications bruyantes</string>
+<string name="notification_noisy_notifications">Notifications sonores</string>
     <string name="notification_silent_notifications">Notifications silencieuses</string>
 
     <string name="option_take_photo">Prendre une photo</string>
@@ -784,4 +771,94 @@ Appareils inconnus :</string>
     <string name="settings_labs_native_camera">Utiliser la caméra native</string>
 
     // share keys
+    <string name="title_activity_bug_report">Rapport d\'erreur</string>
+
+    <string name="conference_call_warning_title">Attention !</string>
+    <string name="conference_call_warning_message">L\'appel en téléconférence est en cours de développement et peut ne pas être fiable.</string>
+
+    // slash commands
+    <string name="command_error">Erreur de commande</string>
+    <string name="unrecognized_command">Commande non reconnue : %s</string>
+
+    // notification statuses
+    <string name="notification_off">Désactivé</string>
+    <string name="notification_on">Activé</string>
+    <string name="notification_noisy">Notification sonore</string>
+
+    <string name="encrypted_message">Message chiffré</string>
+
+<string name="loading">Chargement…</string>
+
+    <string name="title_activity_group_details">Informations sur la communauté</string>
+
+    <string name="bottom_action_groups">Communautés</string>
+
+    <string name="home_filter_placeholder_groups">Rechercher dans ces communautés</string>
+
+    <string name="groups_invite_header">Inviter</string>
+    <string name="groups_header">Communautés</string>
+    <string name="no_group_placeholder">Aucun groupe</string>
+
+    <string name="start_new_chat_prompt_msg">Voulez-vous vraiment engager une nouvelle discussion avec %s ?</string>
+    <string name="start_voice_call_prompt_msg">Voulez-vous vraiment engager un nouvel appel vocal ?</string>
+    <string name="start_video_call_prompt_msg">Voulez-vous vraiment engager un nouvel appel vidéo ?</string>
+
+    <string name="groups_list">Liste des Groupes</string>
+
+    <string name="room_participants_kick_prompt_msg">Voulez-vous vraiment exclure cet utilisateur de la discussion ?</string>
+    <string name="room_participants_ban_prompt_msg">Voulez-vous vraiment bannir cet utilisateur de la discussion ?</string>
+
+    <string name="action_exit">Quitter</string>
+    <string name="room_settings_all_messages_noisy">Notification sonore pour chaque message</string>
+    <string name="room_settings_all_messages">Notification pour chaque message</string>
+    <string name="room_settings_mention_only">Notifier uniquement lorsque mon nom est mentionné</string>
+    <string name="room_settings_mute">Pas de notification</string>
+    <string name="room_settings_add_homescreen_shortcut">Ajouter un raccourci sur l\'écran d\'acceuil</string>
+
+    <string name="settings_inline_url_preview">Aperçu intégré des URL</string>
+    <string name="settings_vibrate_on_mention">Vibrer lorsque l\'on mentionne quelqu\'un</string>
+
+    <string name="room_settings_room_notifications_title">Notifications</string>
+    <string name="room_settings_no_flair">" Ce salon n\'a de vignettes pour aucune communauté"</string>
+    <string name="room_settings_add_new_group">Nouvel identifiant de communauté (ex. +foo:matrix.org)</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Identifiant de communauté invalide</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' n\'est pas un identifiant de communauté valide</string>
+
+
+    <string name="create">Créer</string>
+    <string name="create_community">Créer une communauté</string>
+    <string name="community_name">Nom de la communauté</string>
+    <string name="community_name_hint">Exemple</string>
+    <string name="community_id">Identifiant de communauté</string>
+    <string name="community_id_hint">Exemple</string>
+
+    // group details
+    <string name="group_details_home">Acceuil</string>
+    <string name="group_details_people">Personnes</string>
+    <string name="group_details_rooms">Salons</string>
+    <string name="no_users_placeholder">Pas d\'utilisateurs</string>
+
+    <string name="rooms">Salons</string>
+    <string name="joined">Rejoint</string>
+    <string name="invited">Invité</string>
+    <string name="filter_group_members">Filtrer les membres du groupe</string>
+    <string name="filter_group_rooms">Filtrer les salons du groupe</string>
+
+    <string name="group_one_member">Un membre</string>
+    <string name="group_members">%d membres</string>
+
+    <string name="group_one_room">Un salon</string>
+    <string name="group_rooms">%d salons</string>
+    <string name="group_no_long_description">L\'administrateur de cette communauté n\'a pas encore fourni de description.</string>
+
+    <string name="one_new_message">Un nouveau message</string>
+    <string name="new_messages">%d nouveaux messages</string>
+
+    <string name="has_been_kicked">%2$s vous a exclu de %1$s</string>
+    <string name="has_been_banned">%2$s vous a banni de %1$s</string>
+    <string name="reason_colon">Motif : %1$s</string>
+    <string name="rejoin">Rejoindre</string>
+    <string name="forget_room">Abandonner le salon</string>
+<string name="settings_flair">Badge</string>
+
     </resources>
diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml
index 17a010b0ef..3ab65bb646 100644
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@@ -8,7 +8,7 @@
     <string name="title_activity_home">Üzenetek</string>
     <string name="title_activity_room">Szoba</string>
     <string name="title_activity_settings">Beállítások</string>
-    <string name="title_activity_historical">Előzmény</string>
+    <string name="title_activity_historical">Előzmények</string>
 
     <string name="ok">OK</string>
     <string name="cancel">Mégse</string>
@@ -33,7 +33,7 @@
     <string name="ongoing_conference_call_video">videó</string>
     <string name="cannot_start_call">Nem sikerült hívást kezdeményezni, próbáld meg később</string>
     <string name="missing_permissions_warning">Hiányzó engedélyek miatt egyes funkciók talán nem elérhetőek..</string>
-    <string name="missing_permissions_to_start_conf_call">A szobában konferencia kezdeményezéséhez meghívási jogra van szükséged.</string>
+    <string name="missing_permissions_to_start_conf_call">Ezen szobában való értekezlet indításához meghívási jogosultság szükséges</string>
     <string name="missing_permissions_title_to_start_conf_call">Nem sikerült hívást kezdeményezni</string>
     <string name="device_information">Eszközinformáció</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Titkosított szobákban nem támogatott a konferenciahívás</string>
@@ -49,7 +49,7 @@ A kulcsok mentéséhez kijelentkezés előtt válaszd az exportálás opciót.</
     <string name="action_video_call">Videóhívás</string>
     <string name="action_global_search">Globális keresés</string>
     <string name="action_mark_all_as_read">Mindent olvasottnak jelöl</string>
-    <string name="action_historical">Előzmény</string>
+    <string name="action_historical">Előzmények</string>
     <string name="action_quick_reply">Gyors válasz</string>
     <string name="action_open">Megnyit</string>
     <string name="action_close">Bezár</string>
@@ -218,9 +218,6 @@ Elnézést a kellemetlenségért.</string>
     <string name="room_info_room_name">Szobanév</string>
     <string name="room_info_room_topic">Szoba témája</string>
 
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <string name="call_connected">Vonalban</string>
     <string name="call_connecting">Kapcsolódás…</string>
     <string name="call_ended">Hívás vége</string>
@@ -234,11 +231,6 @@ Elnézést a kellemetlenségért.</string>
     <string name="call_error_ice_failed">A médiacsatlakozás nem sikerült</string>
     <string name="call_error_camera_init_failed">A kamerát nem lehet inicializálni</string>
     <string name="call_error_answered_elsewhere">hívás felvéve máshol</string>
-    <string name="call_error_peer_hangup_elsewhere">hívás befejezve máshol</string>
-    <string name="call_error_peer_cancelled_call">hívás megszakítva</string>
-
-    <string name="action_accept">ELFOGADÁS</string>
-    <string name="action_ignore">ELUTASÍT</string>
 
     <string name="media_picker_both_capture_title">Készíts képet vagy videót</string>
     <string name="media_picker_cannot_record_video">Videórögzítés sikertelen</string>
@@ -373,64 +365,63 @@ Biztos vagy benne?</string>
     <string name="ssl_logout_account">Kijelentkezés</string>
     <string name="ssl_remain_offline">Mellőz</string>
     <string name="ssl_fingerprint_hash">Ujjlenyomat (%s):</string>
-    <string name="ssl_could_not_verify">Nem sikerült a távoli szerver azonosságának ellenőrzése.</string>
+    <string name="ssl_could_not_verify">Nem sikerült ellenőrizni a távoli szerver azonosságát.</string>
     <string name="ssl_cert_not_trust">Ez jelentheti azt is, hogy valaki rossz szándékkal lehallgatja a forgalmadat, vagy azt, hogy a telefonod nem bízik meg a távoli szervertől kapott tanúsítványban.</string>
     <string name="ssl_cert_new_account_expl">Ha a szerver adminisztrátora szerint ez várható volt, akkor bizonyosodj meg róla, hogy az alábbi ujjlenyomat megegyezik a tőle kapottal.</string>
-    <string name="ssl_unexpected_existing_expl">A tanúsítvány eltér a telefonod által megbízottól. Ez RENDKÍVÜL SZOKATLAN. Erősen ajánlott, hogy NE FOGADD EL ezt az új tanúsítványt.</string>
-    <string name="ssl_expected_existing_expl">A tanúsítvány megváltozott megbízhatóról még nem megbízhatóra. A szerver lehet, hogy megváltoztatta tanúsítványát. Kérlek lépj kapcsolatba a szerver adminisztrátorral és egyeztesd az ujjlenyomatot.</string>
-    <string name="ssl_only_accept">CSAK AKKOR fogadd el a tanúsítványt ha a szerver adminisztrátor által megadott ujjlenyomat egyezik a fentebb láthatóval.</string>
+    <string name="ssl_unexpected_existing_expl">A tanúsítvány eltér attól, amit a telefonoddal megbízhatónak jelöltél. Ez RENDKÍVÜL SZOKATLAN. Javasoljuk, hogy NE FOGADD EL ezt az új tanúsítványt.</string>
+    <string name="ssl_expected_existing_expl">Egy korábban megbízhatónak jelölt tanúsítvány megváltozott. Lehet, hogy a szerver frissítette a tanúsítványát. Lépj kapcsolatba a szerver adminisztrátorával és egyeztesd az ujjlenyomatot.</string>
+    <string name="ssl_only_accept">CSAK AKKOR fogadd el a tanúsítványt, ha a szerver adminisztrátortól kapott ujjlenyomat megegyezik a fentivel.</string>
     <string name="ssl_fingerprint_example">00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</string>
 
     <string name="room_details_title">Szoba adatai</string>
     <string name="room_details_people">Résztvevők</string>
     <string name="room_details_files">Fájlok</string>
     <string name="room_details_settings">Beállítások</string>
-    <string name="room_details_selected">kiválaszott</string>
-    <string name="malformed_id">Nem megfelelő Azonosító. Egy Matrix Azonosítónak vagy egy E-mail-nek kéne lennie, mint például \'@localpart:domain\'</string>
+    <string name="room_details_selected">kiválasztva</string>
+    <string name="malformed_id">Rossz formátumú azonosító. Vagy e-mail cím vagy Matrix azonosító legyen, mint például „@valakivagyok:domainnev”</string>
     <string name="room_details_people_invited_group_name">MEGHÍVOTT</string>
     <string name="room_details_people_present_group_name">CSATLAKOZOTT</string>
 
-    <string name="room_event_action_report_prompt_reason">Ennek a tartalomnak jelentésének az oka</string>
-    <string name="room_event_action_report_prompt_ignore_user">El akarod rejteni az összes üzentet ettől a felhasználótól?</string>
+    <string name="room_event_action_report_prompt_reason">A tartalom bejelentésének oka</string>
+    <string name="room_event_action_report_prompt_ignore_user">El akarod rejteni a felhasználó összes üzenetét?</string>
     <string name="room_event_action_cancel_upload">Feltöltés megszakítása</string>
     <string name="room_event_action_cancel_download">Letöltés megszakítása</string>
 
-    <string name="room_displayname_invite_from">Meghívás %s -tól/-től</string>
-    <string name="room_displayname_room_invite">Meghívás szobába</string>
+    <string name="room_displayname_invite_from">%s meghívott</string>
+    <string name="room_displayname_room_invite">Meghívó egy szobába</string>
     <string name="room_displayname_two_members">%1$s és %2$s</string>
-    <string name="room_displayname_more_than_two_members">"%1$s, %2$d  és mások"</string>
+    <string name="room_displayname_more_than_two_members">%1$s és még %2$d tag</string>
     <string name="room_displayname_no_title">Üres szoba</string>
 
     <string name="search_hint">Keresés</string>
-    <string name="search_members_hint">Szoba tagok szűrése</string>
-    <string name="search_no_results">Nincsenek találatok</string>
+    <string name="search_members_hint">Szobatagok szűrése</string>
+    <string name="search_no_results">Nincs találat</string>
     <string name="tab_title_search_rooms">SZOBÁK</string>
     <string name="tab_title_search_messages">ÜZENETEK</string>
     <string name="tab_title_search_people">EMBEREK</string>
     <string name="tab_title_search_files">FÁJLOK</string>
 
-    <string name="room_recents_join">JOIN</string>
+    <string name="room_recents_join">BELÉPÉS</string>
     <string name="room_recents_directory">KÖNYVTÁR</string>
     <string name="room_recents_favourites">KEDVENCEK</string>
     <string name="room_recents_conversations">SZOBÁK</string>
     <string name="room_recents_low_priority">ALACSONY PRIORITÁSÚ</string>
     <string name="room_recents_invites">MEGHÍVÁSOK</string>
-    <string name="room_recents_start_chat">Csevegés kezdeményezése</string>
+    <string name="room_recents_start_chat">Csevegés indítása</string>
     <string name="room_recents_create_room">Szoba létrehozása</string>
     <string name="room_recents_join_room">Csatlakozás szobához</string>
     <string name="room_recents_join_room_title">Csatlakozás egy szobához</string>
-    <string name="room_recents_join_room_prompt">Írja be a szoba azonosítóját vagy nevét</string>
+    <string name="room_recents_join_room_prompt">Írd be a szoba azonosítóját vagy nevét</string>
 
     <string name="directory_search_results_title">Könyvtár böngészése</string>
     <string name="directory_search_room">%1$d szoba</string>
-    <string name="directory_search_rooms">%1$d szobák</string>
-    <string name="directory_search_room_for">%1$d szoba megtalálva %2$s -nak/-nek</string>
-    <string name="directory_search_rooms_for">%1$s szobák megtalálva %2$s -nak/-nek</string>
-    <string name="directory_searching_title">Könyvtárs keresése...</string>
-
-    <string name="room_settings_notifications">Üzenetek</string>
-    <string name="room_settings_favourite">Kedvencek</string>
-    <string name="room_settings_de_prioritize">Prioritás szint csökkentése</string>
+    <string name="directory_search_rooms">%1$d szoba</string>
+    <string name="directory_search_room_for">%2$s kulcsszóra %1$d szobatalálat</string>
+    <string name="directory_search_rooms_for">%2$s kulcsszóra %1$s szobatalálat</string>
+    <string name="directory_searching_title">Könyvtár keresése...</string>
+
+    <string name="room_settings_favourite">Kedvenc</string>
+    <string name="room_settings_de_prioritize">Prioritás csökkentése</string>
     <string name="room_settings_direct_chat">Közvetlen csevegés</string>
     <string name="room_settings_leave_conversation">Beszélgetés elhagyása</string>
     <string name="room_settings_forget">Elfelejtés</string>
@@ -443,26 +434,26 @@ Biztos vagy benne?</string>
     <string name="room_sliding_menu_copyright">Szerzői jog</string>
     <string name="room_sliding_menu_privacy_policy">Adatvédelmi irányelvek</string>
 
-    <string name="settings_profile_picture">Profil kép</string>
+    <string name="settings_profile_picture">Profilkép</string>
     <string name="settings_display_name">Megjelenítendő név</string>
     <string name="settings_email_address">E-mail</string>
     <string name="settings_add_email_address">E-mail cím hozzáadása</string>
     <string name="settings_phone_number">Telefon</string>
     <string name="settings_add_phone_number">Telefonszám hozzáadása</string>
-    <string name="settings_summary_app_info_link">Alkalmazás rendszer információs képernyő</string>
+    <string name="settings_summary_app_info_link">Alkalmazás infók a rendszerbeállításokban</string>
     <string name="settings_title_app_info_link">Alkalmazás infó</string>
 
-    <string name="settings_enable_all_notif">Értesítések engedélyezése ehhez a felhasználóhoz</string>
-    <string name="settings_enable_this_device">Értesítések engedélyezése ehhez a készülékhez</string>
-    <string name="settings_turn_screen_on">Kapcsolja be a képernyőt 3 másodpercre</string>
+    <string name="settings_enable_all_notif">Értesítések bekapcsolása ehhez a felhasználóhoz</string>
+    <string name="settings_enable_this_device">Értesítések bekapcsolása ehhez a készülékhez</string>
+    <string name="settings_turn_screen_on">Képernyő bekapcsolása 3 másodpercre</string>
 
-    <string name="settings_messages_in_one_to_one">Üzenetek közvetlen (1-1) csevegéseknél</string>
-    <string name="settings_messages_in_group_chat">Üzenetek több résztvevős csevegéseknél</string>
+    <string name="settings_messages_in_one_to_one">Privát csevegések üzenetei</string>
+    <string name="settings_messages_in_group_chat">Csoportok csevegésének üzenetei</string>
     <string name="settings_invited_to_room">Amikor meghívnak egy szobába</string>
-    <string name="settings_call_invitations">Hívásra kérelmezés</string>
+    <string name="settings_call_invitations">Amikor felhívnak</string>
     <string name="settings_messages_sent_by_bot">Üzenetek robotoktól</string>
 
-    <string name="settings_background_sync">Háttérben történő szinkronizáció</string>
+    <string name="settings_background_sync">Szinkronizálás a háttérben</string>
     <string name="settings_enable_background_sync">Háttérben történő szinkronizáció engedélyezése</string>
     <string name="settings_set_sync_timeout">Szinkronizáció kérelem időtúllépés</string>
     <string name="settings_set_sync_delay">Késleltetés két szinkronizáció kérés között</string>
@@ -475,37 +466,37 @@ Biztos vagy benne?</string>
     <string name="settings_third_party_notices">Harmadik fél közlemények</string>
     <string name="settings_copyright">Szerzői jog</string>
     <string name="settings_privacy_policy">Adatvédelmi irányelvek</string>
-    <string name="settings_clear_cache">Cache ürítése</string>
+    <string name="settings_clear_cache">Gyorsítótár ürítése</string>
     <string name="settings_user_settings">Felhasználói beállítások</string>
     <string name="settings_notifications">Értesítések</string>
     <string name="settings_ignored_users">Mellőzött felhasználók</string>
-    <string name="settings_other">Más</string>
+    <string name="settings_other">Egyéb</string>
     <string name="settings_advanced">Haladó</string>
-    <string name="settings_cryptography">Rejtjelezés</string>
+    <string name="settings_cryptography">Titkosítás</string>
     <string name="settings_notifications_targets">Értesítés célok</string>
-    <string name="settings_contact">Helyi kapcsolatok</string>
-    <string name="settings_contacts_app_permission">Kapcsolatok engedély</string>
-    <string name="settings_contacts_phonebook_country">Telefonkönyv ország</string>
+    <string name="settings_contact">Helyi névjegyek</string>
+    <string name="settings_contacts_app_permission">Engedély a névjegyekhez</string>
+    <string name="settings_contacts_phonebook_country">Telefonkönyv országa</string>
     <string name="settings_home_display">Kezdőképernyő megjelenítés</string>
-    <string name="settings_pin_missed_notifications">Nem észrevett értesítésekkel rendelkező szobák kitűzése</string>
-    <string name="settings_pin_unread_messages">Nem olvasott üzenetekkel rendelkező szobák kitűzése</string>
+    <string name="settings_pin_missed_notifications">Nem látott értesítésekkel rendelkező szobák kitűzése</string>
+    <string name="settings_pin_unread_messages">Olvasatlan üzenetekkel rendelkező szobák kitűzése</string>
     <string name="settings_devices_list">Eszközök</string>
-    <string name="devices_details_dialog_title">Eszköz adatok</string>
+    <string name="devices_details_dialog_title">Eszköz adatai</string>
     <string name="devices_details_id_title">Azonosító</string>
     <string name="devices_details_name_title">Név</string>
-    <string name="devices_details_device_name">Készülék Név</string>
-    <string name="devices_details_last_seen_title">Utoljára látott</string>
+    <string name="devices_details_device_name">Készüléknév</string>
+    <string name="devices_details_last_seen_title">Legutóbb láttuk</string>
     <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
     <string name="devices_details_time_format">HH:mm:ss</string>
-    <string name="devices_delete_dialog_text">Ez a művelet további hitelesítést igényel.
-A folytatáshoz, kérlek írd be a jelszavad.</string>
+    <string name="devices_delete_dialog_text">Ez a művelethez újra azonosításra van szükség.
+A folytatáshoz írd be a jelszavad.</string>
     <string name="devices_delete_dialog_title">Azonosítás</string>
     <string name="devices_delete_pswd">Jelszó:</string>
-    <string name="devices_delete_submit_button_label">Beküldés</string>
+    <string name="devices_delete_submit_button_label">Küldés</string>
 
     <string name="settings_logged_in">Bejelentkezve mint</string>
-    <string name="settings_home_server">Saját Szerver</string>
-    <string name="settings_identity_server">Identitás Szerver</string>
+    <string name="settings_home_server">Szervered</string>
+    <string name="settings_identity_server">Identitásszerver</string>
 
     <string name="account_email_validation_title">Hitelesítés folyamatban</string>
     <string name="account_email_validation_message">Kérlek ellenőrizd az e-mail-ed és kattints a linkre amit tartalmaz. Amikor kész, kattints a folytatásra.</string>
@@ -540,7 +531,6 @@ A folytatáshoz, kérlek írd be a jelszavad.</string>
     <string name="room_settings_topic">Téma</string>
     <string name="room_settings_room_tag">Szoba címke</string>
     <string name="room_settings_tag_pref_dialog_title">Címkék:</string>
-    <string name="room_settings_mute_notifs">Értesítések némítása</string>
 
     <string name="room_settings_tag_pref_entry_favourite">Kedvencek</string>
     <string name="room_settings_tag_pref_entry_low_priority">Alacsony prioritású</string>
@@ -609,7 +599,7 @@ A titkosított üzenetek nem fognak látszódni azokon a klienseken ahol a titko
     <string name="directory_title">Könyvtár</string>
 
     <string name="failed_to_load_timeline_position">%s megpróbált betölteni egy adott időpontot ennek a szobának idővonalán de nem sikerült neki megtalálni.</string>
-    
+
     <string name="encryption_information_title">Végtől végig titkosítás információ</string>
 
     <string name="encryption_information_device_info">Esemény információ</string>
@@ -680,8 +670,8 @@ Ismeretlen eszközök:</string>
     <string name="directory_server_all_rooms_on_server">Összes szoba a %s szerveren</string>
     <string name="directory_server_native_rooms">Összes anyanyelvi %s szoba</string>
 
-    <string name="notification_unread_notified_messages">%d nem olvasott figyelmeztetés üzenet</string>
-    <string name="notification_unread_notified_messages_in_room">%1$d nem olvasott figyelmeztetés üzenetek a %2$d szobákban</string>
+    <string name="notification_unread_notified_messages">%d olvasatlan figyelmeztetés üzenet</string>
+    <string name="notification_unread_notified_messages_in_room">%1$d olvasatlan figyelmeztetés üzenet %2$d szobában</string>
 
     <string name="historical_placeholder">Előzmények keresése</string>
 
@@ -691,24 +681,24 @@ Ismeretlen eszközök:</string>
     <string name="settings_interface_language">Felület nyelve</string>
     <string name="settings_select_language">Válassz egy nyelvet</string>
 
-    <string name="account_email_already_used_error">Ez az e-mail cím már használatban van</string>
-    <string name="account_email_not_found_error">E-mail küldése sikertelen: Ez az e-mail cím nem található</string>
+    <string name="account_email_already_used_error">Ezt az e-mail címet már használják</string>
+    <string name="account_email_not_found_error">E-mail küldése sikertelen: ez a cím nem található</string>
     <string name="account_phone_number_already_used_error">Ez a telefonszám már használatban van</string>
 
     <string name="settings_start_on_boot">Indítás rendszerinduláskor</string>
     <string name="settings_clear_medias_cache">Média gyorsítótár törlése</string>
     <string name="settings_keep_media">Média megtartása</string>
 
-    <string name="settings_dont_send_typings_notifs">Ne küldjön írás értesítést</string>
-    <string name="settings_always_show_timestamps">Üzenet időbélyeg folyamatos megjelenítése</string>
-    <string name="settings_disable_markdown">Markdown formázás kikapcsolása</string>
+    <string name="settings_dont_send_typings_notifs">Ne küldjön írásértesítést</string>
+    <string name="settings_always_show_timestamps">Mindig jelenítse meg az üzenetek időbélyegét</string>
+    <string name="settings_disable_markdown">Markdown formázás kikapcsolása üzenet küldésekor</string>
 
     <string name="media_saving_period_3_days">3 nap</string>
     <string name="media_saving_period_1_week">1 hét</string>
     <string name="media_saving_period_1_month">1 hónap</string>
     <string name="media_saving_period_forever">Örökké</string>
 
-    <string name="settings_hide_read_receipts">Olvasási visszajelzés elrejtése</string>
+    <string name="settings_hide_read_receipts">Tértivevény elrejtése</string>
     <string name="people_search_user_directory">FELHASZNÁLÓ JEGYZÉK (%S)</string>
     <string name="settings_data_save_mode">Adattakarékos mód</string>
 
@@ -731,10 +721,10 @@ Ismeretlen eszközök:</string>
 
     <string name="login_mobile_device">Mobil</string>
 
-    <string name="settings_notification_ringtone">Értesítési hang</string>
-    <string name="settings_12_24_timestamps">Időbélyegek mutatása 12 órás formátumban (pl.: 2:30pm)</string>
-    <string name="settings_hide_join_leave_messages">Csatlakozás/kilépés üzenetek elrejtése (meghívások/kirúgások/letiltások nem érintettek)</string>
-    <string name="settings_hide_avatar_display_name_changes_messages">Profilkép és megjelenő név változások elrejtése</string>
+    <string name="settings_notification_ringtone">Értesítés hangja</string>
+    <string name="settings_12_24_timestamps">Időbélyegek mutatása 12 órás formátumban (pl.: du. 2:30)</string>
+    <string name="settings_hide_join_leave_messages">Belépés/kilépés üzenetek elrejtése (meghívást/kirúgást/kitiltást nem érinti)</string>
+    <string name="settings_hide_avatar_display_name_changes_messages">Profilkép és -név változásainak elrejtése</string>
 
     <string name="widget_no_power_to_manage">Engedélyre van szükséged a kisalkalmazások ebben a szobában való kezeléséhez</string>
     <string name="widget_creation_failure">Kisalkalmazás létrehozása sikertelen</string>
@@ -745,10 +735,8 @@ Ismeretlen eszközök:</string>
     <string name="active_widgets">%1$d aktív kisalkalmazások</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">Képesnek kell lenned felhasználók meghívására ha ezt akarod csinálni.</string>
     <string name="widget_integration_unable_to_create">Kisalkalmazás létrehozása sikertelen.</string>
     <string name="widget_integration_failed_to_send_request">Felkérés elküldése sikertelen.</string>
-    <string name="widget_integration_room_not_recognised">Nem sikerült felismerni ezt a szobát.</string>
     <string name="widget_integration_positive_power_level">Az erősségi szintnek egy pozitív egész számnak kell lennie.</string>
     <string name="widget_integration_must_be_in_room">Nem vagy ebben a szobában.</string>
     <string name="widget_integration_no_permission_in_room">Nincs engedélyed, hogy ezt csináld ebben a szobában.</string>
@@ -757,12 +745,11 @@ Ismeretlen eszközök:</string>
     <string name="widget_integration_room_not_visible">%s szoba nem látható.</string>
     <string name="settings_labs_matrix_apps">Matrix Alkalmazások</string>
     <string name="room_add_matrix_apps">Matrix alkalmazás hozzáadása</string>
-    <string name="add_matrix_apps_not_supported">Nem támogatott ezen az eszközön</string>
-<string name="notification_listen_for_events">Események figyelése</string>
+    <string name="notification_listen_for_events">Események figyelése</string>
 
     <string name="notification_sync_in_progress">Szinkronizálás</string>
     <string name="call">Hívás</string>
-    <string name="settings_containing_my_display_name">Megjelenítendő nevemet tartalmazó üzenetek</string>
+    <string name="settings_containing_my_display_name">Profilnevemet tartalmazó üzenetek</string>
     <string name="settings_containing_my_user_name">Felhasználónevemet tartalmazó üzenetek</string>
     <string name="you_added_a_new_device">Hozzá adtál egy új eszközt \'%s\', mely titkosító kulcsot kér.</string>
     <string name="your_unverified_device_requesting">Nem ellenőrzött eszközöd \'%s\' egy titkosító kulcsot kér.</string>
@@ -776,12 +763,102 @@ Ismeretlen eszközök:</string>
     <string name="option_take_photo">Fényképezés</string>
     <string name="option_take_video">Videófelvétel</string>
 
-    <string name="settings_analytics">Személytelen analitikai adatok</string>
+    <string name="settings_analytics">Elemzés</string>
     <string name="settings_opt_out_of_analytics">Analitikai adatgyűjtés kikapcsolása</string>
-    <string name="settings_opt_out_of_analytics_summary">Riot személytelenített analitikai adatokat gyűjt az alkalmazás fejlesztéséhez.</string>
+    <string name="settings_opt_out_of_analytics_summary">A Riot névtelen elemzést gyűjt az alkalmazás fejlesztésének érdekében.</string>
 
 
     <string name="settings_labs_native_camera">Beépített kamera használata</string>
 
     // share keys
+    <string name="title_activity_bug_report">Hiba jelentés</string>
+
+    <string name="conference_call_warning_title">Figyelmeztetés!</string>
+    <string name="conference_call_warning_message">A konferenciabeszélgetés fejlesztés alatt van, elképzelhető, hogy nem működik még megfelelően.</string>
+
+    // slash commands
+    <string name="command_error">Utasítás hiba</string>
+    <string name="unrecognized_command">Ismeretlen utasítás: %s</string>
+
+    // notification statuses
+    <string name="notification_off">Ki</string>
+    <string name="notification_on">Be</string>
+    <string name="notification_noisy">Hangos</string>
+
+    <string name="encrypted_message">Titkosított üzenet</string>
+
+<string name="title_activity_group_details">A közösség adatai</string>
+
+    <string name="loading">Betöltés...</string>
+
+    <string name="action_exit">Kilépés</string>
+    <string name="bottom_action_groups">Közösségek</string>
+
+    <string name="home_filter_placeholder_groups">Közösségek keresése</string>
+
+    <string name="groups_invite_header">Meghív</string>
+    <string name="groups_header">Közösségek</string>
+    <string name="no_group_placeholder">Nincsenek csoportok</string>
+
+    <string name="start_new_chat_prompt_msg">Biztos, hogy új beszélgetést akarsz kezdeni vele: %s?</string>
+    <string name="start_voice_call_prompt_msg">Biztos, hogy hanghívást akarsz kezdeményezni?</string>
+    <string name="start_video_call_prompt_msg">Biztos, hogy videóhívást akarsz kezdeményezni?</string>
+
+    <string name="groups_list">Csoportok listája</string>
+
+    <string name="room_participants_kick_prompt_msg">Biztos, hogy ki akarod rúgni ezt az illetőt ebből a beszélgetésből?</string>
+    <string name="room_participants_ban_prompt_msg">Biztos, hogy ki akarod tiltani ezt az illetőt ebből a beszélgetésből?</string>
+
+    <string name="room_settings_all_messages_noisy">Összes üzenet (hangos)</string>
+    <string name="room_settings_all_messages">Összes üzenet</string>
+    <string name="room_settings_mention_only">Csak megemlítések</string>
+    <string name="room_settings_mute">Némítás</string>
+    <string name="room_settings_add_homescreen_shortcut">Kezdőképernyő parancsikon hozzáadása</string>
+
+    <string name="settings_vibrate_on_mention">Rezegés megemlítéskor</string>
+
+    <string name="room_settings_room_notifications_title">Értesítések</string>
+    <string name="room_settings_add_new_group">Új közösség azonosító (pl.: +foo:matrix.org)</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Érvénytelen közösség azonosító</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' nem egy érvényes közösség azonosító</string>
+
+
+    <string name="create">Létrehoz</string>
+    <string name="create_community">Közösség létrehozása</string>
+    <string name="community_name">Közösség neve</string>
+    <string name="community_name_hint">Példa</string>
+    <string name="community_id">Közösség azonosító</string>
+    <string name="community_id_hint">példa</string>
+
+    // group details
+    <string name="group_details_rooms">Szobák</string>
+    <string name="group_details_people">Emberek</string>
+    <string name="no_users_placeholder">Nincsenek felhasználók</string>
+
+    <string name="rooms">Szobák</string>
+    <string name="joined">Csatlakozott</string>
+    <string name="invited">Meghívott</string>
+    <string name="filter_group_members">Csoport tagjai szűrése</string>
+    <string name="filter_group_rooms">Csoport szobái szűrése</string>
+
+    <string name="group_one_member">1 tag</string>
+    <string name="group_members">%d felhasználó</string>
+
+    <string name="group_one_room">1 szoba</string>
+    <string name="group_rooms">%d szoba</string>
+    <string name="group_no_long_description">A közösség adminisztrátora nem adott meg hosszú leírást ehhez a közösséghez.</string>
+
+    <string name="one_new_message">1 új üzenet</string>
+    <string name="new_messages">%d új üzenet</string>
+
+    <string name="has_been_kicked">Ki lettél rúgva innen: %1$s, %2$s által</string>
+    <string name="has_been_banned">Ki lettél tiltva innen: %1$s, %2$s által</string>
+    <string name="reason_colon">Ok: %1$s</string>
+    <string name="rejoin">Újracsatlakozás</string>
+    <string name="forget_room">Szoba elfelejtése</string>
+<string name="settings_inline_url_preview">"Üzenetekben URL előnézet engedélyezése alapbeállításként "</string>
+    <string name="settings_flair">Kitűző</string>
+
+    <string name="room_settings_no_flair">" Ez a szoba nem mutatja  a közösségek kitűzőit"</string>
+    <string name="group_details_home">Kezdőlap</string>
     </resources>
diff --git a/vector/src/main/res/values-id/strings.xml b/vector/src/main/res/values-id/strings.xml
index 01dd79d857..fcc8dd0594 100644
--- a/vector/src/main/res/values-id/strings.xml
+++ b/vector/src/main/res/values-id/strings.xml
@@ -140,10 +140,6 @@
     <string name="call_connected">Panggilan terhubung</string>
     <string name="call_connecting">Menyambungkan panggilan…</string>
     <string name="call_ended">Panggilan diakhiri</string>
-    <string name="call_error_peer_cancelled_call">panggilan dibatalkan</string>
-
-    <string name="action_accept">TERIMA</string>
-    <string name="action_ignore">ABAIKAN</string>
 
     <string name="permissions_rationale_popup_title">Informasi</string>
     <string name="media_slider_saved">Tersimpan</string>
@@ -264,10 +260,8 @@ Mohon maaf untuk ketidaknyamannya.</string>
 
     <string name="call_error_ice_failed">Hubungan Media Gagal</string>
     <string name="auth_identity_server">Server Identitas</string>
-    <string name="settings_key_display_all_events">pengaturan_tombol_pertunjukan_semua_acara</string>
     <string name="call_error_camera_init_failed">Kamera tidak bisa dibuka</string>
     <string name="call_error_answered_elsewhere">panggilan gagal dijawab di tempat lain</string>
-    <string name="call_error_peer_hangup_elsewhere">panggilan telepon ditutup di suatu tempat</string>
     <string name="media_picker_both_capture_title">Ambil sebuah gambar atau video</string>
     <string name="media_picker_cannot_record_video">Tidak bisa merekam video</string>
 
diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml
index 8d2791d789..f8cde20a32 100644
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@@ -234,10 +234,6 @@
     <string name="room_info_room_name">Nome stanza</string>
     <string name="room_info_room_topic">Argomento stanza</string>
 
-    <!-- Settings keys -->
-    <string name="settings_key_display_all_events">mostra_tutti_gli_eventi</string>
-    <string name="settings_key_use_rage_shake">usa_squotimento_furioso</string>
-
     <!-- call string -->
     <string name="call_connected">Chiamata connessa</string>
     <string name="call_connecting">Chiamata in connessione…</string>
@@ -252,11 +248,6 @@
     <string name="call_error_ice_failed">Connessione al supporto media fallita</string>
     <string name="call_error_camera_init_failed">Impossibile avviare la fotocamera</string>
     <string name="call_error_answered_elsewhere">chiamata risulta risposta altrove</string>
-    <string name="call_error_peer_hangup_elsewhere">chiamata risulta agganciata altrove</string>
-    <string name="call_error_peer_cancelled_call">chiamata annullata</string>
-
-    <string name="action_accept">ACCETTA</string>
-    <string name="action_ignore">IGNORA</string>
 
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Fai una foto o un video</string>
@@ -444,7 +435,6 @@
     <string name="directory_searching_title">Ricerca in corso..</string>
 
     <!-- home room settings -->
-    <string name="room_settings_notifications">Notifiche</string>
     <string name="room_settings_favourite">Preferito</string>
     <string name="room_settings_de_prioritize">Bassa priorità</string>
     <string name="room_settings_direct_chat">Chat diretta</string>
@@ -534,7 +524,7 @@
     <string name="settings_logged_in">Connesso come</string>
     <string name="settings_home_server">Server home</string>
     <string name="settings_identity_server">Server identità</string>
-    
+
     <string name="settings_user_interface">Interfaccia utente</string>
     <string name="settings_interface_language">Lingua interfaccia</string>
     <string name="settings_select_language">Scegli una lingua</string>
@@ -584,7 +574,6 @@
     <string name="room_settings_topic">Argomento</string>
     <string name="room_settings_room_tag">Tag stanza</string>
     <string name="room_settings_tag_pref_dialog_title">Taggata come:</string>
-    <string name="room_settings_mute_notifs">Silenzia notifiche</string>
 
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Preferito</string>
@@ -753,14 +742,29 @@
     <string name="active_widgets">%1$d widget attivi</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">Devi avere i permessi di invitare utenti per effettuare questa azione.</string>
     <string name="widget_integration_unable_to_create">Impossibile creare il widget.</string>
     <string name="widget_integration_failed_to_send_request">Invio della richiesta fallito.</string>
-    <string name="widget_integration_room_not_recognised">Stanza non riconosciuta.</string>
     <string name="widget_integration_must_be_in_room">Non sei in questa stanza.</string>
     <string name="widget_integration_no_permission_in_room">Non hai i permessi per eseguire l\'azione in questa stanza.</string>
     <string name="widget_integration_missing_room_id">room_id mancante nella richiesta.</string>
     <string name="widget_integration_missing_user_id">user_id mancante nella richiesta.</string>
     <string name="room_add_matrix_apps">Aggiungi una Matrix app</string>
-    <string name="add_matrix_apps_not_supported">Non supportato su questo dispositivo</string>
+    <string name="option_take_photo">Scatta una foto</string>
+    <string name="option_take_video">Registra un video</string>
+
+    <string name="settings_containing_my_display_name">Messaggi che contengono il mio nome</string>
+    <string name="settings_containing_my_user_name">Messaggi che contengono il mio user name</string>
+    <string name="settings_hide_avatar_display_name_changes_messages">Non mostrare i cambiamenti di nome e avatar</string>
+
+    <string name="notification_silent_notifications">Notifiche Silenziose</string>
+
+    <string name="notification_noisy_notifications">Notifiche Audio</string>
+    <string name="notification_listen_for_events">In Ascolto su Eventi</string>
+    <string name="title_activity_bug_report">Rapporto Bug</string>
+
+    <string name="login_mobile_device">Cellulare</string>
+
+    <string name="call">Chiama</string>
+    <string name="encrypted_message">Cifra messaggio</string>
+
 </resources>
diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml
index 0e4eb28783..ccbc5e7fca 100644
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@@ -105,8 +105,6 @@
     <string name="room_info_room_name">部屋名</string>
     <string name="call_ended">通話終了</string>
     <string name="call_ring">呼出中…</string>
-    <string name="action_accept">許可</string>
-    <string name="action_ignore">拒否</string>
 
     <string name="yes">はい</string>
     <string name="no">いいえ</string>
@@ -249,7 +247,7 @@
     <string name="settings_interface_language">操作に使用する言語</string>
     <string name="settings_user_interface">端末操作表示</string>
     <string name="account_email_validation_title">認証を確認中</string>
-    <string name="account_email_validation_message">電子メールを確認し, 本文中のURLを確認してください. 完了したらクリックして続けます.</string>
+    <string name="account_email_validation_message">電子メールを確認し, 本文中のURLを確認してください。 完了したら「続ける」をクリックしてください。</string>
     <string name="account_email_already_used_error">この電子メールアドレスは既に使われています</string>
     <string name="settings_password_updated">あなたのパスワードは更新されました</string>
     <string name="settings_select_country">国を選択</string>
@@ -271,7 +269,6 @@
     <string name="room_settings_topic">部屋の説明</string>
     <string name="room_settings_room_tag">部屋の属性</string>
     <string name="room_settings_tag_pref_dialog_title">部屋の属性:</string>
-    <string name="room_settings_mute_notifs">発言があっても通知しない</string>
 
     <string name="room_settings_tag_pref_entry_favourite">お気に入り</string>
     <string name="room_settings_tag_pref_entry_low_priority">低優先度</string>
@@ -348,17 +345,17 @@
 
     <string name="auth_send_reset_email">初期化メール送信</string>
     <string name="permissions_rationale_msg_camera">写真撮影や映像付き通話には, Riotアプリに端末のカメラの使用を許可する必要がります.</string>
-    <string name="ongoing_conference_call">" 会議通話実施中. 音声か映像で参加してください."</string>
+    <string name="ongoing_conference_call">" 会議通話実施中。音声か映像で参加してください。"</string>
     <string name="ongoing_conference_call_voice">音声</string>
     <string name="ongoing_conference_call_video">映像</string>
-    <string name="cannot_start_call">通話を開始できませんでした, 後ほど試してください</string>
-    <string name="missing_permissions_warning">許可が無い為, 一部の機能が失われている可能性があります..</string>
-    <string name="missing_permissions_to_start_conf_call">この部屋で会議を開始するための招待権限が必要です</string>
+    <string name="cannot_start_call">通話を開始できませんでした。後ほど試してください。</string>
+    <string name="missing_permissions_warning">許可が無い為、一部の機能が失われている可能性があります。</string>
+    <string name="missing_permissions_to_start_conf_call">この部屋で会議を開始するための招待権限が必要です。</string>
     <string name="send_anyway">とにかく送る</string>
     <string name="and">と</string>
-    <string name="action_sign_out">通信完全切断</string>
-    <string name="action_sign_out_confirmation">セキュリティを確保するため、回線切断するとエンドツーエンド暗号鍵がすべて削除され、再度ログインすると暗号化された発言履歴が読み取れなくなります。
-切断する前に暗号鍵を端末の記憶装置へ出力し、保管をしてください。</string>
+    <string name="action_sign_out">ログアウト</string>
+    <string name="action_sign_out_confirmation">セキュリティを確保するため、ログアウトするとエンドツーエンド暗号鍵がすべて削除され、再度ログインすると暗号化された発言履歴が読み取れなくなります。
+ログアウトする前に暗号鍵を端末の記憶装置へ出力し、保管をしてください。</string>
     <string name="bottom_action_home">基本画面</string>
     <string name="no_conversation_placeholder">会話なし</string>
     <string name="no_contact_access_placeholder">端末の電話帳をRiotアプリが読み取ることは許可されていません</string>
@@ -427,9 +424,6 @@
 
     <string name="room_info_room_topic">部屋の説明</string>
 
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <string name="call_connected">通話が接続されました</string>
     <string name="call_connecting">通話を接続中…</string>
     <string name="incoming_call">通話着信中</string>
@@ -440,8 +434,6 @@
     <string name="call_error_ice_failed">映像の接続に失敗</string>
     <string name="call_error_camera_init_failed">カメラを開始できません</string>
     <string name="call_error_answered_elsewhere">他の端末で通話に応答しました</string>
-    <string name="call_error_peer_hangup_elsewhere">他の端末で通話を終了しました</string>
-    <string name="call_error_peer_cancelled_call">通話を中止しました</string>
 
     <string name="media_picker_both_capture_title">写真または動画の撮影</string>
     <string name="media_picker_cannot_record_video">動画を記録できません</string>
@@ -450,7 +442,7 @@
     <string name="preview">試写</string>
     <string name="reject">拒否</string>
 
-    <string name="room_header_active_members">全%2$d人中 %1$d人が回線接続</string>
+    <string name="room_header_active_members">全%2$d人中 %1$d人が回線接続中</string>
     <string name="room_participants_header_admin_tools">管理者権限操作</string>
     <string name="room_participants_header_call">通話</string>
     <string name="room_participants_header_direct_chats">対話</string>
@@ -471,7 +463,7 @@
     <string name="room_new_message_notification">1つの新しい発言があります</string>
     <string name="room_new_messages_notification">%1$d 新しい発言があります</string>
 
-    <string name="ssl_logout_account">回線完全切断</string>
+    <string name="ssl_logout_account">ログアウト</string>
     <string name="ssl_remain_offline">無視</string>
     <string name="ssl_fingerprint_example">00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</string>
 
@@ -495,7 +487,6 @@
     <string name="directory_search_results_title">部屋一覧を見る</string>
     <string name="directory_search_room">%1$d 部屋</string>
     <string name="directory_search_rooms">%1$d 部屋</string>
-    <string name="room_settings_notifications">発言通知</string>
     <string name="room_settings_leave_conversation">退室</string>
     <string name="room_sliding_menu_messages">会話</string>
     <string name="room_sliding_menu_settings">設定</string>
@@ -542,8 +533,7 @@
     <string name="widget_integration_must_be_in_room">あなたはこの部屋に参加していません。</string>
     <string name="widget_integration_no_permission_in_room">あなたはこの部屋で権限がありません。</string>
     <string name="widget_integration_room_not_visible">部屋 %s は、見ることができません。</string>
-    <string name="add_matrix_apps_not_supported">この端末では利用できません</string>
-<string name="username">ユーザ名</string>
+    <string name="username">ユーザ名</string>
     <string name="hs_url">接続先サーバ URL</string>
     <string name="identity_url">認証サーバ URL</string>
     <string name="user">ユーザ</string>
@@ -594,10 +584,8 @@ Riotアプリがあなたの電話帳へアクセスすることを許可しま
     <string name="start_verification">検証を開始する</string>
     <string name="widget_integration_missing_user_id">リクエストに user_id がありません。</string>
     <string name="widget_integration_missing_room_id">リクエストに room_id がありません。</string>
-    <string name="widget_integration_room_not_recognised">この部屋は承認されていません。</string>
     <string name="widget_integration_failed_to_send_request">リクエストの送信に失敗しました。</string>
     <string name="widget_integration_unable_to_create">ウィジェットを作成できません。</string>
-    <string name="widget_integration_need_to_be_able_to_invite">それを行うためにはユーザーを招待可能にする必要があります。</string>
     <string name="event_formatter_widget_removed">%1$s は %2$s によって削除されました</string>
     <string name="widget_no_power_to_manage">この部屋のウィジェットを管理する権限が必要です</string>
     <string name="widget_creation_failure">ウィジェットの作成に失敗しました</string>
@@ -636,4 +624,162 @@ Riotアプリがあなたの電話帳へアクセスすることを許可しま
     <string name="encryption_export_room_keys">部屋の暗号鍵をエクスポート</string>
     <string name="encryption_information_verification">検証</string>
     <string name="call">通話</string>
+    <string name="notification_noisy_notifications">通知あり(音量大)</string>
+    <string name="notification_silent_notifications">通知あり(音量小)</string>
+
+    <string name="title_activity_bug_report">不具合報告</string>
+
+    <string name="read_receipts_list">レセプトリストを読み込む</string>
+
+    <string name="media_slider_saved_message">ダウンロードファイルに保存する</string>
+    <string name="room_preview_unlinked_email_warning">この招待は%sさんに送られましたが、このアカウントには関連づけられていません。
+他のアカウントでログインするか、このメールをあなたのアカウントに加えることができます。</string>
+    <string name="room_preview_try_join_an_unknown_room">あなたは%sにアクセスしようとしています。話し合いに参加しますか？</string>
+    <string name="room_preview_try_join_an_unknown_room_default">部屋</string>
+    <string name="room_preview_room_interactions_disabled">これはこの部屋のプレビューです。部屋間の相互作用は無効です。</string>
+
+    <string name="room_e2e_alert_message">エンドツーエンド暗号化はベータ版であり、確実でない可能性があります。
+
+データの安全性を確保するために使わないでください。
+
+部屋に参加する前の履歴を復号することができない可能性があります。
+
+暗号化未対応のクライアントでは、暗号化されたメッセージを見れない可能性があります。</string>
+
+    <string name="room_participants_power_level_prompt">あなたと同じ権限をこのユーザーに与えるというこの変更は、やり直すことができません。
+よろしいですか？</string>
+
+    <string name="people_search_local_contacts">端末の連絡先 (%d)</string>
+    <string name="people_search_user_directory">ユーザディレクトリ (%s)</string>
+    <string name="people_search_filter_text">Matrixユーザのみ</string>
+
+    <string name="people_search_invite_by_id_dialog_title">ユーザIDで招待する</string>
+    <string name="people_search_invite_by_id_dialog_description">１つまたは複数のメールアドレスか、Matrix IDを入力してください</string>
+    <string name="ssl_trust">信用する</string>
+    <string name="ssl_do_not_trust">信用しない</string>
+    <string name="ssl_fingerprint_hash">フィンガープリント (%s):</string>
+    <string name="ssl_could_not_verify">リモートサーバの身元を確認できませんでした。</string>
+    <string name="ssl_cert_not_trust">誰かが不当にあなたの通信を傍受しているか、リモートサーバによる証明書をあなたの電話が信頼していない可能性があります。</string>
+    <string name="ssl_cert_new_account_expl">サーバの管理者が、これは予想されたことであると言っていたならば、以下のフィンガープリントが管理者によるフィンガープリントと一致していることを確認してください。</string>
+    <string name="ssl_unexpected_existing_expl">証明書はあなたの電話に信頼されていたものから変更されています。これはかなり異常な事態です。この新しい証明書を承認しないことが推奨されます。</string>
+    <string name="ssl_expected_existing_expl">証明書は以前信頼されていたものから信頼されていないものへと変更されています。サーバがその証明書を更新した可能性があります。予測されるフィンガープリントを取得するために、サーバの管理者に連絡してください。</string>
+    <string name="ssl_only_accept">サーバの管理者が上のフィンガープリントと一致するものを発行した場合に限り、証明書を承認してください。</string>
+    <string name="room_details_selected">選択済</string>
+    <string name="malformed_id">不正な形式のIDです。メールアドレスまたは\'@localpart:domain\'のようなMatrix IDを入力してください</string>
+    <string name="room_event_action_report_prompt_reason">このコンテンツを報告する理由</string>
+    <string name="room_event_action_report_prompt_ignore_user">このユーザによるすべてのメッセージを非表示にしますか？</string>
+    <string name="room_event_action_cancel_upload">アップロードをキャンセルする</string>
+    <string name="room_event_action_cancel_download">ダウンロードをキャンセルする</string>
+
+    <string name="room_displayname_invite_from">%sさんからの招待</string>
+    <string name="room_displayname_room_invite">部屋への招待</string>
+    <string name="room_displayname_two_members">%1$sと%2$s</string>
+    <string name="room_displayname_more_than_two_members">%1$sと%2$d他</string>
+    <string name="room_displayname_no_title">空の部屋</string>
+
+    <string name="search_hint">検索</string>
+    <string name="tab_title_search_messages">メッセージ</string>
+    <string name="room_recents_directory">ディレクトリ</string>
+    <string name="room_recents_invites">招待</string>
+    <string name="room_recents_join_room_prompt">部屋のIDまたは部屋のエイリアスを入力してください</string>
+
+    <string name="directory_search_room_for">%2$sに%1$d部屋見つかりました</string>
+    <string name="directory_search_rooms_for">%2$sに%1$s部屋見つかりました</string>
+    <string name="directory_searching_title">ディレクトリを検索中..</string>
+
+    <string name="room_sliding_menu_third_party_notices">サードパーティのライセンスに関する通知</string>
+    <string name="settings_summary_app_info_link">このアプリのシステムの情報を見る</string>
+    <string name="settings_title_app_info_link">アプリの情報</string>
+
+    <string name="settings_containing_my_display_name">自分の名前を含むメッセージ</string>
+    <string name="settings_containing_my_user_name">自分のユーザネームを含むメッセージ</string>
+    <string name="settings_version">バージョン</string>
+    <string name="settings_olm_version">olmのバージョン</string>
+    <string name="settings_third_party_notices">サードパーティのライセンスに関する通知</string>
+    <string name="settings_home_display">ホーム</string>
+    <string name="settings_pin_missed_notifications">逃した通知がある部屋を固定する</string>
+    <string name="settings_pin_unread_messages">未読のメッセージがある部屋を固定する</string>
+    <string name="settings_analytics">分析</string>
+    <string name="settings_opt_out_of_analytics">分析データを送信しない</string>
+    <string name="settings_opt_out_of_analytics_summary">Riotはアプリをよりよくするために匿名の分析データを収集します。</string>
+
+
+    <string name="settings_data_save_mode">データ節約モード</string>
+
+    <string name="account_email_validation_error">メールアドレスを認証できません。メールを確認して、そこに記載してあるリンクをクリックしてください。その後、「続ける」をクリックしてください</string>
+    <string name="settings_delete_notification_targets_confirmation">この通知の対象を削除してよろしいですか？</string>
+
+    <string name="settings_delete_threepid_confirmation">%1$s %2$sを削除してよろしいですか？</string>
+
+    <string name="settings_phone_number_code">コード</string>
+
+    <string name="room_settings_addresses_e2e_prompt_message">エンドツーエンド暗号化はベータ版であり、確実でない可能性があります。
+
+データの安全性を確保するために使わないでください。
+
+部屋に参加する前の履歴を復号できない可能性があります。
+
+一度暗号化を有効にしたら、それを再び無効にすることは今のところできません。
+
+暗号化されたメッセージは、暗号化に対応していないクライアントでは読めない可能性があります。</string>
+
+    <string name="failed_to_load_timeline_position">%sさんはこの部屋のタイムラインのある箇所を読み込もうとしましたが、見つかりませんでした。</string>
+
+    <string name="encryption_information_device_info">イベント情報</string>
+    <string name="encryption_information_user_id">ユーザID</string>
+    <string name="encryption_information_curve25519_identity_key">Curve25519 固有鍵</string>
+    <string name="encryption_information_algorithm">アルゴリズム</string>
+    <string name="encryption_information_session_id">セッションID</string>
+    <string name="encryption_information_decryption_error">復号エラー</string>
+
+    <string name="encryption_information_sender_device_information">発信者装置の情報</string>
+    <string name="encryption_information_name">名前</string>
+    <string name="encryption_information_device_key">デバイスキー</string>
+    <string name="encryption_information_ed25519_fingerprint">Ed25519 フィンガープリント</string>
+
+    <string name="encryption_information_not_verified">未認証</string>
+    <string name="encryption_information_blocked">ブラックリスト</string>
+
+    <string name="encryption_information_none">なし</string>
+
+    <string name="encryption_information_verify">認証する</string>
+    <string name="encryption_information_unverify">認証を取り消す</string>
+    <string name="encryption_information_block">ブラックリスト</string>
+    <string name="encryption_information_unblock">ブラックリストから除外する</string>
+
+    <string name="encryption_information_verify_device_warning">" このデバイスが信頼できることを確認するために、その所有者に何らかの他の方法(直接会って、または、電話で)連絡し、以下のキーが、そのデバイスの「設定」で確認できるキーと一致するかお尋ねください:"</string>
+    <string name="select_room_directory">部屋のディレクトリを選択</string>
+    <string name="directory_server_type_homeserver">公共の部屋を表示するホームサーバを入力してください</string>
+    <string name="directory_server_placeholder">ホームサーバのURL</string>
+    <string name="directory_server_all_rooms_on_server">%sサーバ上のすべての部屋</string>
+    <string name="directory_server_native_rooms">すべてのローカルの%s部屋</string>
+
+    <string name="notification_unread_notified_messages">%d件の未読の通知されたメッセージ</string>
+    <string name="notification_unread_notified_messages_in_room">%2$d部屋に%1$d件の未読の通知されたメッセージ</string>
+
+    <string name="room_unsent_messages_notification">メッセージが未送信です。今%1$sまたは%2$sですか？</string>
+    <string name="room_unknown_devices_messages_notification">不明なデバイスが存在しているため、メッセージを送ることができませんでした。今%1$sまたは%2$sですか？</string>
+    <string name="encryption_information_claimed_ed25519_fingerprint_key">要求されたフィンガープリントキー Ed25519</string>
+    <string name="settings_labs_create_conference_with_jitsi">jitsiを用いて会議通話を始める</string>
+    <string name="active_widgets">%1$d個の接続中のウィジェット</string>
+
+    // Widget Integration Manager
+    <string name="settings_labs_native_camera">端末のカメラを使う</string>
+
+    // share keys
+    <string name="conference_call_warning_title">警告！</string>
+    <string name="conference_call_warning_message">ビデオ会議は開発中であり、確実でない可能性があります。</string>
+
+    // slash commands
+    <string name="command_error">コマンドエラー</string>
+    <string name="unrecognized_command">認識されないコマンド: %s</string>
+
+    // notification statuses
+    <string name="notification_off">切</string>
+    <string name="notification_on">入</string>
+    <string name="notification_noisy">音量大</string>
+
+    <string name="encrypted_message">暗号化されたメッセージ</string>
+
+<string name="action_exit">退出</string>
     </resources>
diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml
index 59d4b0620d..c463573f78 100644
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@@ -7,11 +7,11 @@
 
     <string name="title_activity_home">Ziņas</string>
     <string name="title_activity_room">Istaba</string>
-    <string name="title_activity_settings">Uzstādījumi</string>
-    <string name="title_activity_member_details">Biedra detalizēta informācija</string>
+    <string name="title_activity_settings">Iestatījumi</string>
+    <string name="title_activity_member_details">Dalībnieka informācija</string>
     <string name="title_activity_historical">Vēsturisks</string>
 
-    <string name="ok">Labi</string>
+    <string name="ok">Labs ir</string>
     <string name="cancel">Atcelt</string>
     <string name="save">Saglabāt</string>
     <string name="leave">Atstāt</string>
@@ -112,17 +112,17 @@
     <string name="create_account">Reģistrēties</string>
     <string name="login">Pierakstīties</string>
     <string name="logout">Izrakstīties</string>
-    <string name="hs_url">Servera URL adrese</string>
-    <string name="identity_url">Identifikācijas servera URL adrese</string>
+    <string name="hs_url">Bāzes servera URL adrese</string>
+    <string name="identity_url">Identitifikācijas servera URL adrese</string>
     <string name="user">lietotājs</string>
     <string name="users">lietotāji</string>
     <string name="search">Meklēt</string>
 
-    <string name="start_new_chat">Uzsākt jaunu čatu</string>
+    <string name="start_new_chat">Sākt jaunu čatu</string>
     <string name="offline">Nav tiešsaistē</string>
 
     <string name="user_directory_header">Lietotāju katalogs</string>
-    <string name="start_voice_call">Sākt balss zvanu</string>
+    <string name="start_voice_call">Sākt audio zvanu</string>
     <string name="start_video_call">Sākt video zvanu</string>
 
     <string name="option_send_files">Sūtīt failus</string>
@@ -143,4 +143,522 @@
     <string name="auth_add_email_phone_message">Pievieno savam kontam epasta adresi un/vai telefona numuru, lai ļautu pārējiem dalībniekiem Tevi atrast.
 
 Kā arī epasta adrese ļaus Tev atiestatīt paroli.</string>
+    <string name="light_theme">Gaiša tēma</string>
+    <string name="dark_theme">Tumša tēma</string>
+    <string name="black_them">Melna tēma</string>
+
+    <string name="notification_sync_in_progress">Sinhronizācija</string>
+    <string name="notification_listen_for_events">Notikumu monitorings</string>
+    <string name="notification_noisy_notifications">Skaņas paziņojumi</string>
+    <string name="notification_silent_notifications">Klusi paziņojumi</string>
+
+    <string name="title_activity_bug_report">Kļūdas atskaite</string>
+    <string name="title_activity_group_details">Kopienas informācija</string>
+
+    <string name="loading">Ielādējas...</string>
+
+    <string name="action_exit">Iziet</string>
+    <string name="bottom_action_groups">Kopienas</string>
+
+    <string name="home_filter_placeholder_groups">Meklēt kopienas</string>
+
+    <string name="groups_invite_header">Uzaicināt</string>
+    <string name="groups_header">Kopienas</string>
+    <string name="no_group_placeholder">Grupu nav</string>
+
+    <string name="start_new_chat_prompt_msg">Vai tiešām vēlies sāktu jaunu čatu ar %s?</string>
+    <string name="start_voice_call_prompt_msg">Vai tiešām vēlies sākt audio zvanu?</string>
+    <string name="start_video_call_prompt_msg">Vai tiešām vēlies sākt video zvanu?</string>
+
+    <string name="option_take_photo">Uzņemt foto</string>
+    <string name="option_take_video">Uzņemt video</string>
+
+    <string name="auth_add_email_and_phone_message">Pievieno kontam epasta adresi un telefona numuru, lai citi lietotāji var Tevi atrast.
+
+Epasta adrese arī ļaus Tev nepieciešamības gadījumā atjaunot paroli.</string>
+    <string name="auth_email_placeholder">Epasta adrese</string>
+    <string name="auth_opt_email_placeholder">Epasta adrese (papildus)</string>
+    <string name="auth_phone_number_placeholder">Tālruņa #</string>
+    <string name="auth_opt_phone_number_placeholder">Tālruņa # (papildus)</string>
+    <string name="auth_repeat_password_placeholder">Parole (atkārtoti)</string>
+    <string name="auth_repeat_new_password_placeholder">Apstiprini savu jauno paroli</string>
+    <string name="auth_invalid_login_param">Nepareizs lietotājvārds un/vai parole</string>
+    <string name="auth_invalid_user_name">Lietotājvārdi var tikai saturēt burtus, ciparus, punktus, domuzīmes un apakšsvītras</string>
+    <string name="auth_invalid_password">Parole par īsu (&lt; 6 simboliem)</string>
+    <string name="auth_missing_password">Iztrūkst paroles</string>
+    <string name="auth_invalid_email">Šķiet ievadīta nederīga epasta adrese</string>
+    <string name="auth_invalid_phone">Šķiet ievadīts nekorekts tālruņa numurs</string>
+    <string name="auth_email_already_defined">Šī epasta adrese jau tiek izmantota.</string>
+    <string name="auth_missing_email">Iztrūkst epasta adreses</string>
+    <string name="auth_missing_phone">Iztrūkst tālruņa #</string>
+    <string name="auth_missing_email_or_phone">Iztrūkst epasta adrese vai tālruņa #</string>
+    <string name="auth_invalid_token">Nederīgs tokens</string>
+    <string name="auth_password_dont_match">Paroles nesakrīt</string>
+    <string name="auth_forgot_password">Aizmirsi paroli?</string>
+    <string name="auth_use_server_options">Izmantot servera īpašus parametrus</string>
+    <string name="auth_email_validation_message">Pārbaudi epastu, lai turpinātu reģistrāciju</string>
+    <string name="auth_threepid_warning_message">Reģistrēšanās ar epastu un tālruņa # vienlaicīgi pagaidām netiek atbalstīta. Ar kontu būs saistīts vienīgi tālruņa #.
+
+Savu epastu vari pievienot profila iestatījumos.</string>
+    <string name="auth_recaptcha_message">Bāzes serveris vēlas pārbaudīt, vai neesi robots</string>
+    <string name="auth_username_in_use">Šāds lietotājvārds jau ir aizņemts</string>
+    <string name="auth_home_server">Bāzes serveris:</string>
+    <string name="auth_identity_server">Identitāšu serveris:</string>
+    <string name="auth_reset_password_next_step_button">Esmu verificējis(usi) savu epasta adresi</string>
+    <string name="auth_reset_password_message">Lai atiestatītu paroli, ievadiet epasta adresi, kura piesaistīta kontam:</string>
+    <string name="auth_reset_password_missing_email">Ir jābūt ievadītai kontam piesaistītajai epasta adresei.</string>
+    <string name="auth_reset_password_missing_password">Jāievada jauna parole.</string>
+    <string name="auth_reset_password_email_validation_message">Epasts ir nosūtīts uz %s. Pēc tam, kad nospiedīsi uz tajā ietverto tīmekļa saiti, noklikšķini zemāk.</string>
+    <string name="auth_reset_password_error_unauthorized">Neizdevās verificēt epasta adresi: pārbaudi vai esi noklikšķinājis(usi) uz saiti atsūtītajā epastā</string>
+    <string name="auth_reset_password_success_message">Tava parole ir atiestatīta.
+
+Tu esi izrakstīts no visām ierīcēm un vairāk nesaņemsi \"push\" paziņojumus. Lai atjaunotu \"push\" paziņojumu saņemšanu, pieraksties katrā no savām ierīcēm.</string>
+
+    <string name="login_error_must_start_http">URL adresei jāsākas ar http[s]://</string>
+    <string name="login_error_network_error">Pierakstīšanās neizdevās: tīkla kļūda</string>
+    <string name="login_error_unable_login">Pierakstīšanās neizdevās</string>
+    <string name="login_error_registration_network_error">Reģistrācija neizdevās: tīkla kļūda</string>
+    <string name="login_error_unable_register">Reģistrācija neizdevās</string>
+    <string name="login_error_unable_register_mail_ownership">Registrācija neizdevās: epasta verifikācijas kļūda</string>
+    <string name="login_error_invalid_home_server">Ievadi korektu URL adresi</string>
+    <string name="login_mobile_device">Mobilais</string>
+
+    <string name="login_error_forbidden">Nepareizs lietotājvārds / parole</string>
+    <string name="login_error_unknown_token">Attiecīgais pieejas tokens netika atpazīts</string>
+    <string name="login_error_bad_json">Bojāts JSON</string>
+    <string name="login_error_not_json">Nav derīgs JSON</string>
+    <string name="login_error_limit_exceeded">Nosūtīti par daudz pieprasījumi</string>
+    <string name="login_error_user_in_use">Šis lietotājvārds ir aizņemts</string>
+    <string name="login_error_login_email_not_yet">Nav noklikšķināts uz tīmekļa saites saņemtajā epastā</string>
+
+    <string name="e2e_need_log_in_again">Tev jāieiet sistēmā, lai šai ierīcei ģenerētu \"end-to-end\" šifrēšanas atslēgas un nosūtītu publisko atslēgu bāzes serverim.
+Šī darbība jāveic tikai vienu riezi. Atvainojamies par neērtībām.</string>
+
+    <string name="read_receipts_list">Lasīt ___ sarakstu</string>
+
+    <string name="groups_list">Grupu saraksts</string>
+
+    <string name="membership_changes">%d izmaiņas biedru skaitā</string>
+
+    <string name="compression_options">"Nosūtīt kā "</string>
+    <string name="compression_opt_list_original">Oriģināls</string>
+    <string name="compression_opt_list_large">Liels</string>
+    <string name="compression_opt_list_medium">Vidējs</string>
+    <string name="compression_opt_list_small">Mazs</string>
+
+    <string name="attachment_cancel_download">Vai atcelt lejupielādi?</string>
+    <string name="attachment_cancel_upload">Vai atcelt augšupielādi (nosūtīšanu)?</string>
+    <string name="attachment_remaining_time_seconds">%d s</string>
+    <string name="attachment_remaining_time_minutes">%1$dm %2$ds</string>
+
+    <string name="yesterday">vakar</string>
+    <string name="today">šodien</string>
+
+    <string name="room_info_room_name">Istabas nosaukums</string>
+    <string name="room_info_room_topic">Istabas temats</string>
+
+    <string name="call">Zvans</string>
+    <string name="call_connected">Zvans savienots</string>
+    <string name="call_connecting">Notiek zvana savienošana…</string>
+    <string name="call_ended">Zvans beigts</string>
+    <string name="call_ring">Zvana…</string>
+    <string name="incoming_call">Ienākošs zvans</string>
+    <string name="incoming_video_call">Ienākošs VIDEO zvans</string>
+    <string name="incoming_voice_call">Ienākošs AUDIO zvans</string>
+    <string name="call_in_progress">Notiek zvanīšana (savienojuma izveide)</string>
+
+    <string name="call_error_user_not_responding">Adresāts neatbildēja uz zvanu.</string>
+    <string name="call_error_ice_failed">Mēdiju savienojums neizdevās</string>
+    <string name="call_error_camera_init_failed">Nav iespējams inicializēt kameru</string>
+    <string name="call_error_answered_elsewhere">zvans atbildēts uz citas ierīces</string>
+
+    <string name="media_picker_both_capture_title">Uzņemt foto vai video</string>
+    <string name="media_picker_cannot_record_video">Neizdodas ierakstīt video</string>
+
+    <string name="permissions_rationale_popup_title">Riot informācija</string>
+    <string name="permissions_rationale_msg_storage">Riot-am nepieciešama atļauja piekļūt foto un video bibliotēkai, lai nosūtītu un saglabātu pielikumus.
+
+Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja nosūtīt failus no Tava tālruņa.</string>
+    <string name="permissions_rationale_msg_camera">Riot-am nepieciešama atļauja piekļūt kamerai, lai uzņemtu foto un nodrošinātu video zvanus.</string>
+    <string name="permissions_rationale_msg_camera_explanation">
+
+Lūdzu dot piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja veikt zvanus.</string>
+    <string name="permissions_rationale_msg_record_audio">Riot-am nepieciešama atļauja piekļūt mikrofonam, lai nodrošinātu audio zvanus.</string>
+    <string name="permissions_rationale_msg_record_audio_explanation">
+
+Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja veikt zvanus.</string>
+    <string name="permissions_rationale_msg_camera_and_audio">Riot-am nepieciešama atļauja piekļūt kamerai un mikrofonam, lai veiktu videozvanus.
+
+Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja veikt zvanus.</string>
+    <string name="permissions_rationale_msg_contacts">Riot-am nepieciešama atļauja piekļūt kontaktiem, lai varētu atrast citus lietotājus tīklā pēc to epasta adreses vai tālruņa #.
+
+Lūdzu dod piekļuves atļauju nākamajā uznirstošajā logā, lai būtu iespēja atrast Tavus kontaktus, kuri ir sasniedzami Riotā.</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Riot-am nepieciešama atļauja piekļūt kontaktiem, lai varētu atrast citus lietotājus tīklā pēc to epasta adreses vai tālruņa #.
+
+Vai dot Riotam piekļuvi kontaktiem?</string>
+
+    <string name="permissions_action_not_performed_missing_permissions">Atvaino... Darbība nav veikta dēļ nepietiekamām piekļuves atļaujām</string>
+
+    <string name="media_slider_saved">Saglabāts</string>
+    <string name="media_slider_saved_message">Saglabāt lejupielādēs</string>
+    <string name="yes">JĀ</string>
+    <string name="no">NĒ</string>
+    <string name="_continue">Turpināt</string>
+
+    <string name="remove">Dzēst</string>
+    <string name="join">Pievienoties</string>
+    <string name="preview">Priekšskats</string>
+    <string name="reject">Noraidīt</string>
+
+    <string name="room_jump_to_first_unread">Pāriet uz pirmo neizlasīto ziņu.</string>
+
+    <string name="room_preview_invitation_format">%s Tevi uzaicināja pievienoties šai istabai</string>
+    <string name="room_preview_unlinked_email_warning">Uzaicinājums tika nosūtīts uz %s, kura nav piesaistīta šim kontam.
+Tu vari pierakstīties ar citu kontu vai arī pievienot šo epastu šim kontam.</string>
+    <string name="room_preview_try_join_an_unknown_room">Tu centies piekļūt %s. Vai Tu vēlies pievienoties, lai piedalītos diskusijā?</string>
+    <string name="room_preview_try_join_an_unknown_room_default">istaba</string>
+    <string name="room_preview_room_interactions_disabled">Šis ir istabas priekšskats. Tu esi \"lasīšanas\" režīmā, bez iespējām mijiedarboties.</string>
+
+    <string name="room_creation_title">Jauns čats</string>
+    <string name="room_creation_add_member">Pievienots dalībnieku</string>
+    <string name="room_header_active_members">%1$d/%2$d aktīvi dalībnieki</string>
+    <string name="room_title_members">%1$d dalībnieki</string>
+    <string name="room_title_one_member">1 dalībnieks</string>
+    <string name="room_e2e_alert_title">Uzmanību!</string>
+    <string name="room_e2e_alert_message">\"End-to-end\" šifrēšana ir beta stadijā un var nestrādāt stabili.
+
+Pagaidām tai nevar uzticēties, ja vēlaties būt pārliecināti par datu drošību.
+
+Ierīces nevarēs atšifrēt čata saraksti, kura notikusi, pirms tās pievienotas istabai.
+
+Šifrētās ziņas nebūs redzamas Riot klientos, kuros nav iedzīvināta šī iespēja.</string>
+
+    <string name="format_time_s">s</string>
+    <string name="format_time_m">m</string>
+    <string name="format_time_h">h</string>
+    <string name="format_time_d">d</string>
+
+    <string name="room_participants_leave_prompt_title">Atstāt istabu</string>
+    <string name="room_participants_leave_prompt_msg">Vai tiešām vēlies atstāt istabu?</string>
+    <string name="room_participants_remove_prompt_msg">Vai tiešām vēlies dzēst (izmest) %s no šī čata?</string>
+    <string name="room_participants_create">Izveidot</string>
+
+    <string name="room_participants_online">Tiešsaistē</string>
+    <string name="room_participants_offline">Nesaistē</string>
+    <string name="room_participants_idle">Dīkstāvē</string>
+    <string name="room_participants_now">tagad</string>
+    <string name="room_participants_ago">atpakaļ</string>
+
+    <string name="room_participants_header_admin_tools">ADMIN rīki</string>
+    <string name="room_participants_header_call">ZVANS</string>
+    <string name="room_participants_header_direct_chats">TIEŠIE ČATI</string>
+    <string name="room_participants_header_devices">IERĪCES</string>
+
+    <string name="room_participants_action_invite">Uzaicināt</string>
+    <string name="room_participants_action_leave">Atstāt šo istabu</string>
+    <string name="room_participants_action_remove">Izmest no šīs istabas</string>
+    <string name="room_participants_action_ban">Nobanot</string>
+    <string name="room_participants_action_unban">Atbanot</string>
+    <string name="room_participants_action_set_default_power_level">Padarīt par ierindas dalībnieku</string>
+    <string name="room_participants_action_set_moderator">Padarīt par moderatoru</string>
+    <string name="room_participants_action_set_admin">Padarīt par administratoru</string>
+    <string name="room_participants_action_ignore">Nerādīt nevienu šī dalībnieka ziņu</string>
+    <string name="room_participants_action_unignore">Rīdīt visas ziņas no šī dalībnieka</string>
+    <string name="room_participants_invite_search_another_user">Dalībnieka ID, vārds vai epasts</string>
+    <string name="room_participants_action_mention">Pieminēt</string>
+    <string name="room_participants_action_devices_list">Parādīt ierīču sarakstu</string>
+    <string name="room_participants_power_level_prompt">Tu nevarēsi atcelt šo darbību, jo lietotājs iegūs tādu pašu statusu kāds ir Tev.
+Vai vēlies turpināt?</string>
+
+    <string name="room_participants_invite_prompt_msg">Vai tiešām vēlies uzaicināt %s uz šo čatu?</string>
+    <string name="room_participants_kick_prompt_msg">Vai tiešām vēlies izspert šo lietotāju no šī čata?</string>
+    <string name="room_participants_ban_prompt_msg">Vai tiešām vēlies \"nobanot\" šo lietotāju šajā čatā?</string>
+
+    <string name="people_search_invite_by_id"><u>Uzaicināt pēc ID</u></string>
+    <string name="people_search_local_contacts">LOKĀLIE KONTAKTI (%d)</string>
+    <string name="people_search_user_directory">LIETOTĀJU KATALOGS (%s)</string>
+    <string name="people_search_filter_text">TIkai Matrix lietotāji</string>
+
+    <string name="people_search_invite_by_id_dialog_title">Uzaicināt dalībnieku pēc ID</string>
+    <string name="people_search_invite_by_id_dialog_description">Lūdzu ievadi vienu vai vairākas epasta adreses vai Matrix ID</string>
+    <string name="people_search_invite_by_id_dialog_hint">Epasts vai Matrix ID</string>
+
+    <string name="room_menu_search">Meklēt</string>
+    <string name="room_one_user_is_typing">%s raksta…</string>
+    <string name="room_two_users_are_typing">%1$s &amp; %2$s raksta…</string>
+    <string name="room_many_users_are_typing">%1$s &amp; %2$s &amp; citi raksta…</string>
+    <string name="room_message_placeholder_encrypted">Sūtīt šifrētu ziņu…</string>
+    <string name="room_message_placeholder_not_encrypted">Sūtīt nešifrētu ziņu…</string>
+    <string name="room_offline_notification">Savienojums ar serveri pārtrūcis.</string>
+    <string name="room_unsent_messages_notification">Ziņas nav nosūtītas. %1$s vai %2$s tagad?</string>
+    <string name="room_unknown_devices_messages_notification">Ziņas nav nosūtītas dēļ nezināmu ierīču klātbūtnes. %1$s vai %2$s tagad?</string>
+    <string name="room_prompt_resend">Nosūtīt visas atkārtoti</string>
+    <string name="room_prompt_cancel">atcelt visas</string>
+    <string name="room_resend_unsent_messages">Nosūtīt nenosūtītās ziņas</string>
+    <string name="room_delete_unsent_messages">Dzēst nenosūtītās ziņas</string>
+    <string name="room_message_file_not_found">Fails nav atrasts</string>
+    <string name="room_do_not_have_permission_to_post">Tev nav tiesību rakstīt ziņas šajā istabā</string>
+    <string name="room_new_message_notification">1 jauna ziņa</string>
+    <string name="room_new_messages_notification">%1$d jaunas ziņas</string>
+
+    <string name="ssl_trust">Uzticēties</string>
+    <string name="ssl_do_not_trust">Neuzticēties</string>
+    <string name="ssl_logout_account">Izrakstīties</string>
+    <string name="ssl_remain_offline">Ignorēt</string>
+    <string name="ssl_fingerprint_hash">Nospiedums (%s):</string>
+    <string name="ssl_could_not_verify">Neizdevās pārbaudīt attālinātā servera identitāti.</string>
+    <string name="ssl_cert_not_trust">Tas var nozīmēt, ka kāds ļaunprātīgi pārtver Tavu trafiku, vai ka Tava ierīce neuzticas sertifikātam, ar kuru apgādāts attālinātais serveris.</string>
+    <string name="ssl_cert_new_account_expl">Ja servera administrators ir teicis, ka tas ir gaidāms, pārliecinieties, ka zemāk redzamais nospiedums (fingerprint) sakrīt ar nospiedumu, kuru piestādījis administrators.</string>
+    <string name="ssl_unexpected_existing_expl">Servera sertifikāts ir izmanījies un Tava ierīce tam tagad neuzticas. Tas ir ĻOTI NEPARASTI. Iesakām NEUZTICĒTIES šim jaunajam sertifikātam.</string>
+    <string name="ssl_expected_existing_expl">Sertifikāts izmainījās no iepriekš uzticama uz neuzticamu. Iespējams, serveris ir aktualizējis savu sertifikātu. Sazinies ar servera administratoru, lai saņemtu sagaidāmo nospiedumu (fingerprint).</string>
+    <string name="ssl_only_accept">Akceptē sertifikātu TIKAI tad, kad servera administrators publicējis sertifikāta nospiedumu, kurš atbilst augstāk redzamajam.</string>
+    <string name="ssl_fingerprint_example">00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00</string>
+
+    <string name="room_details_title">Istabas informācija</string>
+    <string name="room_details_people">Cilvēki</string>
+    <string name="room_details_files">Faili</string>
+    <string name="room_details_settings">Iestatījumi</string>
+    <string name="room_details_selected">izvēlēti</string>
+    <string name="malformed_id">Nekorekts ID. Izmantojiet epastu vai Matrix ID formā: \'@localpart:domain\'</string>
+    <string name="room_details_people_invited_group_name">UZAICINĀTI</string>
+    <string name="room_details_people_present_group_name">PIEVIENOJUŠIES</string>
+
+    <string name="room_event_action_report_prompt_reason">Iemesls ziņojumam par šo saturu</string>
+    <string name="room_event_action_report_prompt_ignore_user">Vai vēlies neredzēt nevienu ziņu no šī dalībnieka?</string>
+    <string name="room_event_action_cancel_upload">Atcelt augšuplādi (nosūtīšanu)</string>
+    <string name="room_event_action_cancel_download">Atcelt lejuplādi (saņemšanu)</string>
+
+    <string name="room_displayname_invite_from">Uzaicinājums no %s</string>
+    <string name="room_displayname_room_invite">Uzaicinājums uz istabu</string>
+    <string name="room_displayname_two_members">%1$s un %2$s</string>
+    <string name="room_displayname_more_than_two_members">%1$s un %2$d citi</string>
+    <string name="room_displayname_no_title">Tukša istaba</string>
+
+    <string name="search_hint">Meklēšana</string>
+    <string name="search_members_hint">Istabas dalībnieku filtrs</string>
+    <string name="search_no_results">Rezultātu nav</string>
+    <string name="tab_title_search_rooms">ISTABAS</string>
+    <string name="tab_title_search_messages">ZIŅAS</string>
+    <string name="tab_title_search_people">ĻAUDIS</string>
+    <string name="tab_title_search_files">FAILI</string>
+
+    <string name="room_recents_join">PIEVIENOTIES</string>
+    <string name="room_recents_directory">KATALOGS</string>
+    <string name="room_recents_favourites">IZLASE</string>
+    <string name="room_recents_conversations">ISTABAS</string>
+    <string name="room_recents_low_priority">ZEMA PRIORITĀTE</string>
+    <string name="room_recents_invites">UZAICINĀJUMI</string>
+    <string name="room_recents_start_chat">Sākt saraksti</string>
+    <string name="room_recents_create_room">Izveidot istabu</string>
+    <string name="room_recents_join_room">Ieiet istabā</string>
+    <string name="room_recents_join_room_title">Ieiet istabā</string>
+    <string name="room_recents_join_room_prompt">Ievadiet istabas ID vai aliasi</string>
+
+    <string name="directory_search_results_title">Skatīt katalogu</string>
+    <string name="directory_search_room">%1$d istaba</string>
+    <string name="directory_search_rooms">%1$d istabas</string>
+    <string name="directory_search_room_for">%1$d istaba atrasta priekš %2$s</string>
+    <string name="directory_search_rooms_for">%1$s istabas atrastas priekš %2$s</string>
+    <string name="directory_searching_title">Meklēju katalogā...</string>
+
+    <string name="room_settings_all_messages_noisy">Visas ziņas (ar skaņu)</string>
+    <string name="room_settings_all_messages">Visas ziņas</string>
+    <string name="room_settings_mention_only">Tikai pieminējumi</string>
+    <string name="room_settings_mute">Izslēgt skaņu</string>
+    <string name="room_settings_favourite">Izlases elements</string>
+    <string name="room_settings_de_prioritize">Samazināt prioritāti</string>
+    <string name="room_settings_direct_chat">Tiešais čats</string>
+    <string name="room_settings_leave_conversation">Atstāt sarunu</string>
+    <string name="room_settings_forget">Aizmirst</string>
+    <string name="room_settings_add_homescreen_shortcut">Pievienot galvenā ekrāna īstaustiņu (homescreen shortcut)</string>
+
+    <string name="room_sliding_menu_messages">Ziņas</string>
+    <string name="room_sliding_menu_settings">Iestatījumi</string>
+    <string name="room_sliding_menu_version">"Versija "</string>
+    <string name="room_sliding_menu_term_and_conditions">Noteikumi &amp; nosacījumi</string>
+    <string name="room_sliding_menu_third_party_notices">Trešo pušu paziņojumi</string>
+    <string name="room_sliding_menu_copyright">Autortiesības</string>
+    <string name="room_sliding_menu_privacy_policy">Privātuma politika</string>
+
+    <string name="settings_profile_picture">Avatars (profila bilde)</string>
+    <string name="settings_display_name">Attēlojamais vārds</string>
+    <string name="settings_email_address">Epasts</string>
+    <string name="settings_add_email_address">Pievienot epasta adresi</string>
+    <string name="settings_phone_number">Tālrunis</string>
+    <string name="settings_add_phone_number">Pievienot tālruņa #</string>
+    <string name="settings_summary_app_info_link">Programmas sistēmas informācijas ekrāns</string>
+    <string name="settings_title_app_info_link">Programmas informācija</string>
+
+    <string name="settings_notification_ringtone">Paziņojumu skaņa</string>
+    <string name="settings_enable_all_notif">Iespējot šim kontam paziņojumus</string>
+    <string name="settings_enable_this_device">Iespējot šai ierīcei paziņojumus</string>
+    <string name="settings_turn_screen_on">Ieslēgt ekrānu uz 3 sekundēm</string>
+
+    <string name="settings_containing_my_display_name">Ziņas, kuras satur manu rādāmo vārdu</string>
+    <string name="settings_containing_my_user_name">Ziņas, kuras satur manu lietotājvārdu</string>
+    <string name="settings_messages_in_one_to_one">Ziņas tiešajos (privātajos) čatos</string>
+    <string name="settings_messages_in_group_chat">Ziņas grupu čatos</string>
+    <string name="settings_invited_to_room">Uzaicinājumi uz istabām</string>
+    <string name="settings_call_invitations">Uzaicinājumi ar zvanu</string>
+    <string name="settings_messages_sent_by_bot">Ziņas no bota</string>
+
+    <string name="settings_start_on_boot">Startēt pie ierīces ielādes</string>
+    <string name="settings_background_sync">Sinhronizācija</string>
+    <string name="settings_enable_background_sync">Iespējot sinhronizāciju fonā</string>
+    <string name="settings_set_sync_timeout">Sinhronizācijas pieprasījuma noildze</string>
+    <string name="settings_set_sync_delay">Intervāls starp 2 sinhronizācijas pieprasījumiem</string>
+    <string name="settings_second">sekunde</string>
+    <string name="settings_seconds">sekundes</string>
+
+    <string name="settings_version">Versija</string>
+    <string name="settings_olm_version">olm versija</string>
+    <string name="settings_app_term_conditions">Noteikumi &amp; nosacījumi</string>
+    <string name="settings_third_party_notices">Trešo pušu paziņojumi</string>
+    <string name="settings_copyright">Autortiesības</string>
+    <string name="settings_privacy_policy">Privātuma politika</string>
+    <string name="settings_clear_cache">Iztīrīt kešu</string>
+    <string name="settings_clear_medias_cache">Iztīrīt mēdija kešu</string>
+    <string name="settings_keep_media">Saglabāt (paturēt) mēdiju</string>
+
+    <string name="settings_user_settings">Lietotāja iestatījumi</string>
+    <string name="settings_notifications">Paziņojumi</string>
+    <string name="settings_ignored_users">Ignorētie dalībnieki</string>
+    <string name="settings_other">Citi</string>
+    <string name="settings_advanced">Papildus</string>
+    <string name="settings_cryptography">Kriptogrāfija</string>
+    <string name="settings_notifications_targets">Paziņojumus nosūtīt uz</string>
+    <string name="settings_contact">Lokālie kontakti</string>
+    <string name="settings_contacts_app_permission">Piekļuve kontaktiem</string>
+    <string name="settings_contacts_phonebook_country">Kontaktu valsts</string>
+    <string name="settings_home_display">Galvenais ekrāns</string>
+    <string name="settings_pin_missed_notifications">Piestiprināt istabas ar garām palaistiem paziņojumiem</string>
+    <string name="settings_pin_unread_messages">Piestiprināt istabas ar neizlasītām ziņām</string>
+    <string name="settings_devices_list">Ierīces</string>
+    <string name="settings_inline_url_preview">Iespējot URL-adrešu priekšskatu pēc noklusējuma</string>
+    <string name="settings_hide_read_receipts">Nerādīt atzīmes par izlasīšanu</string>
+    <string name="settings_dont_send_typings_notifs">Nesūtīt paziņojumu par to, ka rakstu</string>
+    <string name="settings_always_show_timestamps">Vienmēr rādīt ziņu laiku</string>
+    <string name="settings_12_24_timestamps">Rādīt ziņu laiku 12 stundu formātā (piem. 12:12pm)</string>
+    <string name="settings_hide_join_leave_messages">Slēpt \"pievienojās/atstāja\" istabu paziņojumus (neietekmē uzaicinājumus/izsperšanu/nobanošanu)</string>
+    <string name="settings_hide_avatar_display_name_changes_messages">Nerādīt avatara un rādāmā vārdā izmaiņas</string>
+    <string name="settings_disable_markdown">Atspējot \"markdown\" formatēšanu nosūtāmajām ziņām</string>
+    <string name="settings_vibrate_on_mention">Vibrācija, kad pieminējums</string>
+
+    <string name="settings_analytics">Analītika</string>
+    <string name="settings_opt_out_of_analytics">Attiekšanās no analītikas</string>
+    <string name="settings_opt_out_of_analytics_summary">Riot vāc anonīmu analītiku, lai ļautu padarīt šo atklātā koda programmu vēl labāku.</string>
+
+    <string name="settings_data_save_mode">Trafika ekonomijas režīms</string>
+
+    <string name="devices_details_dialog_title">Ierīces informācija</string>
+    <string name="devices_details_id_title">ID</string>
+    <string name="devices_details_name_title">Vārds</string>
+    <string name="devices_details_device_name">Ierīces nosaukums</string>
+    <string name="devices_details_last_seen_title">Pēdējo reizi manīts</string>
+    <string name="devices_details_last_seen_format">%1$s @ %2$s</string>
+    <string name="devices_details_time_format">HH:mm:ss</string>
+    <string name="devices_delete_dialog_text">Šīs operācijas veikšanai nepieciešama papildus autentifikācija.
+Lai turpinātu, ievadi savu paroli.</string>
+    <string name="devices_delete_dialog_title">Autentifikācija</string>
+    <string name="devices_delete_pswd">Parole:</string>
+    <string name="devices_delete_submit_button_label">Iesniegt</string>
+
+    <string name="settings_logged_in">Pierakstījies kā</string>
+    <string name="settings_home_server">Bāzes serveris</string>
+    <string name="settings_identity_server">Identitāšu serveris</string>
+
+    <string name="settings_user_interface">Lietotāja saskarne</string>
+    <string name="settings_interface_language">Saskarnes valoda</string>
+    <string name="settings_select_language">Izvēlies valodu</string>
+
+    <string name="account_email_validation_title">Tiek verificēts</string>
+    <string name="account_email_validation_message">Pārbaudi savu epastu un noklikšķini uz epasata sūtījumā esošās tīmekļa saites. Kad tas paveikts, klikšķini uz \"turpināt\".</string>
+    <string name="account_email_validation_error">Neizdevās verificēt epasta adresi. Lūdzu pārbaudi savu epastu un noklikšķini uz tajā esošo tīmekļa saiti. Kad tas paveikts, noklikšķini uz \"Turpināt\"</string>
+    <string name="account_email_already_used_error">Šī epasta adrese sistēmā tiek jau lietota</string>
+    <string name="account_email_not_found_error">Neizdevās nosūtīt epastu: šī epasta adrese netika atrasta</string>
+    <string name="account_phone_number_already_used_error">Šis tālruņa # sistēmā tiek jau lietots</string>
+
+    <string name="settings_change_password">Nomaini paroli</string>
+    <string name="settings_old_password">vecā parole</string>
+    <string name="settings_new_password">jaunā parole</string>
+    <string name="settings_confirm_password">apstiprini paroli</string>
+    <string name="settings_fail_to_update_password">Paroles nomaiņas kļūda</string>
+    <string name="settings_password_updated">Parole nomainīta</string>
+    <string name="settings_unignore_user">Vai parādīt visas ziņas no %s?</string>
+
+    <string name="settings_delete_notification_targets_confirmation">Vai tiešām vēlies turpmāk paziņojumus uz šo ierīci nesūtīt?</string>
+
+    <string name="settings_delete_threepid_confirmation">Vai tiešām vēlies dzēst %1$s %2$s?</string>
+
+    <string name="settings_select_country">Izvēlies valsti</string>
+
+    <string name="settings_phone_number_country_label">Valsts</string>
+    <string name="settings_phone_number_country_error">Lūdzu izvēlies valsti</string>
+    <string name="settings_phone_number_label">Tālruņa #</string>
+    <string name="settings_phone_number_error">Priekš šīs valsts nekorekts tālruņa #</string>
+    <string name="settings_phone_number_verification">Tālruņa verifikācija</string>
+    <string name="settings_phone_number_verification_instruction">Tika nosūtīts SMS ar aktivācijas kodu. Lūdzu ievadi šo kodu zemāk.</string>
+    <string name="settings_phone_number_verification_error_empty_code">Ievadi aktivācijas kodu</string>
+    <string name="settings_phone_number_verification_error">Tālruņa # validācija nesekmīga</string>
+    <string name="settings_phone_number_code">Kods</string>
+
+
+    <string name="settings_flair">Gaidas</string>
+
+    <string name="media_saving_period_3_days">3 dienas</string>
+    <string name="media_saving_period_1_week">1 nedēļa</string>
+    <string name="media_saving_period_1_month">1 mēnesis</string>
+    <string name="media_saving_period_forever">Pastāvīgi</string>
+
+    <string name="room_settings_room_photo">Istabas avatars</string>
+    <string name="room_settings_room_name">Istabas nosaukums</string>
+    <string name="room_settings_topic">Temats</string>
+    <string name="room_settings_room_tag">Istabas birkas</string>
+    <string name="room_settings_tag_pref_dialog_title">Iebirkota kā:</string>
+
+    <string name="room_settings_tag_pref_entry_favourite">Izlase</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Zema prioritāte</string>
+    <string name="room_settings_tag_pref_entry_none">Nav</string>
+    <string name="room_settings_tag_pref_no_tag">bez birkām</string>
+    <string name="room_settings_tag_pref_entry_value_favourite">izlasē</string>
+    <string name="room_settings_tag_pref_entry_value_low_priority">zema</string>
+    <string name="room_settings_tag_pref_entry_value_none">nav</string>
+
+    <string name="room_settings_category_access_visibility_title">Pieejamība un redzamība</string>
+    <string name="room_settings_directory_visibility">Iekļaut šo istabu katalogā</string>
+    <string name="room_settings_room_notifications_title">Paziņojumi</string>
+    <string name="room_settings_room_access_rules_pref_title">Piekļuve istabai</string>
+    <string name="room_settings_room_read_history_rules_pref_title">Piekļuve Istabas vēsturei</string>
+    <string name="room_settings_room_read_history_rules_pref_dialog_title">Kas var lasīt vēsturi?</string>
+    <string name="room_settings_room_access_rules_pref_dialog_title">Kas var piekļūt šai istabai?</string>
+
+    <string name="room_settings_read_history_entry_anyone">Jebkurš</string>
+    <string name="room_settings_read_history_entry_members_only_option_time_shared">Tikai dalībnieki (no šī parametra iespējošanas brīža)</string>
+    <string name="room_settings_read_history_entry_members_only_invited">Tikai dalībnieki (kopš tie tika uzaicināti)</string>
+    <string name="room_settings_read_history_entry_members_only_joined">Tikai dalībnieki (kopš tie pievienojušies)</string>
+
+    <string name="room_settings_room_access_warning">Lai ģenerētu saiti uz istabu, ir jābūt dotai adresei.</string>
+    <string name="room_settings_room_access_entry_only_invited">Tikai uzaicinātie</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_apart_guest">Visi, kuri zin saiti uz istabu, izņemot viesus</string>
+    <string name="room_settings_room_access_entry_anyone_with_link_including_guest">Visi, kuri zin saiti uz istabu, ieskatot viesus</string>
+
+    <string name="room_settings_banned_users_title">Nobanotie dalībnieki</string>
+
+    <string name="room_settings_category_advanced_title">Papildus</string>
+    <string name="room_settings_room_internal_id">Šīs istabas iekšējais ID</string>
+    <string name="room_settings_addresses_pref_title">Adreses</string>
+    <string name="room_settings_labs_pref_title">Izmēģinājumu stacija</string>
+    <string name="room_settings_labs_warning_message">Šīs ir eksperimentālas funkcijas, kuras var radīt negaidītus rezultātus. Lietot piesardzīgi.</string>
+    <string name="room_settings_labs_end_to_end">\"End-to-end\" šifrēšana</string>
+    <string name="room_settings_labs_end_to_end_is_active">\"End-to-End\" šifrēšana ir aktivizēta</string>
+    <string name="room_settings_labs_end_to_end_warnings">Tev nepieciešams izrakstīties, lai iespējotu šifrēšanu.</string>
+    <string name="room_settings_never_send_to_unverified_devices_title">Šifrēt ziņas tikai verificētām ierīcēm</string>
+    <string name="room_settings_never_send_to_unverified_devices_summary">Nekad nesūtīt šifrētas ziņas neverificētām ierīcēm šajā istabā no šīs ierīces.</string>
+
+    <string name="room_settings_addresses_no_local_addresses">Šai istabai nav lokālās adreses</string>
+    <string name="room_settings_addresses_add_new_address">Jaunā adrese (e.g #foo:matrix.org)</string>
+
+    <string name="room_settings_no_flair">" Šī istaba nerāda gaidas nevienā kopienā"</string>
+    <string name="room_settings_add_new_group">Kopienas jaunais ID (piem. +foo:matrix.org)</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Nederīgs kopienas ID</string>
     </resources>
diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml
index 120a20775b..ef59075bb9 100755
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@@ -3,7 +3,7 @@
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
     <string name="resouces_language">nl</string>
-    <string name="resouces_country">VK</string>
+    <string name="resouces_country">VS</string>
 
     <!-- titles -->
     <string name="title_activity_home">Berichten</string>
@@ -48,7 +48,7 @@
 
     <!-- actions -->
     <string name="action_sign_out">Uitloggen</string>
-    <string name="action_sign_out_confirmation">Voor veiligheidsredenen zal het uitloggen alle eind-tot-eind versleutelingssleutels verwijderen. Dit zal ervoor zorgen dat gespreksgeschiedenis onleesbaar is als je weer terug in logt. 
+    <string name="action_sign_out_confirmation">Voor veiligheidsredenen zal het uitloggen alle eind-tot-eind versleutelingssleutels verwijderen. Dit zal ervoor zorgen dat gespreksgeschiedenis onleesbaar is als je weer terug in logt.
 Selecteer exporteren om de versleutelingssleutels op te slaan voordat je uitlogt.</string>
     <string name="action_voice_call">Spraakoproep</string>
     <string name="action_video_call">Videogesprek</string>
@@ -231,10 +231,6 @@ Selecteer exporteren om de versleutelingssleutels op te slaan voordat je uitlogt
     <string name="room_info_room_name">Ruimtenaam</string>
     <string name="room_info_room_topic">Ruimte onderwerp</string>
 
-    <!-- Settings keys -->
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <!-- call string -->
     <string name="call_connected">Oproep verbonden</string>
     <string name="call_connecting">Oproep is aan het verbinden…</string>
@@ -249,28 +245,23 @@ Selecteer exporteren om de versleutelingssleutels op te slaan voordat je uitlogt
     <string name="call_error_ice_failed">Media verbinding is mislukt</string>
     <string name="call_error_camera_init_failed">Kan de camera niet initialiseren</string>
     <string name="call_error_answered_elsewhere">oproep ergens anders opgenomen</string>
-    <string name="call_error_peer_hangup_elsewhere">De oproep is ergens anders opgehangen</string>
-    <string name="call_error_peer_cancelled_call">de oproep is geannuleerd</string>
-
-    <string name="action_accept">ACCEPTEREN</string>
-    <string name="action_ignore">NEGEREN</string>
 
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Een afbeelding of video maken"</string>
     <string name="media_picker_cannot_record_video">Kan geen video opnemen"</string>
 
     <!-- permissions Android M -->
-    <string name="permissions_rationale_popup_title">%s permissies</string>
-    <string name="permissions_rationale_msg_storage">%s heeft toegang nodig tot je media bestanden om foto\'s te laten zien of op te slaan.
+    <string name="permissions_rationale_popup_title">Informatie</string>
+    <string name="permissions_rationale_msg_storage">Riot heeft toegang nodig tot je media bestanden om foto\'s te laten zien of op te slaan.
 
 Sta toegang toe op de volgende pop-up om bestanden vanaf je telefoon te sturen.</string>
-    <string name="permissions_rationale_msg_camera">%s heeft toegang nodig tot je camera om afbeeldingen en video oproepen te maken..</string>
+    <string name="permissions_rationale_msg_camera">Riot heeft toegang nodig tot je camera om afbeeldingen en video oproepen te maken..</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nGeef tijdens de volgende pop-up toegang tot de camera om een oproep te maken.</string>
-    <string name="permissions_rationale_msg_record_audio">%s heeft toegang nodig tot je microfoon om spraakoproepen te maken.</string>
+    <string name="permissions_rationale_msg_record_audio">Riot heeft toegang nodig tot je microfoon om spraakoproepen te maken.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nGeef tijdens de volgende pop-up toegang tot de microfoon om een oproep te maken.</string>
     <string name="permissions_rationale_msg_camera_and_audio">Riot heeft permissie nodig om je camera en microfoon te gebruiken voor videogesprekken.\n\nGeef toegang op de volgende pop-ups om een oproep te maken.</string>
     <string name="permissions_rationale_msg_contacts">Je adresboek e-mails worden geupload om matrix IDs te zoeken.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Je adresboek e-mails zijn geupload voor het zoeken van matix IDs.\nGeef je %s toegang tot je contacten ?</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Je adresboek e-mails zijn geupload voor het zoeken van matix IDs.\nGeef je Riot toegang tot je contacten ?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Sorry.. De actie is niet ondernomen door missende permissies</string>
 
@@ -337,7 +328,7 @@ Sta toegang toe op de volgende pop-up om bestanden vanaf je telefoon te sturen.<
     <string name="room_participants_action_set_default_power_level">Rest naar normale gebruiker</string>
     <string name="room_participants_action_set_moderator">Maak moderator</string>
     <string name="room_participants_action_set_admin">Make beheerder</string>
-    <string name="room_participants_action_ignore">Maak alle berichten van deze gebruiker ontzichtbaar</string>
+    <string name="room_participants_action_ignore">Maak alle berichten van deze gebruiker onzichtbaar</string>
     <string name="room_participants_action_unignore">Maak alle berichten van deze gebruiker zichtbaar</string>
     <string name="room_participants_invite_search_another_user">Zoeken/uitnodigen bij naam, e-mail, id</string>
     <string name="room_participants_action_mention">Vermeld</string>
@@ -400,7 +391,7 @@ Sta toegang toe op de volgende pop-up om bestanden vanaf je telefoon te sturen.<
 
     <!-- Room events -->
     <string name="room_event_action_report_prompt_reason">Reden voor het aangeven van deze content</string>
-    <string name="room_event_action_report_prompt_ignore_user">Wil je alle berichten van deze gebruiker ontzichtbaar maken?</string>
+    <string name="room_event_action_report_prompt_ignore_user">Wil je alle berichten van deze gebruiker onzichtbaar maken?</string>
     <string name="room_event_action_cancel_upload">Upload annuleren</string>
     <string name="room_event_action_cancel_download">Download annuleren</string>
 
@@ -442,7 +433,6 @@ Sta toegang toe op de volgende pop-up om bestanden vanaf je telefoon te sturen.<
     <string name="directory_searching_title">Adresboek doorzoeken..</string>
 
     <!-- home room settings -->
-    <string name="room_settings_notifications">Notificaties</string>
     <string name="room_settings_favourite">Favoriet</string>
     <string name="room_settings_de_prioritize">De-prioriteren</string>
     <string name="room_settings_direct_chat">Privé chat</string>
@@ -567,7 +557,6 @@ Sta toegang toe op de volgende pop-up om bestanden vanaf je telefoon te sturen.<
     <string name="room_settings_topic">Onderwerp</string>
     <string name="room_settings_room_tag">Ruimte label</string>
     <string name="room_settings_tag_pref_dialog_title">Gelabeld als:</string>
-    <string name="room_settings_mute_notifs">Notificaties dempen</string>
 
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Favoriet</string>
@@ -768,10 +757,8 @@ Je kan het nu of later doen vanaf de applicatie instellingen.</string>
     <string name="active_widgets">%1$d actieve widgets</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">Je moet gebruikers kunnen uitnodigen om dat te kunnen doen.</string>
     <string name="widget_integration_unable_to_create">Niet mogelijk om de widget te maken.</string>
     <string name="widget_integration_failed_to_send_request">Niet gelukt om een verzoek te verzenden.</string>
-    <string name="widget_integration_room_not_recognised">Deze ruimte wordt niet herkend.</string>
     <string name="widget_integration_positive_power_level">Het machtsniveau moet een positief en heel getal zijn.</string>
     <string name="widget_integration_must_be_in_room">Je zit niet in deze ruimte.</string>
     <string name="widget_integration_no_permission_in_room">Je hebt niet de permissie om dat in deze ruimte te doen.</string>
@@ -780,5 +767,44 @@ Je kan het nu of later doen vanaf de applicatie instellingen.</string>
     <string name="widget_integration_room_not_visible">Ruimte %s is niet zichtbaar.</string>
     <string name="settings_labs_matrix_apps">Matrix Apps</string>
     <string name="room_add_matrix_apps">Matrix Apps toevoegen</string>
-    <string name="add_matrix_apps_not_supported">Niet ondersteund op dit apparaat</string>
+    <string name="notification_noisy_notifications">Geluidgevende notificaties</string>
+    <string name="notification_silent_notifications">Stille notificaties</string>
+
+    <string name="title_activity_bug_report">Foutmelding</string>
+
+    <string name="option_take_photo">Foto maken</string>
+    <string name="option_take_video">Video maken</string>
+
+    <string name="call">Bel</string>
+    <string name="settings_containing_my_display_name">Berichten die mijn weergavenaam bevat</string>
+    <string name="settings_containing_my_user_name">Berichten dat mijn gebruikersnaam bevat</string>
+    <string name="settings_analytics">Analytics</string>
+    <string name="settings_opt_out_of_analytics">Analytics uitzetten</string>
+    <string name="settings_opt_out_of_analytics_summary">Riot verzamelt anonieme statistische gegevens om de applicatie te verbeteren.</string>
+
+
+    <string name="settings_labs_native_camera">Gebruik de systeem camera</string>
+
+    // share keys
+    <string name="you_added_a_new_device">Je hebt een nieuw apparaat toegevoegd \'%s\', dat versleutelingssleutels aanvraagt.</string>
+    <string name="your_unverified_device_requesting">Je niet geverifieerde apparaat \'%s\' vraagt versleutelingssleutels aan.</string>
+    <string name="start_verification">Verificatie starten</string>
+    <string name="share_without_verifying">Delen zonder te verifiëren</string>
+    <string name="ignore_request">Verzoek negeren</string>
+
+    // conference call
+    <string name="conference_call_warning_title">Waarschuwing!</string>
+    <string name="conference_call_warning_message">Vergadergesprekken zijn in ontwikkeling en kunnen dus kuren vertonen.</string>
+
+    // slash commands
+    <string name="command_error">Besturingssignaal fout</string>
+    <string name="unrecognized_command">Onbekend besturingssignaal: %s</string>
+
+    // notification statuses
+    <string name="notification_off">Uit</string>
+    <string name="notification_on">Aan</string>
+    <string name="notification_noisy">Luidruchtig</string>
+
+    <string name="encrypted_message">Versleuteld bericht</string>
+
 </resources>
diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml
index 86fcfa229a..346439f625 100644
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@@ -212,8 +212,6 @@ Utwórz kopię zapasową, zanim się wylogujesz.</string>
 
     <string name="call_error_ice_failed">Połączenie multimedialne nie powiodło się</string>
     <string name="call_error_camera_init_failed">Nie udało się zainicjalizować aparatu</string>
-    <string name="action_accept">AKCEPTUJ</string>
-    <string name="action_ignore">IGNORUJ</string>
 
     <string name="media_picker_both_capture_title">Zrób zdjęcie lub nagraj film</string>
     <string name="media_picker_cannot_record_video">Nie można nagrać filmu</string>
@@ -365,7 +363,6 @@ Przyznaj dostęp w następnym oknie.</string>
     <string name="directory_search_rooms_for">Znaleziono %1$s pokoje dla wyniku %2$s</string>
     <string name="directory_searching_title">Wyszukiwanie katalogu…</string>
 
-    <string name="room_settings_notifications">Powiadomienia</string>
     <string name="room_settings_favourite">Dodaj do ulubionych</string>
     <string name="room_settings_de_prioritize">Usuń z priorytetyzowanych</string>
     <string name="room_settings_direct_chat">Rozmawiaj bezpośrednio</string>
@@ -475,7 +472,6 @@ Wprowadź hasło, aby kontynuować.</string>
     <string name="room_settings_room_name">Nazwa pokoju</string>
     <string name="room_settings_topic">Temat</string>
     <string name="room_settings_room_tag">Tag pokoju</string>
-    <string name="room_settings_mute_notifs">Wycisz powiadomienia</string>
 
     <string name="room_settings_tag_pref_entry_favourite">Ulubione</string>
     <string name="room_settings_tag_pref_entry_low_priority">Niski priorytet</string>
diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml
index 66176ac72b..aa818cc400 100644
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@@ -230,10 +230,6 @@
     <string name="room_info_room_name">Nome da sala</string>
     <string name="room_info_room_topic">Tópico da sala</string>
 
-    <!-- Settings keys -->
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <!-- call string -->
     <string name="call_connected">Chamada conectada</string>
     <string name="call_connecting">Conectando chamada…</string>
@@ -248,11 +244,6 @@
     <string name="call_error_ice_failed">A conexão à mídia falhou</string>
     <string name="call_error_camera_init_failed">Não consigo inicializar a câmera</string>
     <string name="call_error_answered_elsewhere">chamada respondida em outro lugar</string>
-    <string name="call_error_peer_hangup_elsewhere">chamada terminada em outro lugar</string>
-    <string name="call_error_peer_cancelled_call">chamada cancelada</string>
-
-    <string name="action_accept">ACEITAR</string>
-    <string name="action_ignore">IGNORAR</string>
 
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Tomar uma foto ou um vídeo"</string>
@@ -439,7 +430,6 @@
     <string name="directory_searching_title">Buscando no diretório...</string>
 
     <!-- home room settings -->
-    <string name="room_settings_notifications">Notificações</string>
     <string name="room_settings_favourite">Favoritar</string>
     <string name="room_settings_de_prioritize">Despriorizar</string>
     <string name="room_settings_direct_chat">Conversa direta</string>
@@ -563,7 +553,6 @@
     <string name="room_settings_topic">Tópico</string>
     <string name="room_settings_room_tag">Etiqueta da sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetada como:</string>
-    <string name="room_settings_mute_notifs">Silenciar notificações desta sala</string>
 
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Favoritar</string>
diff --git a/vector/src/main/res/values-pt/strings.xml b/vector/src/main/res/values-pt/strings.xml
index d51bb5e6c4..1b8c178cf0 100755
--- a/vector/src/main/res/values-pt/strings.xml
+++ b/vector/src/main/res/values-pt/strings.xml
@@ -241,10 +241,6 @@ Pedimos desculpa pela inconveniência.</string>
     <string name="room_info_room_name">Nome da sala</string>
     <string name="room_info_room_topic">Tópico da sala</string>
 
-    <!-- Settings keys -->
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <!-- call string -->
     <string name="call_connected">Chamada conectada</string>
     <string name="call_connecting">A estabelecer a chamada…</string>
@@ -259,11 +255,6 @@ Pedimos desculpa pela inconveniência.</string>
     <string name="call_error_ice_failed">A conexão à mídia falhou</string>
     <string name="call_error_camera_init_failed">Não foi possível iniciar a câmara</string>
     <string name="call_error_answered_elsewhere">chamada respondida noutro sítio</string>
-    <string name="call_error_peer_hangup_elsewhere">chamada terminada noutro sítio</string>
-    <string name="call_error_peer_cancelled_call">chamada cancelada</string>
-
-    <string name="action_accept">ACEITAR</string>
-    <string name="action_ignore">IGNORAR</string>
 
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Tirar fotografia ou gravar um vídeo</string>
@@ -470,7 +461,6 @@ Tem a certeza?</string>
     <string name="directory_searching_title">A pesquisar o diretório...</string>
 
     <!-- home room settings -->
-    <string name="room_settings_notifications">Notificações</string>
     <string name="room_settings_favourite">Adicionar aos favoritos</string>
     <string name="room_settings_de_prioritize">Baixa prioridade</string>
     <string name="room_settings_direct_chat">Conversa direta</string>
@@ -595,7 +585,6 @@ Para continuar, insira a sua palavra-passe.</string>
     <string name="room_settings_topic">Tópico</string>
     <string name="room_settings_room_tag">Etiqueta da sala</string>
     <string name="room_settings_tag_pref_dialog_title">Etiquetada como:</string>
-    <string name="room_settings_mute_notifs">Silenciar notificações</string>
 
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Adicionar aos favoritos</string>
@@ -808,10 +797,8 @@ Dispositivos desconhecidos:</string>
     <string name="active_widgets">Widgets ativos: %1$d</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">Tem que poder convidar utilizadores para fazer isso.</string>
     <string name="widget_integration_unable_to_create">Não foi possível criar o widget.</string>
     <string name="widget_integration_failed_to_send_request">O envio do pedido falhou.</string>
-    <string name="widget_integration_room_not_recognised">Esta sala não é reconhecida.</string>
     <string name="widget_integration_positive_power_level">Nível de utilizador tem que ser um inteiro positivo.</string>
     <string name="widget_integration_must_be_in_room">Não se encontra nesta sala.</string>
     <string name="widget_integration_no_permission_in_room">Não tem permissão para fazer isso nesta sala.</string>
@@ -820,8 +807,7 @@ Dispositivos desconhecidos:</string>
     <string name="widget_integration_room_not_visible">Sala %s não se encontra visível.</string>
     <string name="settings_labs_matrix_apps">Apps Matrix</string>
     <string name="room_add_matrix_apps">Adicionar apps Matrix</string>
-    <string name="add_matrix_apps_not_supported">Não é suportado neste dispositivo</string>
-<string name="notification_sync_in_progress">A sincronizar</string>
+    <string name="notification_sync_in_progress">A sincronizar</string>
     <string name="notification_listen_for_events">À escuta de eventos</string>
 
     </resources>
diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml
index a53be0c2be..39f16269bb 100644
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@@ -41,14 +41,15 @@
     <string name="missing_permissions_title_to_start_conf_call">Не удалось осуществить вызов</string>
     <string name="device_information">Информация об устройстве</string>
     <string name="room_no_conference_call_in_encrypted_rooms">Конференц звонки не поддерживаются в зашифрованных комнатах</string>
-    <string name="send_anyway">Отправить всё равно</string>
+    <string name="send_anyway">Отправить все равно</string>
     <string name="or">или</string>
     <string name="and">и</string>
     <string name="invite">Приглашение</string>
 
     <!-- actions -->
     <string name="action_sign_out">Выйти</string>
-    <string name="action_sign_out_confirmation">Для обеспечения безопасности при выходе будут удалены все ключи сквозного шифрования из этого браузера. Если вы хотите иметь возможность расшифровать историю сообщений в будущем, необходимо экспортировать ключи комнат вручную.</string>
+    <string name="action_sign_out_confirmation">Для обеспечения безопасности, выход из системы удалит все ключи сквозного шифрования, сделав зашифрованную историю чата нечитаемой, если вы снова осуществите вход.
+Можно экспортировать ключи для последующей дешифровки истории.</string>
     <string name="action_voice_call">Голосовой вызов</string>
     <string name="action_video_call">Видео вызов</string>
     <string name="action_global_search">Глобальный поиск</string>
@@ -65,7 +66,7 @@
     <string name="dialog_title_warning">Предупреждение</string>
 
     <!-- Bottom navigation buttons -->
-    <string name="bottom_action_home">Home</string>
+    <string name="bottom_action_home">Начало</string>
     <string name="bottom_action_favourites">Избранные</string>
     <string name="bottom_action_people">Люди</string>
     <string name="bottom_action_rooms">Комнаты</string>
@@ -100,20 +101,20 @@
 	<item quantity="other"/>
 </plurals>
     
-    <string name="send_bug_report_include_logs">Отправить журналы</string>
+    <string name="send_bug_report_include_logs">Отправить логи</string>
     <string name="send_bug_report_include_crash_logs">Отправить журналы ошибок</string>
     <string name="send_bug_report_include_screenshot">Отправить скриншот</string>
     <string name="send_bug_report">Отчет об ошибке</string>
     <string name="send_bug_report_description">Пожалуйста опишите ошибку. Что вы делали? Что вы ожидали получить? Что произошло?</string>
     <string name="send_bug_report_placeholder">Опишите проблему здесь</string>
-    <string name="send_bug_report_logs_description">Для диагностики проблемы, журналы с этого клиента будут приложены к отчету об ошибке. Если вы предпочитаете не отправлять журналы, то снимите флаг:</string>
+    <string name="send_bug_report_logs_description">Для диагностики проблемы журналы работы приложения будут приложены к отчету об ошибке. Если вы предпочитаете не отправлять журналы, то снимите флаг:</string>
     <string name="send_bug_report_alert_message">Хотите отправить отчет об ошибке?</string>
     <string name="send_bug_report_sent">Отчет об ошибке успешно отправлен</string>
-    <string name="send_bug_report_failed">Сбой отправки отчёта об ошибке (%s)</string>
+    <string name="send_bug_report_failed">Сбой отправки отчета об ошибке (%s)</string>
     <string name="send_bug_report_progress">Прогресс (%s%%)</string>
     <string name="send_bug_report_app_crashed">В прошлый раз приложение некорректно завершило работу. Хотите отправить отчет о сбое?</string>
     
-    <string name="send_files_in">Предать в</string>
+    <string name="send_files_in">Отправить в</string>
     <string name="read_receipt">Прочитан</string>
 
     <string name="join_room">Войти в Комнату</string>
@@ -158,10 +159,10 @@ Email также позволит вам при необходимости во
     <string name="auth_repeat_password_placeholder">Повтор пароля</string>
     <string name="auth_repeat_new_password_placeholder">Подтвердите ваш новый пароль</string>
     <string name="auth_invalid_login_param">Неверный логин и/или пароль</string>
-    <string name="auth_invalid_user_name">Логин может содержать только буквы, цифры, точки, дефис и подчёркивание</string>
+    <string name="auth_invalid_user_name">Логин может содержать только буквы, цифры, точки, дефис и подчеркивание</string>
     <string name="auth_invalid_password">Короткий пароль (минимум 6 символов)</string>
     <string name="auth_missing_password">Отсутствует пароль</string>
-    <string name="auth_invalid_email">"Не похоже, что введён корректный email"</string>
+    <string name="auth_invalid_email">Похоже, что введен некорректный email</string>
     <string name="auth_invalid_phone">Введен некорректный номер телефона</string>
     <string name="auth_email_already_defined">Этот email уже используется.</string>
     <string name="auth_missing_email">Отсутствует email</string>
@@ -180,12 +181,14 @@ Email также позволит вам при необходимости во
     <string name="auth_home_server">Сервер:</string>
     <string name="auth_identity_server">Сервер идентификации:</string>
     <string name="auth_reset_password_next_step_button">Я проверил мой email адрес</string>
-    <string name="auth_reset_password_message">Для сброса пароля введите привязанный к учётной записи email:</string>
-    <string name="auth_reset_password_missing_email">Должен быть введён привязанный к учётной записи email.</string>
-    <string name="auth_reset_password_missing_password">Должен быть введён новый пароль.</string>
+    <string name="auth_reset_password_message">Для сброса пароля введите привязанный к учетной записи email:</string>
+    <string name="auth_reset_password_missing_email">Должен быть введен привязанный к учетной записи email.</string>
+    <string name="auth_reset_password_missing_password">Должен быть введен новый пароль.</string>
     <string name="auth_reset_password_email_validation_message">На адрес %s было отправлено письмо. После перехода по ссыдке в письме нажмите ниже.</string>
     <string name="auth_reset_password_error_unauthorized">Не удалось проверить email: убедитесь, что вы перешли по присланной ссылке</string>
-    <string name="auth_reset_password_success_message">Ваш пароль сброшен.\n\nОсуществлён выход на всех устройствах - вы не будете получать push уведомления. Для включения push уведомлений заново войдите на каждом из ваших устройств.</string>
+    <string name="auth_reset_password_success_message">Ваш пароль сброшен.
+
+Осуществлен выход на всех устройствах - вы не будете получать push уведомления. Для включения push уведомлений заново войдите на каждом из ваших устройств.</string>
     
     <!-- Login Screen -->
     <string name="login_error_must_start_http">URL должен начинаться с http[s]://</string>
@@ -236,10 +239,6 @@ Email также позволит вам при необходимости во
     <string name="room_info_room_name">Название Комнаты</string>
     <string name="room_info_room_topic">Тема комнаты</string>
 
-    <!-- Settings keys -->
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <!-- call string -->
     <string name="call_connected">Вызов соеденен</string>
     <string name="call_connecting">Устанавливается соединение…</string>
@@ -254,30 +253,25 @@ Email также позволит вам при необходимости во
     <string name="call_error_ice_failed">Медиавызов не удался</string>
     <string name="call_error_camera_init_failed">Невозможно инициализировать камеру</string>
     <string name="call_error_answered_elsewhere">Звонок принят на другом устройстве</string>
-    <string name="call_error_peer_hangup_elsewhere">Звонок сброшен на другом устройстве</string>
-    <string name="call_error_peer_cancelled_call">звонок отменен</string>
-    
-    <string name="action_accept">ПРИНЯТЬ</string>
-    <string name="action_ignore">ОТКЛОНИТЬ</string>
 
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Снять фото или видео"</string>
     <string name="media_picker_cannot_record_video">Не удалось записать видео"</string>
     
     <!-- permissions Android M -->
-    <string name="permissions_rationale_popup_title">%s Информация</string>
-    <string name="permissions_rationale_msg_storage">%s необходимы разрешения на доступ к вашим фото и видео для сохранения и отправки сложений.\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность отправлять файлы.</string>
-    <string name="permissions_rationale_msg_camera">%s необходимы разрешения на доступ к вашей камере, чтобы делать фото и совершать видеозвонки.</string>
+    <string name="permissions_rationale_popup_title">Riot Информация</string>
+    <string name="permissions_rationale_msg_storage">Riot необходимы разрешения на доступ к вашим фото и видео для сохранения и отправки сложений.\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность отправлять файлы.</string>
+    <string name="permissions_rationale_msg_camera">Riot необходимы разрешения на доступ к вашей камере, чтобы делать фото и совершать видеозвонки.</string>
     <string name="permissions_rationale_msg_camera_explanation">\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность совершать звонки.</string>
-    <string name="permissions_rationale_msg_record_audio">%s необходимы разрешения на доступ к микрофону, чтобы выполнять звонки.</string>
+    <string name="permissions_rationale_msg_record_audio">Riot необходимы разрешения на доступ к микрофону, чтобы выполнять звонки.</string>
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nПожалуйста разрешите доступ в следующем окне, чтобы иметь возможность совершать звонки.</string>
-    <string name="permissions_rationale_msg_camera_and_audio">%s необходимы разрешения на доступ к камере и микрофону для видеовызовов.
+    <string name="permissions_rationale_msg_camera_and_audio">Riot необходимы разрешения на доступ к камере и микрофону для видеовызовов.
 
 Пожалуйста дайте разрешение в следующем окне для звонка.</string>
-    <string name="permissions_rationale_msg_contacts">%s необходимы разрешения на доступ к контактам, чтобы найти других пользователей сети по email или телефонному номеру.
+    <string name="permissions_rationale_msg_contacts">Riot необходимы разрешения на доступ к контактам, чтобы найти других пользователей сети по email или телефонному номеру.
 
 Пожалуйста разрешите доступ в следующем окне, чтобы Ваши контакты были доступны в приложении.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">%s необходимы разрешения на доступ к контактам, чтобы найти других пользователей сети по email или телефонному номеру.
+    <string name="permissions_msg_contacts_warning_other_androids">Riot необходимы разрешения на доступ к контактам, чтобы найти других пользователей сети по email или телефонному номеру.
 
 Разрешить Riot доступ к контактам?</string>
     
@@ -312,7 +306,7 @@ Email также позволит вам при необходимости во
     <string name="room_header_active_members">%1$d/%2$d активных пользователей</string>
     <string name="room_title_members">%1$d пользователей</string>
     <string name="room_title_one_member">1 пользователь</string>
-    <string name="room_e2e_alert_title">Предостережение!</string>
+    <string name="room_e2e_alert_title">Внимание!</string>
     <string name="room_e2e_alert_message">Сквозное шифрование на текущий момент тестируется и может работать нестабильно.
 
 Пока не стоит доверять ему, если хотите быть уверенными в безопасности ваших данных.
@@ -381,7 +375,7 @@ Email также позволит вам при необходимости во
     <string name="room_unsent_messages_notification">Сообщения не отправлены. %1$s или %2$s сейчас?</string>
     <string name="room_unknown_devices_messages_notification">Сообщения, не отправлены из-за присутствия неизвестных устройств. %1$s или %2$s сейчас?</string>
     <string name="room_prompt_resend">Повторить отправку</string>
-    <string name="room_prompt_cancel">удалить всё</string>
+    <string name="room_prompt_cancel">удалить все</string>
     <string name="room_resend_unsent_messages">Отправить неотправленные сообщения</string>
     <string name="room_delete_unsent_messages">Удалить неотправленные сообщения</string>
     <string name="room_message_file_not_found">Файл не найден</string>
@@ -440,7 +434,7 @@ Email также позволит вам при необходимости во
     <string name="room_recents_directory">КАТАЛОГ</string>
     <string name="room_recents_favourites">ИЗБРАННОЕ</string>
     <string name="room_recents_conversations">КОМНАТЫ</string>
-    <string name="room_recents_low_priority">НЕ СРОЧНО</string>
+    <string name="room_recents_low_priority">НИЗКИЙ ПРИОРИТЕТ</string>
     <string name="room_recents_invites">ПРИГЛАШЕНИЯ</string>
     <string name="room_recents_start_chat">Начать чат</string>
     <string name="room_recents_create_room">Создать комнату</string>
@@ -457,9 +451,8 @@ Email также позволит вам при необходимости во
     <string name="directory_searching_title">Поиск в каталоге..</string>
 
     <!-- home room settings -->
-    <string name="room_settings_notifications">Уведомления</string>
     <string name="room_settings_favourite">Избранное</string>
-    <string name="room_settings_de_prioritize">Не срочно</string>
+    <string name="room_settings_de_prioritize">Уменьшить приоритет</string>
     <string name="room_settings_direct_chat">Прямой чат</string>
     <string name="room_settings_leave_conversation">Покинуть обсуждение</string>
     <string name="room_settings_forget">Забыть</string>
@@ -555,7 +548,7 @@ Email также позволит вам при необходимости во
     <string name="settings_new_password">новый пароль</string>
     <string name="settings_confirm_password">подтверждение пароля</string>
     <string name="settings_fail_to_update_password">Ошибка смены пароля</string>
-    <string name="settings_password_updated">Пароль был обновлён</string>
+    <string name="settings_password_updated">Пароль был обновлен</string>
     <string name="settings_unignore_user">Отображать сообщения пользователя %s?</string>
 
     <string name="settings_delete_notification_targets_confirmation">Вы уверены, что хотите удалить устройство для получения уведомлений?</string>
@@ -577,20 +570,19 @@ Email также позволит вам при необходимости во
     <!-- Room Settings -->
     
     <!-- room global settings-->
-    <string name="room_settings_room_photo">Аватар Комнаты</string>
+    <string name="room_settings_room_photo">Аватар комнаты</string>
     <string name="room_settings_room_name">Название комнаты</string>
     <string name="room_settings_topic">Тема</string>
     <string name="room_settings_room_tag">Метки комнаты</string>
     <string name="room_settings_tag_pref_dialog_title">Отмечено как:</string>
-    <string name="room_settings_mute_notifs">Не беспокоить</string>
-    
+
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Избранное</string>
-    <string name="room_settings_tag_pref_entry_low_priority">Не срочно</string>
+    <string name="room_settings_tag_pref_entry_low_priority">Низкий приоритет</string>
     <string name="room_settings_tag_pref_entry_none">Нет</string>
     <string name="room_settings_tag_pref_no_tag">без меток</string>
     <string name="room_settings_tag_pref_entry_value_favourite">избранное</string>
-    <string name="room_settings_tag_pref_entry_value_low_priority">не срочно</string>
+    <string name="room_settings_tag_pref_entry_value_low_priority">низкий</string>
     <string name="room_settings_tag_pref_entry_value_none">нет</string>
     
     <!-- room settings : access and visibility -->
@@ -621,7 +613,7 @@ Email также позволит вам при необходимости во
     <string name="room_settings_room_internal_id">Внутренний ID комнаты</string>
     <string name="room_settings_addresses_pref_title">Адреса</string>
     <string name="room_settings_labs_pref_title">Лаборатория</string>
-    <string name="room_settings_labs_warning_message">Это экспериментальный функционал, он может вызвать неожиданный сбой. Используйте с осторожностью.</string>
+    <string name="room_settings_labs_warning_message">Это экспериментальные функции, которые могут повести себя неожиданным образом. Используйте с осторожностью.</string>
     <string name="room_settings_labs_end_to_end">Сквозное шифрование</string>
     <string name="room_settings_labs_end_to_end_is_active">Сквозное шифрование активно</string>
     <string name="room_settings_labs_end_to_end_warnings">Вам необходимо выйти, чтобы включить шифрование.</string>
@@ -635,7 +627,7 @@ Email также позволит вам при необходимости во
     <string name="room_settings_addresses_invalid_format_dialog_title">Неверный формат псевдонима</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' неверный формат псевдонима</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">Необходимо указать основной адрес. По-умолчанию основной адрес для этой комнаты будет выбран случайно"</string>
-    <string name="room_settings_addresses_disable_main_address_prompt_title">Предостережение: основной адрес</string>
+    <string name="room_settings_addresses_disable_main_address_prompt_title">Предупреждения основного адреса</string>
     
     <string name="room_settings_set_main_address">Установить как основной адрес</string>
     <string name="room_settings_unset_main_address">Сбросить основной адрес</string>
@@ -696,11 +688,11 @@ Email также позволит вам при необходимости во
     <string name="encryption_import_room_keys_summary">Импортировать ключи из локального файла</string>
     <string name="encryption_import_import">Импорт</string>
     <string name="encryption_never_send_to_unverified_devices_title">Шифровать только для проверенных устройств</string>
-    <string name="encryption_never_send_to_unverified_devices_summary">Никогда не посылать зашифрованные сообщения для непроверенных устройств с этого устройства</string>
+    <string name="encryption_never_send_to_unverified_devices_summary">Не отправлять зашифрованные сообщения непроверенным устройствам</string>
     
     <string name="encryption_information_not_verified">НЕ проверено</string>
     <string name="encryption_information_verified">Проверено</string>
-    <string name="encryption_information_blocked">В чёрном списке</string>
+    <string name="encryption_information_blocked">В черном списке</string>
     
     <string name="encryption_information_unknown_device">неизвестное устройство</string>
     <string name="encryption_information_none">ничего</string>
@@ -712,7 +704,7 @@ Email также позволит вам при необходимости во
     
     <string name="encryption_information_verify_device">Проверить устройство</string>
     <string name="encryption_information_verify_device_warning">" Для проверки устройства свяжитесь с его владельцем альтернативным способом (лично или по телефону) и запросите ключ, который он видит у себя в настройках пользователя. Проверьте что этот ключ совпадает с данными ниже:"</string>
-    <string name="encryption_information_verify_device_warning2">Если совпадает, то нажмите кнопку Подтвердить ниже. Если не совпадает, возможно вы захотите добавить устройство в чёрный список.
+    <string name="encryption_information_verify_device_warning2">Если совпадает, то нажмите кнопку Подтвердить ниже. Если не совпадает, возможно вы захотите добавить устройство в черный список.
 В будущем данный процесс будет улучшен.</string>
     <string name="encryption_information_verify_key_match">Я проверил, что ключи совпадают</string>
     
@@ -750,7 +742,7 @@ Email также позволит вам при необходимости во
     <string name="settings_hide_read_receipts">Скрыть отметки о прочтении</string>
     <string name="settings_dont_send_typings_notifs">Не оповещать, когда я печатаю</string>
     <string name="settings_always_show_timestamps">Всегда показывать временные метки сообщений</string>
-    <string name="settings_disable_markdown">Отключить Markdown-форматирование</string>
+    <string name="settings_disable_markdown">Отключить Markdown-форматирование при отправке</string>
 
     <string name="media_saving_period_3_days">3 дня</string>
     <string name="media_saving_period_1_week">1 неделя</string>
@@ -762,7 +754,7 @@ Email также позволит вам при необходимости во
 
     <string name="user_directory_header">Каталог пользователей</string>
     <string name="people_search_user_directory">КАТАЛОГ ПОЛЬЗОВАТЕЛЕЙ (%s)</string>
-    <string name="settings_data_save_mode">Режим сохранения данных</string>
+    <string name="settings_data_save_mode">Режим экономии трафика</string>
 
     <string name="settings_theme">Тема</string>
 
@@ -784,8 +776,7 @@ Email также позволит вам при необходимости во
     <string name="settings_12_24_timestamps">Показывать временные метки в 12-часовом формате (например 2:30pm)</string>
     <string name="event_formatter_widget_added">%1$s добавлен %2$s</string>
     <string name="event_formatter_widget_removed">%1$s удален %2$s</string>
-    <string name="add_matrix_apps_not_supported">Не поддерживается на этом устройстве</string>
-<string name="settings_hide_join_leave_messages">Скрывать сообщения присоединился/покинул (не затрагивает приглашение/кик/бан)</string>
+    <string name="settings_hide_join_leave_messages">Скрывать сообщения присоединился/покинул (не затрагивает приглашение/кик/бан)</string>
     <string name="settings_hide_avatar_display_name_changes_messages">Скрывать изменения аватара и отображаемого имени</string>
 
     <string name="widget_no_power_to_manage">Вам нужно разрешение на управление виджетами в этой комнате</string>
@@ -795,19 +786,17 @@ Email также позволит вам при необходимости во
     <string name="active_widgets">активных виджетов: %1$d</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">Для этого вы должны иметь возможность приглашать пользователей.</string>
     <string name="widget_integration_unable_to_create">Не удалось создать виджет.</string>
     <string name="widget_integration_failed_to_send_request">Не удалось отправить запрос.</string>
-    <string name="widget_integration_room_not_recognised">Данная комната не распознана.</string>
     <string name="widget_integration_positive_power_level">Уровень доступа должен быть числом больше 0.</string>
     <string name="widget_integration_must_be_in_room">Вы не состоите в этой комнате.</string>
     <string name="widget_integration_no_permission_in_room">У вас нет разрешений делать это в данной комнате.</string>
     <string name="widget_integration_missing_room_id">В запросе отсутствует room_id.</string>
     <string name="widget_integration_missing_user_id">В запросе отсутствует user_id.</string>
-    <string name="widget_integration_room_not_visible">Комната %s не отображается.</string>
+    <string name="widget_integration_room_not_visible">Комната %s невидима.</string>
     <string name="settings_labs_matrix_apps">Приложения Matrix</string>
     <string name="room_add_matrix_apps">Добавить приложения Matrix</string>
-    <string name="login_mobile_device">Mobile</string>
+    <string name="login_mobile_device">Мобильный</string>
 
     <string name="notification_sync_in_progress">Синхронизация</string>
     <string name="notification_listen_for_events">Мониторинг событий</string>
@@ -835,4 +824,91 @@ Email также позволит вам при необходимости во
     <string name="settings_labs_native_camera">Использовать встроенную камеру</string>
 
     // share keys
-    </resources>
+    <string name="title_activity_bug_report">Отчет об ошибке</string>
+
+    <string name="conference_call_warning_title">Внимание!</string>
+    <string name="conference_call_warning_message">Конференц-связь находится в разработке и может быть ненадежной.</string>
+
+    // slash commands
+    <string name="command_error">Ошибка команды</string>
+    <string name="unrecognized_command">Нераспознанная команда: %s</string>
+
+    // notification statuses
+    <string name="notification_off">Выкл</string>
+    <string name="notification_on">Вкл</string>
+    <string name="notification_noisy">Громко</string>
+
+    <string name="encrypted_message">Зашифрованное сообщение</string>
+
+<string name="title_activity_group_details">Сведения о сообществе</string>
+
+    <string name="loading">Загрузка...</string>
+
+    <string name="action_exit">Выход</string>
+    <string name="bottom_action_groups">Сообщества</string>
+
+    <string name="home_filter_placeholder_groups">Поиск сообществ</string>
+
+    <string name="groups_invite_header">Пригласить</string>
+    <string name="groups_header">Сообщества</string>
+    <string name="no_group_placeholder">Нет групп</string>
+
+    <string name="start_new_chat_prompt_msg">Вы действительно хотите начать новый чат с %s?</string>
+    <string name="start_voice_call_prompt_msg">Вы уверены, что хотите начать голосовой вызов?</string>
+    <string name="start_video_call_prompt_msg">Вы уверены, что хотите начать видеовызов?</string>
+
+    <string name="groups_list">Список групп</string>
+
+    <string name="room_participants_kick_prompt_msg">Вы действительно хотите выгнать этого пользователя из этого чата?</string>
+    <string name="room_participants_ban_prompt_msg">Вы уверены, что хотите забанить этого пользователя в этом чате?</string>
+
+    <string name="room_settings_all_messages_noisy">Все сообщения (громко)</string>
+    <string name="room_settings_all_messages">Все сообщения</string>
+    <string name="room_settings_mention_only">Только упоминания</string>
+    <string name="room_settings_mute">Без звука</string>
+    <string name="room_settings_add_homescreen_shortcut">Добавить ярлык на главный экран</string>
+
+    <string name="settings_inline_url_preview">Включить предпросмотр URL-адресов по умолчанию</string>
+    <string name="settings_vibrate_on_mention">Вибрация при упоминании</string>
+
+    <string name="room_settings_room_notifications_title">Уведомления</string>
+    <string name="room_settings_add_new_group">Новый ID сообщества (например +foo:matrix.org)</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Недопустимый ID сообщества</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' недействительный ID сообщества</string>
+
+
+    <string name="create">Создать</string>
+    <string name="create_community">Создать сообщество</string>
+    <string name="community_name">Имя сообщества</string>
+    <string name="community_name_hint">Пример</string>
+    <string name="community_id">ID сообщества</string>
+    <string name="community_id_hint">пример</string>
+
+    // group details
+    <string name="group_details_home">Начало</string>
+    <string name="group_details_people">Люди</string>
+    <string name="group_details_rooms">Комнаты</string>
+    <string name="no_users_placeholder">Нет пользователей</string>
+
+    <string name="rooms">Комнаты</string>
+    <string name="joined">Присоединился</string>
+    <string name="invited">Приглашен</string>
+    <string name="filter_group_members">Фильтр участников группы</string>
+    <string name="filter_group_rooms">Фильтр комнат группы</string>
+
+    <string name="group_one_member">1 участник</string>
+    <string name="group_members">%d участников</string>
+
+    <string name="group_one_room">1 комната</string>
+    <string name="group_rooms">%d комнат</string>
+    <string name="group_no_long_description">Администратор сообщества не предоставил подробного описания этого сообщества.</string>
+
+    <string name="one_new_message">1 новое сообщение</string>
+    <string name="new_messages">%d новых сообщений</string>
+
+    <string name="has_been_kicked">Вас выгнал %2$s из %1$s</string>
+    <string name="has_been_banned">Вас забанил %2$s в %1$s</string>
+    <string name="reason_colon">Причина: %1$s</string>
+    <string name="rejoin">Присоединиться снова</string>
+    <string name="forget_room">Забыть комнату</string>
+</resources>
diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml
index a21b42ef52..623f0e9475 100644
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@@ -104,7 +104,7 @@
     <string name="send_bug_report_description">Prosím, Napíšte text hlásenia. Čo ste práve robili? Čo ste očakávali? Čo sa v skutočnosti udialo?</string>
     <string name="send_bug_report_placeholder">Tu popíšte váš problém</string>
     <string name="send_bug_report_logs_description">S cieľom lepšej diagnostiky problému sa spolu s vašim hlásením odošlú záznami o činnosti programu Riot. Ak si želáte odoslať len text hlásenia, odškrtnite niektoré z nasledujúcich polí:</string>
-    <string name="send_bug_report_alert_message">Zdá sa, že v zlosti triasiete zariadením. Chceli by ste odoslať hlásenie o chybe?</string>
+    <string name="send_bug_report_alert_message">Zdá sa, že v zlosti trasiete zariadením. Chceli by ste odoslať hlásenie o chybe?</string>
     <string name="send_bug_report_app_crashed">Posledné spustenie aplikácie skončilo pádom. Chceli by ste odoslať hlásenie o chybe?</string>
 
     <string name="send_bug_report_sent">Hlásenie o chybe bolo úspešne odoslané</string>
@@ -230,9 +230,6 @@ Ospravedlňujeme sa za spôsobené ťažkosti.</string>
     <string name="room_info_room_name">Názov miestnosti</string>
     <string name="room_info_room_topic">Téma miestnosti</string>
 
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <string name="call">Hovor</string>
     <string name="call_connected">Hovor spojený</string>
     <string name="call_connecting">Spojenie hovoru…</string>
@@ -247,11 +244,6 @@ Ospravedlňujeme sa za spôsobené ťažkosti.</string>
     <string name="call_error_ice_failed">Zlyhalo spojenie médií</string>
     <string name="call_error_camera_init_failed">Nie je možné spustiť kameru</string>
     <string name="call_error_answered_elsewhere">Hovor bol prijatý na inom zariadení</string>
-    <string name="call_error_peer_hangup_elsewhere">Hovor bol ukončený na inom zariadení</string>
-    <string name="call_error_peer_cancelled_call">Hovor bol zrušený</string>
-
-    <string name="action_accept">PRIJAŤ</string>
-    <string name="action_ignore">IGNOROVAŤ</string>
 
     <string name="media_picker_both_capture_title">Odfotiť obrázok alebo video</string>
     <string name="media_picker_cannot_record_video">Nie je možné nahrať video</string>
@@ -440,7 +432,6 @@ Ste si istí?</string>
     <string name="directory_search_rooms_for">Nájdených %1$s miestností pre %2$s</string>
     <string name="directory_searching_title">Vyhľadávanie v adresáry..</string>
 
-    <string name="room_settings_notifications">Oznámenia</string>
     <string name="room_settings_favourite">Do obľúbených</string>
     <string name="room_settings_de_prioritize">Nízka priorita</string>
     <string name="room_settings_direct_chat">Priama konverzácia</string>
@@ -516,7 +507,7 @@ Ste si istí?</string>
     <string name="settings_hide_join_leave_messages">Skryť správy o vstupe a opustení miestnosti (netýka sa pozvaní/vykopnutí/zákazov vstupu)</string>
     <string name="settings_hide_avatar_display_name_changes_messages">Skryť zmeny zobrazovaného mena a avatara</string>
 
-    <string name="settings_disable_markdown">Zakázať formátovanie textu Markdown</string>
+    <string name="settings_disable_markdown">Pri odosielaní zakázať formátovanie textu Markdown</string>
     <string name="settings_data_save_mode">Režim šetrenia údajov</string>
 
     <string name="devices_details_dialog_title">Podrobnosti o zariadení</string>
@@ -581,7 +572,6 @@ Ak chcete pokračovať, prosím zadajte vaše heslo.</string>
     <string name="room_settings_topic">Téma</string>
     <string name="room_settings_room_tag">Značka miestnosti</string>
     <string name="room_settings_tag_pref_dialog_title">Označená ako:</string>
-    <string name="room_settings_mute_notifs">Potlačiť oznámenia</string>
 
     <string name="room_settings_tag_pref_entry_favourite">Obľúbená</string>
     <string name="room_settings_tag_pref_entry_low_priority">Nízka priorita</string>
@@ -747,10 +737,8 @@ Neznáme zariadenia:</string>
     <string name="active_widgets">%1$d aktívne widgety</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">Na uskutočnenie tejto akcie by ste mali byť schopní pozývať používateľov.</string>
     <string name="widget_integration_unable_to_create">Nie je možné vytvoriť widget.</string>
     <string name="widget_integration_failed_to_send_request">Nepodarilo sa odoslať požiadavku.</string>
-    <string name="widget_integration_room_not_recognised">Nie je možné rozpoznať takúto miestnosť.</string>
     <string name="widget_integration_positive_power_level">Úroveň moci musí byť kladné celé číslo.</string>
     <string name="widget_integration_must_be_in_room">Nenachádzate sa v tejto miestnosti.</string>
     <string name="widget_integration_no_permission_in_room">V tejto miestnosti nemáte oprávnenie na vykonanie takejto akcie.</string>
@@ -759,7 +747,6 @@ Neznáme zariadenia:</string>
     <string name="widget_integration_room_not_visible">Miestnosť %s nie je viditeľná.</string>
     <string name="settings_labs_matrix_apps">Matrix Aplikácie</string>
     <string name="room_add_matrix_apps">Pridať Matrix aplikácie</string>
-    <string name="add_matrix_apps_not_supported">Nepodporované na tomto zariadení</string>
 
     // share keys
     <string name="you_added_a_new_device">Pridali ste nové zariadenie nazvané \'%s\', ktoré žiada o šifrovacie kľúče.</string>
@@ -768,4 +755,108 @@ Neznáme zariadenia:</string>
     <string name="share_without_verifying">Zdieľať bez overenia</string>
     <string name="ignore_request">Ignorovať žiadosť</string>
 
+<string name="notification_noisy_notifications">Hlučné oznámenia</string>
+    <string name="notification_silent_notifications">Tiché oznámenia</string>
+
+    <string name="title_activity_bug_report">Hlásenie o chybe</string>
+
+    <string name="option_take_photo">Poslať fotku</string>
+    <string name="option_take_video">Poslať video</string>
+
+    <string name="settings_analytics">Štatistika</string>
+    <string name="settings_opt_out_of_analytics">Odhlásiť sa zo zasielania štatistiky</string>
+    <string name="settings_opt_out_of_analytics_summary">Riot zbiera anonymné štatistiky, ktoré nám umožňujú aplikáciu ďalej vylepšovať.</string>
+
+
+    <string name="settings_labs_native_camera">Používať vstavaný fotoaparát a kameru</string>
+
+    // share keys
+    <string name="conference_call_warning_title">Upozornenie!</string>
+    <string name="conference_call_warning_message">Konferenčné hovory sú stále vo vývoji a nemusia byť úplne spoľahlivé.</string>
+
+    // slash commands
+    <string name="command_error">Chybný príkaz</string>
+    <string name="unrecognized_command">Nerozpoznaný príkaz: %s</string>
+
+    // notification statuses
+    <string name="notification_off">Vypnuté</string>
+    <string name="notification_on">Zapnuté</string>
+    <string name="notification_noisy">Hlučné</string>
+
+    <string name="encrypted_message">Šifrovaná správa</string>
+
+<string name="title_activity_group_details">Podrobnosti o komunite</string>
+
+    <string name="loading">Načítavanie...</string>
+
+    <string name="action_exit">Ukončiť</string>
+    <string name="bottom_action_groups">Komunity</string>
+
+    <string name="home_filter_placeholder_groups">Hľadať komunity</string>
+
+    <string name="groups_invite_header">Pozvanie</string>
+    <string name="groups_header">Komunity</string>
+    <string name="no_group_placeholder">Žiadne komunity</string>
+
+    <string name="start_new_chat_prompt_msg">Ste si istí, že chcete začať novú konverzáciu s %s?</string>
+    <string name="start_voice_call_prompt_msg">Ste si istý, že chcete začať hlasový hovor?</string>
+    <string name="start_video_call_prompt_msg">Ste si istí, že chcete začať video hovor?</string>
+
+    <string name="groups_list">Zoznam komunít</string>
+
+    <string name="room_participants_kick_prompt_msg">Ste si istí, že chcete tohoto používateľa vykopnúť z tejto miestnosti?</string>
+    <string name="room_participants_ban_prompt_msg">Ste si istí, že chcete tomuto používateľovi zakázať vstúpiť do tejto miestnosti?</string>
+
+    <string name="room_settings_all_messages_noisy">Všetky správy (hlučné)</string>
+    <string name="room_settings_all_messages">Všetky správy</string>
+    <string name="room_settings_mention_only">Len zmienky</string>
+    <string name="room_settings_mute">Umlčať</string>
+    <string name="room_settings_add_homescreen_shortcut">Pridať odkaz na domovskú obrazovku</string>
+
+    <string name="settings_inline_url_preview">Predvolene povoliť náhľady URL adries</string>
+    <string name="settings_vibrate_on_mention">Vybrovať keď spomeniete iného používateľa</string>
+
+    <string name="settings_flair">Príslušnosť ku komunitám</string>
+
+    <string name="room_settings_room_notifications_title">Oznámenia</string>
+    <string name="room_settings_no_flair">" V tejto miestnosti nie je zobrazená príslušnosť k žiadnym komunitám"</string>
+    <string name="room_settings_add_new_group">Nové ID komunity (napr. +foo:matrix.org)</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Nesprávne ID komunity</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' nie je platným ID komunity</string>
+
+
+    <string name="create">Vytvoriť</string>
+    <string name="create_community">Vytvoriť komunitu</string>
+    <string name="community_name">Názov komunity</string>
+    <string name="community_name_hint">Príklad</string>
+    <string name="community_id">ID komunity</string>
+    <string name="community_id_hint">príklad</string>
+
+    // group details
+    <string name="group_details_home">Domov</string>
+    <string name="group_details_people">Ľudia</string>
+    <string name="group_details_rooms">Miestnosti</string>
+    <string name="no_users_placeholder">Žiadni používatelia</string>
+
+    <string name="rooms">Miestnosti</string>
+    <string name="joined">Už ste vstúpili</string>
+    <string name="invited">Ste pozvaní</string>
+    <string name="filter_group_members">Filtrovať členov komunity</string>
+    <string name="filter_group_rooms">Filtrovať miestnosti v komunite</string>
+
+    <string name="group_one_member">1 člen</string>
+    <string name="group_members">%d členov</string>
+
+    <string name="group_one_room">1 miestnosť</string>
+    <string name="group_rooms">%d miestností</string>
+    <string name="group_no_long_description">Správca nenastavil dlhý popis tejto komunity.</string>
+
+    <string name="one_new_message">1 nová správa</string>
+    <string name="new_messages">%d nových správ</string>
+
+    <string name="has_been_kicked">Používateľ %2$s vás vykopol z miestnosti %1$s</string>
+    <string name="has_been_banned">Používateľ %2$s vám zakázal vstúpiť do miestnosti %1$s</string>
+    <string name="reason_colon">Dôvod: %1$s</string>
+    <string name="rejoin">Vstúpiť znovu</string>
+    <string name="forget_room">Zabudnúť miestnosť</string>
 </resources>
diff --git a/vector/src/main/res/values-te/strings.xml b/vector/src/main/res/values-te/strings.xml
index 4914dea49b..5343404792 100644
--- a/vector/src/main/res/values-te/strings.xml
+++ b/vector/src/main/res/values-te/strings.xml
@@ -171,9 +171,6 @@
     <string name="room_info_room_name">గది పేరు</string>
     <string name="room_info_room_topic">గది అంశం</string>
 
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <string name="call_connected">కాల్ కనెక్ట్ చేయబడింది</string>
     <string name="call_connecting">కాల్ అనుసంధానించబడుతున్నది…</string>
     <string name="call_ended">కాల్ ముగిసింది</string>
@@ -184,10 +181,6 @@
     <string name="call_in_progress">కాల్ పురోగతిలో వుంది</string>
 
     <string name="call_error_ice_failed">మీడియా కనెక్షన్ విఫలమైంది</string>
-    <string name="call_error_peer_cancelled_call">కాల్ రద్దు చేయబడింది</string>
-
-    <string name="action_accept">అంగీకరించు</string>
-    <string name="action_ignore">విస్మరించు</string>
 
     <string name="media_picker_both_capture_title">చిత్రాన్ని లేదా వీడియోని తీసుకోండి</string>
     <string name="media_picker_cannot_record_video">వీడియో రికార్డ్ చేయలేరు</string>
@@ -334,7 +327,6 @@
     <string name="directory_search_rooms_for">%2$s కోసం %1$s గది కనుగొనబడింది</string>
     <string name="directory_searching_title">డైరెక్టరీని వెతుకుతున్నాం..</string>
 
-    <string name="room_settings_notifications">ప్రకటనలు</string>
     <string name="room_settings_direct_chat">ప్రత్యక్ష చాట్</string>
     <string name="room_settings_leave_conversation">సంభాషణను వదిలివేయండి</string>
     <string name="room_settings_forget">మర్చిపో</string>
@@ -428,7 +420,6 @@
     <string name="room_settings_topic">విషయము</string>
     <string name="room_settings_room_tag">రూమ్ ట్యాగ్</string>
     <string name="room_settings_tag_pref_dialog_title">గా ట్యాగ్:</string>
-    <string name="room_settings_mute_notifs">నోటిఫికేషన్లను మ్యూట్ చేయండి</string>
 
     <string name="room_settings_tag_pref_entry_low_priority">తక్కువ ప్రాధాన్యత</string>
     <string name="room_settings_tag_pref_entry_none">ఎవరు కాదు</string>
@@ -502,7 +493,6 @@
     <string name="action_global_search">విశ్వాన్వేషణ</string>
     <string name="call_error_user_not_responding">అటు వైపు ఎవరు కాల్ ఎత్తలేదు</string>
     <string name="call_error_answered_elsewhere">కాల్ ఎక్కడో ఎత్తారు</string>
-    <string name="call_error_peer_hangup_elsewhere">కాల్ ఎక్కడో ఆపేశారు</string>
     <string name="action_voice_call">వాయిస్ కాల్</string>
     <string name="auth_invalid_password">గుప్తపదం చానా చిన్నది (కనీసం 6)</string>
     <string name="encryption_export_enter_passphrase">గుప్తపదం ఇవ్వండి</string>
diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml
index 2f54e44b4a..88d97e12e9 100755
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <resources>
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
 
-    <string name="resouces_language">uk</string>
-    <string name="resouces_country">UK</string>
+    <string name="resouces_language">en</string>
+    <string name="resouces_country">US</string>
 
     <!-- theme -->
     <string name="light_theme">Світла Тема</string>
@@ -246,10 +246,6 @@
     <string name="room_info_room_name">Назва кімнати</string>
     <string name="room_info_room_topic">Тема кімнати</string>
 
-    <!-- Settings keys -->
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <!-- call string -->
     <string name="call_connected">Виклик з\'єднано</string>
     <string name="call_connecting">Встановлюється з\'єднання…</string>
@@ -264,11 +260,6 @@
     <string name="call_error_ice_failed">Медіавиклик не вдався</string>
     <string name="call_error_camera_init_failed">Неможливо ініціювати камеру</string>
     <string name="call_error_answered_elsewhere">Дзвінок прийнято іншим пристроєм</string>
-    <string name="call_error_peer_hangup_elsewhere">Дзвінок відхилено іншим пристроєм</string>
-    <string name="call_error_peer_cancelled_call">виклик скасовано</string>
-
-    <string name="action_accept">ПРИЙНЯТИ</string>
-    <string name="action_ignore">ВІДХИЛИТИ</string>
 
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Зняти світлину чи відео"</string>
@@ -372,8 +363,8 @@
     <!--  Chat -->
     <string name="room_menu_search">Пошук</string>
     <string name="room_one_user_is_typing">%s друкує…</string>
-    <string name="room_two_users_are_typing">%1$s &#038; %2$s друкують…</string>
-    <string name="room_many_users_are_typing">%1$s &#038; %2$s &#038; та інші друкують…</string>
+    <string name="room_two_users_are_typing">%1$s &amp; %2$s друкують…</string>
+    <string name="room_many_users_are_typing">%1$s &amp; %2$s &amp; та інші друкують…</string>
     <string name="room_message_placeholder_encrypted">Надіслати шифроване повідомлення…</string>
     <string name="room_message_placeholder_not_encrypted">Надіслати повідомлення (нешифроване)…</string>
     <string name="room_offline_notification">Зв\'язок із сервером втрачено.</string>
@@ -456,7 +447,6 @@
     <string name="directory_searching_title">Пошук у каталозі...</string>
 
     <!-- home room settings -->
-    <string name="room_settings_notifications">Сповіщення</string>
     <string name="room_settings_favourite">Обране</string>
     <string name="room_settings_de_prioritize">Не терміново</string>
     <string name="room_settings_direct_chat">Прямий Чат</string>
@@ -565,9 +555,9 @@
 
     <string name="account_email_validation_title">Очікування Перевірки</string>
     <string name="account_email_validation_message">Перевірте ваш email та перейдіть за посиланням у листі. Після цього клацніть продовжити.</string>
-    <string name="account_email_validation_error">Не вдалося перевірити поштову адресу. Будь ласка, перевірте ваш email та перейдіть за посиланням у листі. Після цього клацніть продовжити.</string>
+    <string name="account_email_validation_error">Не вдалося перевірити поштову адресу. Будь ласка, перевірте ваш email та перейдіть за посиланням у листі. Після цього натисніть продовжити</string>
     <string name="account_email_already_used_error">Email адреса вже використовується</string>
-    <string name="account_email_not_found_error">Не вдалося надіслати email: адресу не знайдено.</string>
+    <string name="account_email_not_found_error">Не вдалося надіслати email: цю адресу не знайдено</string>
     <string name="account_phone_number_already_used_error">Цей номер вже використовується</string>
 
     <string name="settings_change_password">Змінити пароль</string>
@@ -608,7 +598,6 @@
     <string name="room_settings_topic">Тема</string>
     <string name="room_settings_room_tag">Мітка кімнати</string>
     <string name="room_settings_tag_pref_dialog_title">Позначено як:</string>
-    <string name="room_settings_mute_notifs">Вимкнути сповіщення</string>
 
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Улюблені</string>
@@ -772,10 +761,8 @@
     <string name="active_widgets">Активних віджетів: %1$d</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">Для цього вам треба мати змогу запрошувати користувачів.</string>
     <string name="widget_integration_unable_to_create">Не вдалося створити віджет.</string>
     <string name="widget_integration_failed_to_send_request">Не вдалося надіслати запит.</string>
-    <string name="widget_integration_room_not_recognised">Кімнату не розпізнано.</string>
     <string name="widget_integration_positive_power_level">Рівень доступу має бути більше 0.</string>
     <string name="widget_integration_must_be_in_room">Ви не перебуваєте в цій кімнаті.</string>
     <string name="widget_integration_no_permission_in_room">Ви не маєте дозволу на виконання даної дії у цій кімнаті.</string>
@@ -785,7 +772,26 @@
     <string name="settings_labs_matrix_apps">Застосунки Matrix</string>
 
     <string name="room_add_matrix_apps">Додати застосунки Matrix</string>
-    <string name="add_matrix_apps_not_supported">Не підтримується цим пристроєм</string>
+    <string name="notification_noisy_notifications">Гучне повідомлення</string>
+    <string name="notification_silent_notifications">Тихе повідомлення</string>
+
+    <string name="title_activity_bug_report">Відгук про помилку</string>
+
+    <string name="option_take_photo">Зробити фото</string>
+    <string name="option_take_video">Записати відео</string>
+
+    <string name="call">Виклик</string>
+
+    <string name="settings_theme">Тема</string>
+
+    // conference call
+    <string name="conference_call_warning_title">Увага!</string>
+    <string name="notification_off">Викл</string>
+    <string name="notification_on">Вкл</string>
+    <string name="notification_noisy">Гучно</string>
+
+    <string name="encrypted_message">Закодоване повідомлення</string>
+
     <string name="settings_labs_native_camera">Використовувати рідну камеру</string>
 
     // share keys
@@ -795,13 +801,8 @@
     <string name="share_without_verifying">Поділитись без перевірки</string>
     <string name="ignore_request">Ігнорувати запит</string>
 
-    // conference call
-    <string name="conference_call_warning_title">Попередження!</string>
-    <string name="conference_call_warning_message">Конференц дзвінки у розробці та можуть бути ненадійними.</string>
-
     // slash commands
     <string name="command_error">Помилка виконання команди</string>
     <string name="unrecognized_command">Команду %s не розпізнано</string>
 
-
 </resources>
diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml
index 8114302d89..20123ee241 100644
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@@ -3,7 +3,7 @@
     <!-- use to retrieve the supported languages list -->
     <!-- should the same value as the file name -->
     <string name="resouces_language">zh</string>
-    <string name="resouces_country">CN</string>
+    <string name="resouces_country">UKS</string>
 
     <string name="resend">重新发送</string>
     <string name="quote">引用</string>
@@ -155,7 +155,6 @@
     <string name="room_recents_start_chat">开始聊天</string>
     <string name="room_recents_create_room">创建聊天室</string>
 
-    <string name="room_settings_notifications">通知</string>
     <string name="room_settings_direct_chat">私聊</string>
     <string name="room_sliding_menu_messages">消息</string>
     <string name="room_sliding_menu_settings">设置</string>
@@ -450,11 +449,6 @@
     <string name="call_error_ice_failed">媒体连接失败</string>
     <string name="call_error_camera_init_failed">无法初始化相机</string>
     <string name="call_error_answered_elsewhere">另一端已接听通话</string>
-    <string name="call_error_peer_hangup_elsewhere">另一端挂起通话</string>
-    <string name="call_error_peer_cancelled_call">呼叫被取消</string>
-
-    <string name="action_accept">接受</string>
-    <string name="action_ignore">忽略</string>
 
     <string name="permissions_rationale_popup_title">信息</string>
     <string name="permissions_rationale_msg_camera_explanation">
@@ -524,7 +518,6 @@
     <string name="room_settings_room_photo">聊天室图片</string>
     <string name="room_settings_room_tag">聊天室标签</string>
     <string name="room_settings_tag_pref_dialog_title">标签为：</string>
-    <string name="room_settings_mute_notifs">静默通知</string>
 
     <string name="room_settings_tag_pref_entry_favourite">收藏夹</string>
     <string name="room_settings_tag_pref_entry_low_priority">低优先级</string>
@@ -576,8 +569,6 @@
     <string name="read_receipts_list">阅读收据清单</string>
     <string name="membership_changes">%d 个成员身份改变了</string>
     <string name="compression_options">发送为</string>
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
     <string name="permissions_rationale_msg_contacts">Riot 需要访问您的通讯录联系人的权限，才能根据其电子邮件和电话号码查找其他 Matrix 用户。
 
 请在下一个弹出窗口中授权允许访问，以发现从 Riot 可访问的通讯录用户。</string>
@@ -742,10 +733,8 @@
     <string name="active_widgets">%1$d 个活跃的小部件</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">你需要能够邀请用户来做那件事。</string>
     <string name="widget_integration_unable_to_create">无法创建小部件。</string>
     <string name="widget_integration_failed_to_send_request">发送请求失败。</string>
-    <string name="widget_integration_room_not_recognised">这个房间未被识别。</string>
     <string name="widget_integration_positive_power_level">特权级别必须是正整数。</string>
     <string name="widget_integration_must_be_in_room">你不在这个聊天室。</string>
     <string name="widget_integration_no_permission_in_room">你没有权限在这个聊天室里面做那件事。</string>
@@ -754,8 +743,7 @@
     <string name="widget_integration_room_not_visible">聊天室 %s 不可见。</string>
     <string name="settings_labs_matrix_apps">Matrix 应用</string>
     <string name="room_add_matrix_apps">添加 Matrix 应用</string>
-    <string name="add_matrix_apps_not_supported">在这个设备上不支持</string>
-<string name="notification_sync_in_progress">同步中</string>
+    <string name="notification_sync_in_progress">同步中</string>
     <string name="notification_listen_for_events">聆听事件</string>
 
     <string name="call">通话</string>
@@ -767,4 +755,34 @@
     <string name="share_without_verifying">不验证而分享</string>
     <string name="ignore_request">忽略请求</string>
 
-</resources>
+<string name="title_activity_bug_report">错误报告</string>
+
+    <string name="option_take_photo">拍照</string>
+    <string name="option_take_video">拍视频</string>
+
+    <string name="settings_labs_native_camera">使用本地相机</string>
+
+    // share keys
+    <string name="conference_call_warning_title">警告！</string>
+    <string name="conference_call_warning_message">会议通话正在开发中，可能不可靠。</string>
+
+    // slash commands
+    <string name="command_error">命令错误</string>
+    <string name="unrecognized_command">不可识别的命令：%s</string>
+
+    // notification statuses
+    <string name="notification_off">关闭</string>
+    <string name="notification_on">打开</string>
+    <string name="encrypted_message">加密的消息</string>
+
+<string name="notification_noisy_notifications">吵闹的通知</string>
+    <string name="notification_silent_notifications">静默通知</string>
+
+    <string name="settings_analytics">统计</string>
+    <string name="settings_opt_out_of_analytics">不再统计</string>
+    <string name="settings_opt_out_of_analytics_summary">Riot 会收集匿名统计数据来帮助我们改进程序。</string>
+
+
+    <string name="notification_noisy">吵闹的</string>
+
+    </resources>
diff --git a/vector/src/main/res/values/array.xml b/vector/src/main/res/values/array.xml
index e021a49b14..ee00df602a 100644
--- a/vector/src/main/res/values/array.xml
+++ b/vector/src/main/res/values/array.xml
@@ -34,6 +34,7 @@
         <item>@string/room_settings_read_history_entry_members_only_invited</item>
         <item>@string/room_settings_read_history_entry_members_only_joined</item>
     </string-array>
+
     <string-array name="room_read_history_rules_values">
         <item>@string/room_settings_read_history_entry_value_anyone</item>
         <item>@string/room_settings_read_history_entry_value_members_only_option_time_shared</item>
@@ -41,4 +42,11 @@
         <item>@string/room_settings_read_history_entry_value_members_only_joined</item>
     </string-array>
 
+    <string-array name="notification_values">
+        <item>@string/room_settings_all_messages_noisy</item>
+        <item>@string/room_settings_all_messages</item>
+        <item>@string/room_settings_mention_only</item>
+        <item>@string/room_settings_mute</item>
+    </string-array>
+
 </resources>
\ No newline at end of file
diff --git a/vector/src/main/res/values/attrs.xml b/vector/src/main/res/values/attrs.xml
index 5f240af908..21ad6e4534 100644
--- a/vector/src/main/res/values/attrs.xml
+++ b/vector/src/main/res/values/attrs.xml
@@ -41,6 +41,7 @@
         <attr name="search_mode_room_name_text_color" format="color" />
         <attr name="unread_marker_line_color" format="color" />
         <attr name="markdown_block_background_color" format="color" />
+        <attr name="fenced_code_block_background_color" format="color" />
         <attr name="room_activity_divider_color" format="color" />
 
         <!-- tab bar colors -->
diff --git a/vector/src/main/res/values/colors.xml b/vector/src/main/res/values/colors.xml
index ba3a365920..57bf4a3b69 100644
--- a/vector/src/main/res/values/colors.xml
+++ b/vector/src/main/res/values/colors.xml
@@ -16,6 +16,8 @@
     <color name="tab_people_secondary">#D97051</color>
     <color name="tab_rooms">@color/vector_green_color</color>
     <color name="tab_rooms_secondary">#5EA584</color>
+    <color name="tab_groups">#a6d0e5</color>
+    <color name="tab_groups_secondary">#81bddb</color>
 
     <!-- color of the direct chat avatar ring -->
     <color name="direct_chat_ring_color">#8076cfa6</color>
@@ -46,10 +48,8 @@
     <color name="default_text_hint_color_light">#903C3C3C</color>
     <color name="default_text_light_color_light">#8E000000</color>
     <color name="default_button_light_text_light">#FF747474</color>
-    <color name="default_text_dark_color_light">#FF212121</color>
     <color name="riot_primary_text_color_dark">#dddddd</color>
     <color name="default_text_hint_color_dark">#CCDDDDDD</color>
     <color name="default_text_light_color_dark">#A4A4A4</color>
     <color name="default_button_light_text_dark">#FF747474</color>
-    <color name="default_text_dark_color_dark">#DEDEDE</color>
 </resources>
diff --git a/vector/src/main/res/values/donottranslate.xml b/vector/src/main/res/values/donottranslate.xml
index 0dbb1b6e5a..d4b36fcbf7 100755
--- a/vector/src/main/res/values/donottranslate.xml
+++ b/vector/src/main/res/values/donottranslate.xml
@@ -8,6 +8,10 @@
     <string name="default_hs_server_url" translatable="false">https://matrix.org</string>
     <string name="default_identity_server_url" translatable="false">https://vector.im</string>
 
+    <!-- empty means to use the active HS url -->
+    <!-- set a valid URL like "https://matrix.org" to use a custom one -->
+    <string name="push_server_url" translatable="false"></string>
+
     <!--string name="settings_room_privacy_label">Privacy</string-->
 
     <!-- Room settings, access and visibility : WHO CAN READ HISTORY? (read rule) -->
diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml
index 544252d9d3..5f36ad1e2d 100755
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@@ -24,6 +24,10 @@
     <string name="title_activity_member_details">Member Details</string>
     <string name="title_activity_historical">Historical</string>
     <string name="title_activity_bug_report">Bug report</string>
+    <string name="title_activity_group_details">Community details</string>
+
+    <!-- splash screen accessibility -->
+    <string name="loading">Loading...</string>
 
     <!-- splash screen accessibility -->
     <string name="loading">Loading...</string>
@@ -64,6 +68,7 @@
     <string name="offline">Offline</string>
 
     <!-- actions -->
+    <string name="action_exit">Exit</string>
     <string name="action_sign_out">Sign out</string>
     <string name="action_sign_out_confirmation">For security, logging out will delete any end-to-end encryption keys making previous encrypted chat history unreadable if you log back in.\nSelect export to backup them before signing out.</string>
     <string name="action_voice_call">Voice Call</string>
@@ -86,12 +91,14 @@
     <string name="bottom_action_favourites">Favourites</string>
     <string name="bottom_action_people">People</string>
     <string name="bottom_action_rooms">Rooms</string>
+    <string name="bottom_action_groups">Communities</string>
 
     <!-- Home screen -->
     <string name="home_filter_placeholder_home">Search for rooms</string>
     <string name="home_filter_placeholder_favorites">Search for favourites</string>
     <string name="home_filter_placeholder_people">Search for people</string>
     <string name="home_filter_placeholder_rooms">Search for rooms</string>
+    <string name="home_filter_placeholder_groups">Search for communities</string>
 
     <!-- Home fragment -->
     <string name="invitations_header">Invites</string>
@@ -116,6 +123,11 @@
         <item quantity="other">%d users</item>
     </plurals>
 
+    <!-- Groups fragment -->
+    <string name="groups_invite_header">Invite</string>
+    <string name="groups_header">Communities</string>
+    <string name="no_group_placeholder">No groups</string>
+
     <string name="send_bug_report_include_logs">Send logs</string>
     <string name="send_bug_report_include_crash_logs">Send crash logs</string>
     <string name="send_bug_report_include_screenshot">Send screenshot</string>
@@ -148,6 +160,10 @@
     <string name="start_voice_call">Start Voice Call</string>
     <string name="start_video_call">Start Video Call</string>
 
+    <string name="start_new_chat_prompt_msg">Are you sure that you want to start a new chat with %s?</string>
+    <string name="start_voice_call_prompt_msg">Are you sure that you want to start a voice call?</string>
+    <string name="start_video_call_prompt_msg">Are you sure that you want to start a video call?</string>
+
     <string name="option_send_files">Send files</string>
     <string name="option_take_photo_video">Take photo or video</string>
     <string name="option_take_photo">Take photo</string>
@@ -226,6 +242,9 @@
     <!-- read receipts list Screen -->
     <string name="read_receipts_list">Read Receipts List</string>
 
+    <!-- flairs list Screen -->
+    <string name="groups_list">Groups List</string>
+
     <!-- Mels -->
     <string name="membership_changes">%d membership changes</string>
 
@@ -252,10 +271,6 @@
     <string name="room_info_room_name">Room name</string>
     <string name="room_info_room_topic">Room topic</string>
 
-    <!-- Settings keys -->
-    <string name="settings_key_display_all_events">settings_key_display_all_events</string>
-    <string name="settings_key_use_rage_shake">settings_key_use_rage_shake</string>
-
     <!-- call string -->
     <string name="call">Call</string>
     <string name="call_connected">Call connected</string>
@@ -271,11 +286,6 @@
     <string name="call_error_ice_failed">Media Connection Failed</string>
     <string name="call_error_camera_init_failed">Cannot initialize the camera</string>
     <string name="call_error_answered_elsewhere">call answered elsewhere</string>
-    <string name="call_error_peer_hangup_elsewhere">call hung up elsewhere</string>
-    <string name="call_error_peer_cancelled_call">call cancelled</string>
-
-    <string name="action_accept">ACCEPT</string>
-    <string name="action_ignore">IGNORE</string>
 
     <!-- medias picker string -->
     <string name="media_picker_both_capture_title">Take a picture or a video"</string>
@@ -290,7 +300,7 @@
     <string name="permissions_rationale_msg_record_audio_explanation">\n\nPlease allow access on the next pop-up to be able to make the call.</string>
     <string name="permissions_rationale_msg_camera_and_audio">Riot needs permission to access your camera and your microphone to perform video calls.\n\nPlease allow access on the next pop-ups to be able to make the call.</string>
     <string name="permissions_rationale_msg_contacts">Riot needs permission to access your address book contacts to find other Matrix users based on their email and phone numbers.\n\nPlease allow access on the next pop-up to discover address book users reachable from Riot.</string>
-    <string name="permissions_msg_contacts_warning_other_androids">Riot needs permission to access your address book contacts to find other Matrix users based on their email and phone numbers.\n\nAllow Riot to access your contacts ?</string>
+    <string name="permissions_msg_contacts_warning_other_androids">Riot needs permission to access your address book contact to find other Matrix users based on their email and phone numbers.\n\nAllow Riot to access your contacts ?</string>
 
     <string name="permissions_action_not_performed_missing_permissions">Sorry.. Action not performed, due to missing permissions</string>
 
@@ -365,6 +375,8 @@
     <string name="room_participants_power_level_prompt">You will not be able to undo this change as you are promoting the user to have the same power level as yourself.\nAre you sure?</string>
 
     <string name="room_participants_invite_prompt_msg">"Are you sure you want to invite %s to this chat?"</string>
+    <string name="room_participants_kick_prompt_msg">Are you sure that you want to kick this user from this chat?</string>
+    <string name="room_participants_ban_prompt_msg">Are you sure that you want to ban this user from this chat?</string>
 
     <!-- invitation -->
     <string name="people_search_invite_by_id"><u>Invite by ID</u></string>
@@ -463,12 +475,16 @@
     <string name="directory_searching_title">Searching directory..</string>
 
     <!-- home room settings -->
-    <string name="room_settings_notifications">Notifications</string>
+    <string name="room_settings_all_messages_noisy">All messages (noisy)</string>
+    <string name="room_settings_all_messages">All messages</string>
+    <string name="room_settings_mention_only">Mentions only</string>
+    <string name="room_settings_mute">Mute</string>
     <string name="room_settings_favourite">Favourite</string>
     <string name="room_settings_de_prioritize">De-prioritize</string>
     <string name="room_settings_direct_chat">Direct Chat</string>
     <string name="room_settings_leave_conversation">Leave Conversation</string>
     <string name="room_settings_forget">Forget</string>
+    <string name="room_settings_add_homescreen_shortcut">Add Homescreen Shortcut</string>
 
     <!-- home sliding menu -->
     <string name="room_sliding_menu_messages">Messages</string>
@@ -535,20 +551,21 @@
     <string name="settings_pin_missed_notifications">Pin rooms with missed notifications</string>
     <string name="settings_pin_unread_messages">Pin rooms with unread messages</string>
     <string name="settings_devices_list">Devices</string>
+    <string name="settings_inline_url_preview">Enable inline URL previews by default</string>
     <string name="settings_hide_read_receipts">Hide read receipts</string>
     <string name="settings_dont_send_typings_notifs">Don\'t send typing notifications</string>
     <string name="settings_always_show_timestamps">Always show message timestamps</string>
     <string name="settings_12_24_timestamps">Show timestamps in 12 hour format (e.g. 2:30pm)</string>
     <string name="settings_hide_join_leave_messages">Hide join/leave messages (invites/kicks/bans unaffected)</string>
     <string name="settings_hide_avatar_display_name_changes_messages">Hide avatar and display name changes</string>
+    <string name="settings_disable_markdown">Disable markdown formatting when sending</string>
+    <string name="settings_vibrate_on_mention">Vibrate when mentioning</string>
 
     <!-- analytics -->
     <string name="settings_analytics">Analytics</string>
     <string name="settings_opt_out_of_analytics">Opt out of analytics</string>
     <string name="settings_opt_out_of_analytics_summary">Riot collects anonymous analytics to allow us to improve the application.</string>
 
-
-    <string name="settings_disable_markdown">Disable markdown formatting</string>
     <string name="settings_data_save_mode">Data save mode</string>
 
     <string name="devices_details_dialog_title">Device details</string>
@@ -602,6 +619,9 @@
     <string name="settings_phone_number_verification_error">Error while validating your phone number</string>
     <string name="settings_phone_number_code">Code</string>
 
+
+    <string name="settings_flair">Flair</string>
+
     <!-- medias saving settings -->
     <string name="media_saving_period_3_days">3 days</string>
     <string name="media_saving_period_1_week">1 week</string>
@@ -616,7 +636,6 @@
     <string name="room_settings_topic">Topic</string>
     <string name="room_settings_room_tag">Room Tag</string>
     <string name="room_settings_tag_pref_dialog_title">Tagged as:</string>
-    <string name="room_settings_mute_notifs">Mute Notifications</string>
 
     <!-- Room settings: Room tag -->
     <string name="room_settings_tag_pref_entry_favourite">Favourite</string>
@@ -630,6 +649,7 @@
     <!-- room settings : access and visibility -->
     <string name="room_settings_category_access_visibility_title">Access and visibility</string>
     <string name="room_settings_directory_visibility">List this room in room directory</string>
+    <string name="room_settings_room_notifications_title">Notifications</string>
     <string name="room_settings_room_access_rules_pref_title">Room Access</string>
     <string name="room_settings_room_read_history_rules_pref_title">Room History Readability</string>
     <string name="room_settings_room_read_history_rules_pref_dialog_title">Who can read history?</string>
@@ -666,6 +686,12 @@
     <string name="room_settings_addresses_no_local_addresses">This room has no local addresses</string>
     <string name="room_settings_addresses_add_new_address">New address (e.g #foo:matrix.org")</string>
 
+    <string name="room_settings_no_flair"> This room is not showing flair for any communities</string>
+    <string name="room_settings_add_new_group">New community ID (e.g +foo:matrix.org")</string>
+    <string name="room_settings_invalid_group_format_dialog_title">Invalid community ID</string>
+    <string name="room_settings_invalid_group_format_dialog_body">\'%s\' is not a valid community ID</string>
+
+
     <string name="room_settings_addresses_invalid_format_dialog_title">Invalid alias format</string>
     <string name="room_settings_addresses_invalid_format_dialog_body">\'%s\' is not a valid format for an alias</string>
     <string name="room_settings_addresses_disable_main_address_prompt_msg">You will have no main address specified. The default main address for this room will be picked randomly"</string>
@@ -781,10 +807,8 @@
     <string name="active_widgets">%1$d active widgets</string>
 
     // Widget Integration Manager
-    <string name="widget_integration_need_to_be_able_to_invite">You need to be able to invite users to do that.</string>
     <string name="widget_integration_unable_to_create">Unable to create widget.</string>
     <string name="widget_integration_failed_to_send_request">Failed to send request.</string>
-    <string name="widget_integration_room_not_recognised">This room is not recognised.</string>
     <string name="widget_integration_positive_power_level">Power level must be positive integer.</string>
     <string name="widget_integration_must_be_in_room">You are not in this room.</string>
     <string name="widget_integration_no_permission_in_room">You do not have permission to do that in this room.</string>
@@ -793,7 +817,6 @@
     <string name="widget_integration_room_not_visible">Room %s is not visible.</string>
     <string name="settings_labs_matrix_apps">Matrix Apps</string>
     <string name="room_add_matrix_apps">Add Matrix apps</string>
-    <string name="add_matrix_apps_not_supported">Not supported on this device</string>
     <string name="settings_labs_native_camera">Use native camera</string>
 
     // share keys
@@ -818,4 +841,39 @@
 
     <string name="encrypted_message">Encrypted message</string>
 
+    // groups creation
+    <string name="create">Create</string>
+    <string name="create_community">Create Community</string>
+    <string name="community_name">Community name</string>
+    <string name="community_name_hint">Example</string>
+    <string name="community_id">Community Id</string>
+    <string name="community_id_hint">example</string>
+
+    // group details
+    <string name="group_details_home">Home</string>
+    <string name="group_details_people">People</string>
+    <string name="group_details_rooms">Rooms</string>
+    <string name="no_users_placeholder">No users</string>
+
+    <string name="rooms">Rooms</string>
+    <string name="joined">Joined</string>
+    <string name="invited">Invited</string>
+    <string name="filter_group_members">Filter group members</string>
+    <string name="filter_group_rooms">Filter group rooms</string>
+
+    <string name="group_one_member">1 member</string>
+    <string name="group_members">%d members</string>
+
+    <string name="group_one_room">1 room</string>
+    <string name="group_rooms">%d rooms</string>
+    <string name="group_no_long_description">The community admin has not provided a long description for this community.</string>
+
+    <string name="one_new_message">1 new message</string>
+    <string name="new_messages">%d new messages</string>
+
+    <string name="has_been_kicked">You have been kicked from %1$s by %2$s</string>
+    <string name="has_been_banned">You have been banned from %1$s by %2$s</string>
+    <string name="reason_colon">Reason: %1$s</string>
+    <string name="rejoin">Rejoin</string>
+    <string name="forget_room">Forget room</string>
 </resources>
diff --git a/vector/src/main/res/values/styles.xml b/vector/src/main/res/values/styles.xml
index 87da9ca9fc..57eeb0166b 100644
--- a/vector/src/main/res/values/styles.xml
+++ b/vector/src/main/res/values/styles.xml
@@ -162,6 +162,10 @@
         <item name="colorControlNormal">?attr/list_header_public_room_spinner_color</item>
     </style>
 
+    <style name="PopMenuStyle" parent="Widget.AppCompat.PopupMenu">
+        <item name="android:textSize">14sp</item>
+    </style>
+
     <!--  ************************  Light theme  **************************** -->
 
     <!-- no action bar window -->
@@ -325,6 +329,27 @@
         <item name="android:listDivider">@null</item>
     </style>
 
+    <style name="Group.Styled.ActionBar" parent="@style/Vector.Styled.ActionBar">
+        <item name="android:background">@color/tab_groups</item>
+        <item name="background">@color/tab_groups</item>
+    </style>
+
+    <style name="Vector.TabView.group" parent="@style/Widget.AppCompat.ActionBar.TabView">
+        <item name="android:background">@drawable/vector_tabbar_background_group_light</item>
+        <item name="background">@drawable/vector_tabbar_background_group_light</item>
+    </style>
+
+    <style name="GroupAppTheme" parent="AppTheme">
+        <item name="colorPrimaryDark">@color/tab_groups_secondary</item>
+
+        <item name="android:actionBarTabStyle">@style/Vector.TabView.group</item>
+        <item name="actionBarTabStyle">@style/Vector.TabView.group</item>
+
+        <!-- custom action bar -->
+        <item name="android:actionBarStyle">@style/Group.Styled.ActionBar</item>
+        <item name="actionBarStyle">@style/Group.Styled.ActionBar</item>
+    </style>
+
     <!--  ************************  Dark theme  **************************** -->
 
     <style name="AppTheme.NoActionBar.Dark" parent="@style/Theme.Vector.Dark">
@@ -535,7 +560,6 @@
         <item name="windowNoTitle">true</item>
     </style>
 
-
     <style name="AppTheme.Black" parent="@style/Theme.Vector.Black">
 
         <!-- disable the overscroll because setOverscrollHeader/Footer don't always work -->
diff --git a/vector/src/main/res/values/themes.xml b/vector/src/main/res/values/themes.xml
index 2ae55f2824..7a5aa1294b 100644
--- a/vector/src/main/res/values/themes.xml
+++ b/vector/src/main/res/values/themes.xml
@@ -41,6 +41,7 @@
         <item name="search_mode_room_name_text_color">#333C3C3C</item>
         <item name="unread_marker_line_color">@color/vector_green_color</item>
         <item name="markdown_block_background_color">#FFEEEEEE</item>
+        <item name="fenced_code_block_background_color">#FF00FF00</item>
         <item name="room_activity_divider_color">#FFF2F2F2</item>
 
         <!-- tab bar colors -->
@@ -145,6 +146,7 @@
         <item name="search_mode_room_name_text_color">#CCC3C3C3</item>
         <item name="unread_marker_line_color">@color/vector_green_color</item>
         <item name="markdown_block_background_color">@android:color/black</item>
+        <item name="fenced_code_block_background_color">#FF00FF00</item>
         <item name="room_activity_divider_color">#565656</item>
 
         <!-- tab bar colors -->
@@ -215,6 +217,7 @@
         <item name="avatar_mask">@drawable/avatar_mask_black</item>
         <item name="avatar_mask_white_stroke">@drawable/avatar_mask_white_stroke_black</item>
         <item name="markdown_block_background_color">#FF4D4D4D</item>
+        <item name="fenced_code_block_background_color">#FF00FF00</item>
     </style>
 
     <style name="Theme.Vector.EmptyLight" parent="">
diff --git a/vector/src/main/res/xml/vector_room_settings_preferences.xml b/vector/src/main/res/xml/vector_room_settings_preferences.xml
index 058339795b..04222af9e1 100644
--- a/vector/src/main/res/xml/vector_room_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_room_settings_preferences.xml
@@ -6,33 +6,35 @@
     <!-- this section has no title in purpose -->
     <im.vector.preference.RoomAvatarPreference
         android:key="roomPhotoAvatar"
-        android:title="@string/room_settings_room_photo"/>
+        android:title="@string/room_settings_room_photo" />
 
     <EditTextPreference
-        android:key="roomNameEditText"
         android:focusable="true"
+        android:key="roomNameEditText"
         android:title="@string/room_settings_room_name" />
 
     <EditTextPreference
-        android:key="roomTopicEditText"
         android:focusable="true"
-        android:title="@string/room_settings_topic"/>
+        android:key="roomTopicEditText"
+        android:title="@string/room_settings_topic" />
 
     <ListPreference
-        android:key="roomTagList"
-        android:title="@string/room_settings_room_tag"
         android:dialogTitle="@string/room_settings_tag_pref_dialog_title"
         android:entries="@array/tag_entries"
-        android:entryValues="@array/tag_values" />
+        android:entryValues="@array/tag_values"
+        android:key="roomTagList"
+        android:title="@string/room_settings_room_tag" />
 
-    <!-- mute/un mute room notifications-->
-    <im.vector.preference.VectorSwitchPreference
-        android:key="muteNotificationsSwitch"
-        android:title="@string/room_settings_mute_notifs" />
+    <!-- the notification rule selection -->
+    <ListPreference
+        android:entries="@array/notification_values"
+        android:entryValues="@array/notification_values"
+        android:key="roomNotificationPreference"
+        android:title="@string/room_settings_room_notifications_title" />
 
     <im.vector.preference.VectorCustomActionEditTextPreference
-        android:title="@string/leave"
-        android:key="roomLeave"/>
+        android:key="roomLeave"
+        android:title="@string/leave" />
 
     <im.vector.preference.VectorDividerCategory />
 
@@ -52,19 +54,19 @@
 
         <!-- room access rules (Who can access?) -->
         <im.vector.preference.VectorListPreference
-            android:key="roomAccessRulesList"
-            android:title="@string/room_settings_room_access_rules_pref_title"
             android:dialogTitle="@string/room_settings_room_access_rules_pref_dialog_title"
             android:entries="@array/room_access_rules_entries"
-            android:entryValues="@array/room_access_rules_values" />
+            android:entryValues="@array/room_access_rules_values"
+            android:key="roomAccessRulesList"
+            android:title="@string/room_settings_room_access_rules_pref_title" />
 
         <!-- room read history (Who can read history?) -->
         <ListPreference
-            android:key="roomReadHistoryRulesList"
-            android:title="@string/room_settings_room_read_history_rules_pref_title"
             android:dialogTitle="@string/room_settings_room_read_history_rules_pref_dialog_title"
             android:entries="@array/room_read_history_rules_entries"
-            android:entryValues="@array/room_read_history_rules_values" />
+            android:entryValues="@array/room_read_history_rules_values"
+            android:key="roomReadHistoryRulesList"
+            android:title="@string/room_settings_room_read_history_rules_pref_title" />
     </im.vector.preference.VectorPreferenceCategory>
 
     <im.vector.preference.VectorDividerCategory />
@@ -75,14 +77,21 @@
 
     </im.vector.preference.VectorPreferenceCategory>
 
+    <im.vector.preference.VectorDividerCategory
+        android:key="flair_divider"
+        android:title="flair_divider" />
+
+    <im.vector.preference.VectorPreferenceCategory
+        android:key="flair"
+        android:title="@string/settings_flair"></im.vector.preference.VectorPreferenceCategory>
+
     <im.vector.preference.VectorDividerCategory
         android:key="banned_divider"
-        android:title="banned_divider"/>
+        android:title="banned_divider" />
 
     <im.vector.preference.VectorPreferenceCategory
         android:key="banned"
-        android:title="@string/room_settings_banned_users_title" >
-    </im.vector.preference.VectorPreferenceCategory>
+        android:title="@string/room_settings_banned_users_title"></im.vector.preference.VectorPreferenceCategory>
 
     <im.vector.preference.VectorDividerCategory />
 
@@ -91,13 +100,13 @@
         android:title="@string/room_settings_category_advanced_title">
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/room_settings_room_internal_id"
-            android:key="roomInternalId"/>
+            android:key="roomInternalId"
+            android:title="@string/room_settings_room_internal_id" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/room_settings_never_send_to_unverified_devices_title"
+            android:key="@string/room_settings_never_send_to_unverified_devices_title"
             android:summary="@string/room_settings_never_send_to_unverified_devices_summary"
-            android:key="@string/room_settings_never_send_to_unverified_devices_title"/>
+            android:title="@string/room_settings_never_send_to_unverified_devices_title" />
 
     </im.vector.preference.VectorPreferenceCategory>
 
diff --git a/vector/src/main/res/xml/vector_settings_preferences.xml b/vector/src/main/res/xml/vector_settings_preferences.xml
index a013d40b19..e0255fdb6d 100755
--- a/vector/src/main/res/xml/vector_settings_preferences.xml
+++ b/vector/src/main/res/xml/vector_settings_preferences.xml
@@ -1,99 +1,108 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen  xmlns:android="http://schemas.android.com/apk/res/android"
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent" >
+    android:layout_height="match_parent">
 
     <PreferenceCategory
         android:key="SETTINGS_USER_SETTINGS_PREFERENCE_KEY"
-        android:title="@string/settings_user_settings" >
+        android:title="@string/settings_user_settings">
 
         <im.vector.preference.UserAvatarPreference
-            android:title="@string/settings_profile_picture"
-            android:key="SETTINGS_PROFILE_PICTURE_PREFERENCE_KEY">
+            android:key="SETTINGS_PROFILE_PICTURE_PREFERENCE_KEY"
+            android:title="@string/settings_profile_picture">
 
         </im.vector.preference.UserAvatarPreference>
 
         <EditTextPreference
             android:focusable="true"
-            android:title="@string/settings_display_name"
+            android:key="SETTINGS_DISPLAY_NAME_PREFERENCE_KEY"
             android:summary="@string/settings_display_name"
-            android:key="SETTINGS_DISPLAY_NAME_PREFERENCE_KEY"/>
+            android:title="@string/settings_display_name" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_change_password"
+            android:key="SETTINGS_CHANGE_PASSWORD_PREFERENCE_KEY"
             android:summary="********"
-            android:key="SETTINGS_CHANGE_PASSWORD_PREFERENCE_KEY"/>
+            android:title="@string/settings_change_password" />
 
     </PreferenceCategory>
 
     <im.vector.preference.VectorDividerCategory
         android:key="SETTINGS_CONTACT_DIVIDER_KEYS"
-        android:title="settings_contact_divider"/>
+        android:title="settings_contact_divider" />
 
     <PreferenceCategory
         android:key="SETTINGS_CONTACT_PREFERENCE_KEYS"
-        android:title="@string/settings_contact" >
+        android:title="@string/settings_contact">
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_contacts_app_permission"
-            android:key="CONTACT_BOOK_ACCESS_KEY"/>
+            android:key="CONTACT_BOOK_ACCESS_KEY"
+            android:title="@string/settings_contacts_app_permission" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
+            android:dialogTitle="@string/settings_select_country"
             android:key="SETTINGS_CONTACTS_PHONEBOOK_COUNTRY_PREFERENCE_KEY"
-            android:title="@string/settings_contacts_phonebook_country"
-            android:dialogTitle="@string/settings_select_country"/>
+            android:title="@string/settings_contacts_phonebook_country" />
     </PreferenceCategory>
 
     <im.vector.preference.VectorDividerCategory />
 
     <PreferenceCategory
         android:key="SETTINGS_USER_INTERFACE_KEY"
-        android:title="@string/settings_user_interface" >
+        android:title="@string/settings_user_interface">
 
         <im.vector.preference.VectorCustomActionEditTextPreference
+            android:dialogTitle="@string/settings_select_language"
             android:key="SETTINGS_INTERFACE_LANGUAGE_PREFERENCE_KEY"
-            android:title="@string/settings_interface_language"
-            android:dialogTitle="@string/settings_select_language"/>
+            android:title="@string/settings_interface_language" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
+            android:dialogTitle="@string/font_size"
             android:key="SETTINGS_INTERFACE_TEXT_SIZE_KEY"
-            android:title="@string/font_size"
-            android:dialogTitle="@string/font_size"/>
+            android:title="@string/font_size" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_hide_read_receipts"
-            android:key="SETTINGS_HIDE_READ_RECEIPTS_KEY"/>
+            android:defaultValue="true"
+            android:key="SETTINGS_SHOW_URL_PREVIEW_KEY"
+            android:title="@string/settings_inline_url_preview" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_dont_send_typings_notifs"
-            android:key="SETTINGS_DONT_SEND_TYPING_NOTIF_KEY"/>
+            android:key="SETTINGS_HIDE_READ_RECEIPTS_KEY"
+            android:title="@string/settings_hide_read_receipts" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_always_show_timestamps"
-            android:key="SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY"/>
+            android:key="SETTINGS_DONT_SEND_TYPING_NOTIF_KEY"
+            android:title="@string/settings_dont_send_typings_notifs" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_12_24_timestamps"
-            android:key="SETTINGS_12_24_TIMESTAMPS_KEY"/>
+            android:key="SETTINGS_ALWAYS_SHOW_TIMESTAMPS_KEY"
+            android:title="@string/settings_always_show_timestamps" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_hide_join_leave_messages"
-            android:key="SETTINGS_HIDE_JOIN_LEAVE_MESSAGES_KEY"/>
+            android:key="SETTINGS_12_24_TIMESTAMPS_KEY"
+            android:title="@string/settings_12_24_timestamps" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_hide_avatar_display_name_changes_messages"
-            android:key="SETTINGS_HIDE_AVATAR_DISPLAY_NAME_CHANGES_MESSAGES_KEY"/>
+            android:key="SETTINGS_HIDE_JOIN_LEAVE_MESSAGES_KEY"
+            android:title="@string/settings_hide_join_leave_messages" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_disable_markdown"
-            android:key="SETTINGS_DISABLE_MARKDOWN_KEY"/>
+            android:key="SETTINGS_HIDE_AVATAR_DISPLAY_NAME_CHANGES_MESSAGES_KEY"
+            android:title="@string/settings_hide_avatar_display_name_changes_messages" />
+
+        <im.vector.preference.VectorSwitchPreference
+            android:key="SETTINGS_DISABLE_MARKDOWN_KEY"
+            android:title="@string/settings_disable_markdown" />
+
+        <im.vector.preference.VectorSwitchPreference
+            android:title="@string/settings_vibrate_on_mention"
+            android:key="SETTINGS_VIBRATE_ON_MENTION_KEY"/>
 
         <ListPreference
             android:entries="@array/theme_description"
             android:entryValues="@array/theme_codes"
             android:key="APPLICATION_THEME_KEY"
             android:summary="%s"
-            android:title="@string/settings_theme"/>
+            android:title="@string/settings_theme" />
 
     </PreferenceCategory>
 
@@ -101,95 +110,102 @@
 
     <PreferenceCategory
         android:key="SETTINGS_HOME_DISPLAY_KEY"
-        android:title="@string/settings_home_display" >
+        android:title="@string/settings_home_display">
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_pin_missed_notifications"
-            android:key="SETTINGS_PIN_MISSED_NOTIFICATIONS_PREFERENCE_KEY"/>
+            android:key="SETTINGS_PIN_MISSED_NOTIFICATIONS_PREFERENCE_KEY"
+            android:title="@string/settings_pin_missed_notifications" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_pin_unread_messages"
-            android:key="SETTINGS_PIN_UNREAD_MESSAGES_PREFERENCE_KEY"/>
+            android:key="SETTINGS_PIN_UNREAD_MESSAGES_PREFERENCE_KEY"
+            android:title="@string/settings_pin_unread_messages" />
+
+    </PreferenceCategory>
+
+    <im.vector.preference.VectorDividerCategory />
+
+    <PreferenceCategory
+        android:key="SETTINGS_GROUPS_FLAIR_KEY"
+        android:title="@string/settings_flair">
+
 
     </PreferenceCategory>
 
-    <im.vector.preference.VectorDividerCategory/>
+    <im.vector.preference.VectorDividerCategory />
 
     <PreferenceCategory android:title="@string/settings_notifications">
 
         <im.vector.preference.VectorCustomActionEditTextPreference
+            android:dialogTitle="@string/settings_notification_ringtone"
             android:key="SETTINGS_NOTIFICATION_RINGTONE_SELECTION_PREFERENCE_KEY"
-            android:title="@string/settings_notification_ringtone"
-            android:dialogTitle="@string/settings_notification_ringtone"/>
+            android:title="@string/settings_notification_ringtone" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_enable_all_notif"
-            android:key="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"/>
+            android:key="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
+            android:title="@string/settings_enable_all_notif" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_enable_this_device"
+            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:key="SETTINGS_ENABLE_THIS_DEVICE_PREFERENCE_KEY"
-            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"/>
+            android:title="@string/settings_enable_this_device" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_turn_screen_on"
+            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:key="SETTINGS_TURN_SCREEN_ON_PREFERENCE_KEY"
-            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"/>
+            android:title="@string/settings_turn_screen_on" />
 
         <im.vector.preference.BingRulePreference
-            android:title="@string/settings_containing_my_display_name"
+            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:key="SETTINGS_CONTAINING_MY_DISPLAY_NAME_PREFERENCE_KEY_2"
-            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"/>
+            android:title="@string/settings_containing_my_display_name" />
 
         <im.vector.preference.BingRulePreference
-            android:title="@string/settings_containing_my_user_name"
+            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:key="SETTINGS_CONTAINING_MY_USER_NAME_PREFERENCE_KEY_2"
-            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"/>
+            android:title="@string/settings_containing_my_user_name" />
 
         <im.vector.preference.BingRulePreference
-            android:title="@string/settings_messages_in_one_to_one"
+            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:key="SETTINGS_MESSAGES_IN_ONE_TO_ONE_PREFERENCE_KEY_2"
-            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"/>
+            android:title="@string/settings_messages_in_one_to_one" />
 
         <im.vector.preference.BingRulePreference
-            android:title="@string/settings_messages_in_group_chat"
+            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:key="SETTINGS_MESSAGES_IN_GROUP_CHAT_PREFERENCE_KEY_2"
-            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"/>
+            android:title="@string/settings_messages_in_group_chat" />
 
         <im.vector.preference.BingRulePreference
-            android:title="@string/settings_invited_to_room"
+            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:key="SETTINGS_INVITED_TO_ROOM_PREFERENCE_KEY_2"
-            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"/>
+            android:title="@string/settings_invited_to_room" />
 
         <im.vector.preference.BingRulePreference
-            android:title="@string/settings_call_invitations"
+            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:key="SETTINGS_CALL_INVITATIONS_PREFERENCE_KEY_2"
-            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"/>
+            android:title="@string/settings_call_invitations" />
 
         <im.vector.preference.BingRulePreference
-            android:title="@string/settings_messages_sent_by_bot"
+            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"
             android:key="SETTINGS_MESSAGES_SENT_BY_BOT_PREFERENCE_KEY_2"
-            android:dependency="SETTINGS_ENABLE_ALL_NOTIF_PREFERENCE_KEY"/>
+            android:title="@string/settings_messages_sent_by_bot" />
 
     </PreferenceCategory>
 
     <im.vector.preference.VectorDividerCategory
         android:key="SETTINGS_NOTIFICATIONS_TARGET_DIVIDER_PREFERENCE_KEY"
-        android:title="notifications_targets_divider"/>
+        android:title="notifications_targets_divider" />
 
     <PreferenceCategory
-        android:title="@string/settings_notifications_targets"
-        android:key="SETTINGS_NOTIFICATIONS_TARGETS_PREFERENCE_KEY">
-    </PreferenceCategory>
+        android:key="SETTINGS_NOTIFICATIONS_TARGETS_PREFERENCE_KEY"
+        android:title="@string/settings_notifications_targets"></PreferenceCategory>
 
     <im.vector.preference.VectorDividerCategory
         android:key="SETTINGS_IGNORE_USERS_DIVIDER_PREFERENCE_KEY"
-        android:title="ignore_users_divider"/>
+        android:title="ignore_users_divider" />
 
     <PreferenceCategory
-        android:title="@string/settings_ignored_users"
-        android:key="SETTINGS_IGNORED_USERS_PREFERENCE_KEY">
-    </PreferenceCategory>
+        android:key="SETTINGS_IGNORED_USERS_PREFERENCE_KEY"
+        android:title="@string/settings_ignored_users"></PreferenceCategory>
 
     <im.vector.preference.VectorDividerCategory />
 
@@ -198,42 +214,43 @@
         android:title="@string/room_settings_labs_pref_title">
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:key="labs_warning"
             android:focusable="false"
+            android:key="labs_warning"
             android:title="@string/room_settings_labs_warning_message" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/room_settings_labs_end_to_end"
-            android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_PREFERENCE_KEY"/>
+            android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_PREFERENCE_KEY"
+            android:title="@string/room_settings_labs_end_to_end" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_IS_ACTIVE_PREFERENCE_KEY"
             android:focusable="false"
+            android:key="SETTINGS_ROOM_SETTINGS_LABS_END_TO_END_IS_ACTIVE_PREFERENCE_KEY"
             android:title="@string/room_settings_labs_end_to_end_is_active" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_data_save_mode"
-            android:key="SETTINGS_DATA_SAVE_MODE_PREFERENCE_KEY"/>
+            android:key="SETTINGS_DATA_SAVE_MODE_PREFERENCE_KEY"
+            android:title="@string/settings_data_save_mode" />
 
         <im.vector.preference.VectorSwitchPreference
             android:key="SETTINGS_USE_JITSI_CONF_PREFERENCE_KEY"
             android:title="@string/settings_labs_create_conference_with_jitsi" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_labs_matrix_apps"
-            android:key="SETTINGS_USE_MATRIX_APPS_PREFERENCE_KEY"/>
+            android:key="SETTINGS_USE_MATRIX_APPS_PREFERENCE_KEY"
+            android:title="@string/settings_labs_matrix_apps" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_labs_native_camera"
-            android:key="SETTINGS_USE_NATIVE_CAMERA_PREFERENCE_KEY"/>
+            android:key="SETTINGS_USE_NATIVE_CAMERA_PREFERENCE_KEY"
+            android:title="@string/settings_labs_native_camera" />
 
     </im.vector.preference.VectorPreferenceCategory>
 
     <im.vector.preference.VectorDividerCategory />
 
     <!-- ************ Cryptography section ************ -->
-    <PreferenceCategory android:title="@string/settings_cryptography"
-        android:key="SETTINGS_CRYPTOGRAPHY_PREFERENCE_KEY">
+    <PreferenceCategory
+        android:key="SETTINGS_CRYPTOGRAPHY_PREFERENCE_KEY"
+        android:title="@string/settings_cryptography">
 
         <im.vector.preference.VectorCustomActionEditTextPreference
             android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_NAME_PREFERENCE_KEY"
@@ -241,26 +258,26 @@
 
         <im.vector.preference.VectorCustomActionEditTextPreference
             android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_ID_PREFERENCE_KEY"
-            android:title="@string/encryption_information_device_id"/>
+            android:title="@string/encryption_information_device_id" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
             android:key="SETTINGS_ENCRYPTION_INFORMATION_DEVICE_KEY_PREFERENCE_KEY"
-            android:title="@string/encryption_information_device_key"/>
+            android:title="@string/encryption_information_device_key" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
             android:key="SETTINGS_ENCRYPTION_EXPORT_E2E_ROOM_KEYS_PREFERENCE_KEY"
-            android:title="@string/encryption_export_e2e_room_keys"
-            android:summary="@string/encryption_export_room_keys_summary" />
+            android:summary="@string/encryption_export_room_keys_summary"
+            android:title="@string/encryption_export_e2e_room_keys" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
             android:key="SETTINGS_ENCRYPTION_IMPORT_E2E_ROOM_KEYS_PREFERENCE_KEY"
-            android:title="@string/encryption_import_e2e_room_keys"
-            android:summary="@string/encryption_import_room_keys_summary" />
+            android:summary="@string/encryption_import_room_keys_summary"
+            android:title="@string/encryption_import_e2e_room_keys" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/encryption_never_send_to_unverified_devices_title"
+            android:key="SETTINGS_ENCRYPTION_NEVER_SENT_TO_PREFERENCE_KEY"
             android:summary="@string/encryption_never_send_to_unverified_devices_summary"
-            android:key="SETTINGS_ENCRYPTION_NEVER_SENT_TO_PREFERENCE_KEY"/>
+            android:title="@string/encryption_never_send_to_unverified_devices_title" />
 
     </PreferenceCategory>
 
@@ -269,119 +286,117 @@
 
     <!-- devices list: device ids + device names -->
     <PreferenceCategory
-        android:title="@string/settings_devices_list"
-        android:key="SETTINGS_DEVICES_LIST_PREFERENCE_KEY">
-    </PreferenceCategory>
+        android:key="SETTINGS_DEVICES_LIST_PREFERENCE_KEY"
+        android:title="@string/settings_devices_list"></PreferenceCategory>
 
-    <im.vector.preference.VectorDividerCategory
-        android:key="SETTINGS_DEVICES_DIVIDER_PREFERENCE_KEY"/>
+    <im.vector.preference.VectorDividerCategory android:key="SETTINGS_DEVICES_DIVIDER_PREFERENCE_KEY" />
 
-    <PreferenceCategory android:title="@string/settings_advanced" >
+    <PreferenceCategory android:title="@string/settings_advanced">
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_logged_in"
+            android:key="SETTINGS_LOGGED_IN_PREFERENCE_KEY"
             android:summary="1.2.3"
-            android:key="SETTINGS_LOGGED_IN_PREFERENCE_KEY"/>
+            android:title="@string/settings_logged_in" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_home_server"
+            android:key="SETTINGS_HOME_SERVER_PREFERENCE_KEY"
             android:summary="1.2.3"
-            android:key="SETTINGS_HOME_SERVER_PREFERENCE_KEY"/>
+            android:title="@string/settings_home_server" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_identity_server"
+            android:key="SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY"
             android:summary="1.2.3"
-            android:key="SETTINGS_IDENTITY_SERVER_PREFERENCE_KEY"/>
+            android:title="@string/settings_identity_server" />
     </PreferenceCategory>
 
     <im.vector.preference.VectorDividerCategory />
 
     <PreferenceCategory
         android:key="SETTINGS_BACKGROUND_SYNC_PREFERENCE_KEY"
-        android:title="@string/settings_background_sync" >
+        android:title="@string/settings_background_sync">
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_start_on_boot"
-            android:key="SETTINGS_START_ON_BOOT_PREFERENCE_KEY"/>
+            android:key="SETTINGS_START_ON_BOOT_PREFERENCE_KEY"
+            android:title="@string/settings_start_on_boot" />
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_enable_background_sync"
-            android:key="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"/>
+            android:key="SETTINGS_ENABLE_BACKGROUND_SYNC_PREFERENCE_KEY"
+            android:title="@string/settings_enable_background_sync" />
 
         <EditTextPreference
             android:focusable="true"
+            android:key="SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY"
             android:numeric="integer"
-            android:title="@string/settings_set_sync_timeout"
-            android:key="SETTINGS_SET_SYNC_TIMEOUT_PREFERENCE_KEY"/>
+            android:title="@string/settings_set_sync_timeout" />
 
         <EditTextPreference
             android:focusable="true"
+            android:key="SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY"
             android:numeric="integer"
-            android:title="@string/settings_set_sync_delay"
-            android:key="SETTINGS_SET_SYNC_DELAY_PREFERENCE_KEY"/>
+            android:title="@string/settings_set_sync_delay" />
 
     </PreferenceCategory>
 
-    <im.vector.preference.VectorDividerCategory/>
+    <im.vector.preference.VectorDividerCategory />
 
     <PreferenceCategory
-        android:title="@string/settings_analytics"
-        android:key="SETTINGS_ANALYTICS_PREFERENCE_KEY" >
+        android:key="SETTINGS_ANALYTICS_PREFERENCE_KEY"
+        android:title="@string/settings_analytics">
 
         <im.vector.preference.VectorSwitchPreference
-            android:title="@string/settings_opt_out_of_analytics"
+            android:key="SETTINGS_DISABLE_PIWIK_SETTINGS_PREFERENCE_KEY"
             android:summary="@string/settings_opt_out_of_analytics_summary"
-            android:key="SETTINGS_DISABLE_PIWIK_SETTINGS_PREFERENCE_KEY"/>
+            android:title="@string/settings_opt_out_of_analytics" />
     </PreferenceCategory>
 
-    <im.vector.preference.VectorDividerCategory/>
+    <im.vector.preference.VectorDividerCategory />
 
     <PreferenceCategory
-        android:title="@string/settings_other"
-        android:key="SETTINGS_OTHERS_PREFERENCE_KEY" >
+        android:key="SETTINGS_OTHERS_PREFERENCE_KEY"
+        android:title="@string/settings_other">
 
         <Preference
             android:key="application_info_link"
-            android:title="@string/settings_title_app_info_link"
-            android:summary="@string/settings_summary_app_info_link" />
+            android:summary="@string/settings_summary_app_info_link"
+            android:title="@string/settings_title_app_info_link" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_version"
+            android:key="SETTINGS_VERSION_PREFERENCE_KEY"
             android:summary="1.2.3"
-            android:key="SETTINGS_VERSION_PREFERENCE_KEY"/>
+            android:title="@string/settings_version" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_olm_version"
+            android:key="SETTINGS_OLM_VERSION_PREFERENCE_KEY"
             android:summary="1.2.3"
-            android:key="SETTINGS_OLM_VERSION_PREFERENCE_KEY"/>
+            android:title="@string/settings_olm_version" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_copyright"
-            android:key="SETTINGS_COPYRIGHT_PREFERENCE_KEY"/>
+            android:key="SETTINGS_COPYRIGHT_PREFERENCE_KEY"
+            android:title="@string/settings_copyright" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_app_term_conditions"
-            android:key="SETTINGS_APP_TERM_CONDITIONS_PREFERENCE_KEY"/>
+            android:key="SETTINGS_APP_TERM_CONDITIONS_PREFERENCE_KEY"
+            android:title="@string/settings_app_term_conditions" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_privacy_policy"
-            android:key="SETTINGS_PRIVACY_POLICY_PREFERENCE_KEY"/>
+            android:key="SETTINGS_PRIVACY_POLICY_PREFERENCE_KEY"
+            android:title="@string/settings_privacy_policy" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_third_party_notices"
-            android:key="SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY"/>
+            android:key="SETTINGS_THIRD_PARTY_NOTICES_PREFERENCE_KEY"
+            android:title="@string/settings_third_party_notices" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_keep_media"
-            android:key="SETTINGS_MEDIA_SAVING_PERIOD_KEY"/>
+            android:key="SETTINGS_MEDIA_SAVING_PERIOD_KEY"
+            android:title="@string/settings_keep_media" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_clear_medias_cache"
-            android:key="SETTINGS_CLEAR_MEDIA_CACHE_PREFERENCE_KEY"/>
+            android:key="SETTINGS_CLEAR_MEDIA_CACHE_PREFERENCE_KEY"
+            android:title="@string/settings_clear_medias_cache" />
 
         <im.vector.preference.VectorCustomActionEditTextPreference
-            android:title="@string/settings_clear_cache"
-            android:key="SETTINGS_CLEAR_CACHE_PREFERENCE_KEY"/>
+            android:key="SETTINGS_CLEAR_CACHE_PREFERENCE_KEY"
+            android:title="@string/settings_clear_cache" />
 
     </PreferenceCategory>