diff --git a/app/build.gradle b/app/build.gradle
index 825e6a125a..a33001308a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -18,8 +18,8 @@ android {
         applicationId "chat.rocket.android"
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
-        versionCode 2067
-        versionName "3.3.3"
+        versionCode 2068
+        versionName "3.4.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         multiDexEnabled true
 
@@ -204,4 +204,4 @@ task compileSdk(type: Exec) {
 preBuild.dependsOn compileSdk
 if (isPlay) {
     apply plugin: 'com.google.gms.google-services'
-}
+}
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/10.json b/app/schemas/chat.rocket.android.db.RCDatabase/10.json
deleted file mode 100644
index a17af93dbf..0000000000
--- a/app/schemas/chat.rocket.android.db.RCDatabase/10.json
+++ /dev/null
@@ -1,1081 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 10,
-    "identityHash": "db46c12dbb8747200288f48d5dc5558b",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "broadcast",
-            "columnName": "broadcast",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          },
-          {
-            "name": "index_chatrooms_lastMessageUserId",
-            "unique": false,
-            "columnNames": [
-              "lastMessageUserId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_lastMessageUserId` ON `${TABLE_NAME}` (`lastMessageUserId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `roomId` TEXT NOT NULL, `message` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `senderId` TEXT, `updatedAt` INTEGER, `editedAt` INTEGER, `editedBy` TEXT, `senderAlias` TEXT, `avatar` TEXT, `type` TEXT, `groupable` INTEGER NOT NULL, `parseUrls` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `role` TEXT, `synced` INTEGER NOT NULL, `unread` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`senderId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`editedBy`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "message",
-            "columnName": "message",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "senderId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedAt",
-            "columnName": "editedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedBy",
-            "columnName": "editedBy",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "senderAlias",
-            "columnName": "senderAlias",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "avatar",
-            "columnName": "avatar",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupable",
-            "columnName": "groupable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parseUrls",
-            "columnName": "parseUrls",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pinned",
-            "columnName": "pinned",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "synced",
-            "columnName": "synced",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "senderId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "editedBy"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_favorites",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_mentions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_channels",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `roomId` TEXT NOT NULL, `roomName` TEXT, PRIMARY KEY(`messageId`, `roomId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomName",
-            "columnName": "roomName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "roomId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachments",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` TEXT NOT NULL, `message_id` TEXT NOT NULL, `title` TEXT, `type` TEXT, `description` TEXT, `text` TEXT, `author_name` TEXT, `author_icon` TEXT, `author_link` TEXT, `thumb_url` TEXT, `color` TEXT, `fallback` TEXT, `title_link` TEXT, `title_link_download` INTEGER NOT NULL, `image_url` TEXT, `image_type` TEXT, `image_size` INTEGER, `video_url` TEXT, `video_type` TEXT, `video_size` INTEGER, `audio_url` TEXT, `audio_type` TEXT, `audio_size` INTEGER, `message_link` TEXT, `timestamp` INTEGER, `has_actions` INTEGER NOT NULL, `has_fields` INTEGER NOT NULL, `button_alignment` TEXT, PRIMARY KEY(`_id`), FOREIGN KEY(`message_id`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "_id",
-            "columnName": "_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorName",
-            "columnName": "author_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorIcon",
-            "columnName": "author_icon",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorLink",
-            "columnName": "author_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbUrl",
-            "columnName": "thumb_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "fallback",
-            "columnName": "fallback",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLink",
-            "columnName": "title_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLinkDownload",
-            "columnName": "title_link_download",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "image_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageType",
-            "columnName": "image_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageSize",
-            "columnName": "image_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoUrl",
-            "columnName": "video_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoType",
-            "columnName": "video_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoSize",
-            "columnName": "video_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioUrl",
-            "columnName": "audio_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioType",
-            "columnName": "audio_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioSize",
-            "columnName": "audio_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageLink",
-            "columnName": "message_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "hasActions",
-            "columnName": "has_actions",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasFields",
-            "columnName": "has_fields",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "buttonAlignment",
-            "columnName": "button_alignment",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "_id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "message_id"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachment_fields",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `title` TEXT NOT NULL, `value` TEXT NOT NULL, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "attachmentId",
-            "columnName": "attachmentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_attachment_fields_attachmentId",
-            "unique": false,
-            "columnNames": [
-              "attachmentId"
-            ],
-            "createSql": "CREATE  INDEX `index_attachment_fields_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "attachments",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "attachmentId"
-            ],
-            "referencedColumns": [
-              "_id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachment_action",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `type` TEXT NOT NULL, `text` TEXT, `url` TEXT, `isWebView` INTEGER, `webViewHeightRatio` TEXT, `imageUrl` TEXT, `message` TEXT, `isMessageInChatWindow` INTEGER, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "attachmentId",
-            "columnName": "attachmentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isWebView",
-            "columnName": "isWebView",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "webViewHeightRatio",
-            "columnName": "webViewHeightRatio",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "imageUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "message",
-            "columnName": "message",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isMessageInChatWindow",
-            "columnName": "isMessageInChatWindow",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_attachment_action_attachmentId",
-            "unique": false,
-            "columnNames": [
-              "attachmentId"
-            ],
-            "createSql": "CREATE  INDEX `index_attachment_action_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "attachments",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "attachmentId"
-            ],
-            "referencedColumns": [
-              "_id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "urls",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`urlId` INTEGER PRIMARY KEY AUTOINCREMENT, `messageId` TEXT NOT NULL, `url` TEXT NOT NULL, `hostname` TEXT, `title` TEXT, `description` TEXT, `imageUrl` TEXT, FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "urlId",
-            "columnName": "urlId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hostname",
-            "columnName": "hostname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "imageUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "urlId"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_urls_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_urls_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "reactions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "reaction",
-            "columnName": "reaction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "count",
-            "columnName": "count",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "usernames",
-            "columnName": "usernames",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "reaction"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_reactions_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_reactions_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "messages_sync",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`roomId` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`roomId`))",
-        "fields": [
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "roomId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"db46c12dbb8747200288f48d5dc5558b\")"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/12.json b/app/schemas/chat.rocket.android.db.RCDatabase/12.json
deleted file mode 100644
index 8b1da2129d..0000000000
--- a/app/schemas/chat.rocket.android.db.RCDatabase/12.json
+++ /dev/null
@@ -1,1111 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 12,
-    "identityHash": "1984b5661945bd83607d9a7043ed87b0",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `topic` TEXT, `announcement` TEXT, `description` TEXT, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, `muted` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "topic",
-            "columnName": "topic",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "announcement",
-            "columnName": "announcement",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "broadcast",
-            "columnName": "broadcast",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "muted",
-            "columnName": "muted",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          },
-          {
-            "name": "index_chatrooms_lastMessageUserId",
-            "unique": false,
-            "columnNames": [
-              "lastMessageUserId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_lastMessageUserId` ON `${TABLE_NAME}` (`lastMessageUserId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `roomId` TEXT NOT NULL, `message` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `senderId` TEXT, `updatedAt` INTEGER, `editedAt` INTEGER, `editedBy` TEXT, `senderAlias` TEXT, `avatar` TEXT, `type` TEXT, `groupable` INTEGER NOT NULL, `parseUrls` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `role` TEXT, `synced` INTEGER NOT NULL, `unread` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`senderId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`editedBy`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "message",
-            "columnName": "message",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "senderId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedAt",
-            "columnName": "editedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedBy",
-            "columnName": "editedBy",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "senderAlias",
-            "columnName": "senderAlias",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "avatar",
-            "columnName": "avatar",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupable",
-            "columnName": "groupable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parseUrls",
-            "columnName": "parseUrls",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pinned",
-            "columnName": "pinned",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "synced",
-            "columnName": "synced",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "senderId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "editedBy"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_favorites",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_mentions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_channels",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `roomId` TEXT NOT NULL, `roomName` TEXT, PRIMARY KEY(`messageId`, `roomId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomName",
-            "columnName": "roomName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "roomId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachments",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` TEXT NOT NULL, `message_id` TEXT NOT NULL, `title` TEXT, `type` TEXT, `description` TEXT, `text` TEXT, `author_name` TEXT, `author_icon` TEXT, `author_link` TEXT, `thumb_url` TEXT, `color` TEXT, `fallback` TEXT, `title_link` TEXT, `title_link_download` INTEGER NOT NULL, `image_url` TEXT, `image_type` TEXT, `image_size` INTEGER, `video_url` TEXT, `video_type` TEXT, `video_size` INTEGER, `audio_url` TEXT, `audio_type` TEXT, `audio_size` INTEGER, `message_link` TEXT, `timestamp` INTEGER, `has_actions` INTEGER NOT NULL, `has_fields` INTEGER NOT NULL, `button_alignment` TEXT, PRIMARY KEY(`_id`), FOREIGN KEY(`message_id`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "_id",
-            "columnName": "_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorName",
-            "columnName": "author_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorIcon",
-            "columnName": "author_icon",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorLink",
-            "columnName": "author_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbUrl",
-            "columnName": "thumb_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "fallback",
-            "columnName": "fallback",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLink",
-            "columnName": "title_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLinkDownload",
-            "columnName": "title_link_download",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "image_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageType",
-            "columnName": "image_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageSize",
-            "columnName": "image_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoUrl",
-            "columnName": "video_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoType",
-            "columnName": "video_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoSize",
-            "columnName": "video_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioUrl",
-            "columnName": "audio_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioType",
-            "columnName": "audio_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioSize",
-            "columnName": "audio_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageLink",
-            "columnName": "message_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "hasActions",
-            "columnName": "has_actions",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasFields",
-            "columnName": "has_fields",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "buttonAlignment",
-            "columnName": "button_alignment",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "_id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "message_id"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachment_fields",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `title` TEXT NOT NULL, `value` TEXT NOT NULL, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "attachmentId",
-            "columnName": "attachmentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_attachment_fields_attachmentId",
-            "unique": false,
-            "columnNames": [
-              "attachmentId"
-            ],
-            "createSql": "CREATE  INDEX `index_attachment_fields_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "attachments",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "attachmentId"
-            ],
-            "referencedColumns": [
-              "_id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachment_action",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `type` TEXT NOT NULL, `text` TEXT, `url` TEXT, `isWebView` INTEGER, `webViewHeightRatio` TEXT, `imageUrl` TEXT, `message` TEXT, `isMessageInChatWindow` INTEGER, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "attachmentId",
-            "columnName": "attachmentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isWebView",
-            "columnName": "isWebView",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "webViewHeightRatio",
-            "columnName": "webViewHeightRatio",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "imageUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "message",
-            "columnName": "message",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isMessageInChatWindow",
-            "columnName": "isMessageInChatWindow",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_attachment_action_attachmentId",
-            "unique": false,
-            "columnNames": [
-              "attachmentId"
-            ],
-            "createSql": "CREATE  INDEX `index_attachment_action_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "attachments",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "attachmentId"
-            ],
-            "referencedColumns": [
-              "_id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "urls",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`urlId` INTEGER PRIMARY KEY AUTOINCREMENT, `messageId` TEXT NOT NULL, `url` TEXT NOT NULL, `hostname` TEXT, `title` TEXT, `description` TEXT, `imageUrl` TEXT, FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "urlId",
-            "columnName": "urlId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hostname",
-            "columnName": "hostname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "imageUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "urlId"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_urls_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_urls_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "reactions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, `names` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "reaction",
-            "columnName": "reaction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "count",
-            "columnName": "count",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "usernames",
-            "columnName": "usernames",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "names",
-            "columnName": "names",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "reaction"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_reactions_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_reactions_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "messages_sync",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`roomId` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`roomId`))",
-        "fields": [
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "roomId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"1984b5661945bd83607d9a7043ed87b0\")"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/11.json b/app/schemas/chat.rocket.android.db.RCDatabase/13.json
similarity index 96%
rename from app/schemas/chat.rocket.android.db.RCDatabase/11.json
rename to app/schemas/chat.rocket.android.db.RCDatabase/13.json
index 0d58ffcfba..5127d02b4c 100644
--- a/app/schemas/chat.rocket.android.db.RCDatabase/11.json
+++ b/app/schemas/chat.rocket.android.db.RCDatabase/13.json
@@ -1,8 +1,8 @@
 {
   "formatVersion": 1,
   "database": {
-    "version": 11,
-    "identityHash": "1984b5661945bd83607d9a7043ed87b0",
+    "version": 13,
+    "identityHash": "3bef73b44ae4edf2a74b48fd68f2c599",
     "entities": [
       {
         "tableName": "users",
@@ -59,7 +59,7 @@
       },
       {
         "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `topic` TEXT, `announcement` TEXT, `description` TEXT, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, `muted` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
+        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `parentId` TEXT, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `topic` TEXT, `announcement` TEXT, `description` TEXT, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, `muted` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
         "fields": [
           {
             "fieldPath": "id",
@@ -73,6 +73,12 @@
             "affinity": "TEXT",
             "notNull": true
           },
+          {
+            "fieldPath": "parentId",
+            "columnName": "parentId",
+            "affinity": "TEXT",
+            "notNull": false
+          },
           {
             "fieldPath": "type",
             "columnName": "type",
@@ -1105,7 +1111,7 @@
     ],
     "setupQueries": [
       "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"1984b5661945bd83607d9a7043ed87b0\")"
+      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"3bef73b44ae4edf2a74b48fd68f2c599\")"
     ]
   }
 }
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/3.json b/app/schemas/chat.rocket.android.db.RCDatabase/3.json
deleted file mode 100644
index 5b38241e5b..0000000000
--- a/app/schemas/chat.rocket.android.db.RCDatabase/3.json
+++ /dev/null
@@ -1,273 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 3,
-    "identityHash": "06359a8c2943365dd094bc5dff210203",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"06359a8c2943365dd094bc5dff210203\")"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/4.json b/app/schemas/chat.rocket.android.db.RCDatabase/4.json
deleted file mode 100644
index e7485fd072..0000000000
--- a/app/schemas/chat.rocket.android.db.RCDatabase/4.json
+++ /dev/null
@@ -1,279 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 4,
-    "identityHash": "e389d26bfb975f00c75dc6fc5d06d012",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "broadcast",
-            "columnName": "broadcast",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"e389d26bfb975f00c75dc6fc5d06d012\")"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/5.json b/app/schemas/chat.rocket.android.db.RCDatabase/5.json
deleted file mode 100644
index d09c9f0ca7..0000000000
--- a/app/schemas/chat.rocket.android.db.RCDatabase/5.json
+++ /dev/null
@@ -1,287 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 5,
-    "identityHash": "47a0c30e2696ae09bc86df16cc37279d",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "broadcast",
-            "columnName": "broadcast",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          },
-          {
-            "name": "index_chatrooms_lastMessageUserId",
-            "unique": false,
-            "columnNames": [
-              "lastMessageUserId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_lastMessageUserId` ON `${TABLE_NAME}` (`lastMessageUserId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"47a0c30e2696ae09bc86df16cc37279d\")"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/6.json b/app/schemas/chat.rocket.android.db.RCDatabase/6.json
deleted file mode 100644
index b3f9e85a20..0000000000
--- a/app/schemas/chat.rocket.android.db.RCDatabase/6.json
+++ /dev/null
@@ -1,946 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 6,
-    "identityHash": "03aec453cb4faec2d1357fdb673b151e",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "broadcast",
-            "columnName": "broadcast",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          },
-          {
-            "name": "index_chatrooms_lastMessageUserId",
-            "unique": false,
-            "columnNames": [
-              "lastMessageUserId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_lastMessageUserId` ON `${TABLE_NAME}` (`lastMessageUserId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `roomId` TEXT NOT NULL, `message` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `senderId` TEXT, `updatedAt` INTEGER, `editedAt` INTEGER, `editedBy` TEXT, `senderAlias` TEXT, `avatar` TEXT, `type` TEXT, `groupable` INTEGER NOT NULL, `parseUrls` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `role` TEXT, PRIMARY KEY(`id`), FOREIGN KEY(`senderId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`editedBy`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "message",
-            "columnName": "message",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "senderId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedAt",
-            "columnName": "editedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedBy",
-            "columnName": "editedBy",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "senderAlias",
-            "columnName": "senderAlias",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "avatar",
-            "columnName": "avatar",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupable",
-            "columnName": "groupable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parseUrls",
-            "columnName": "parseUrls",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pinned",
-            "columnName": "pinned",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "senderId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "editedBy"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_favorites",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_mentions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_channels",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `roomId` TEXT NOT NULL, `roomName` TEXT, PRIMARY KEY(`messageId`, `roomId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomName",
-            "columnName": "roomName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "roomId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachments",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `message_id` TEXT NOT NULL, `title` TEXT, `type` TEXT, `description` TEXT, `text` TEXT, `author_name` TEXT, `author_icon` TEXT, `author_link` TEXT, `thumb_url` TEXT, `color` TEXT, `title_link` TEXT, `title_link_download` INTEGER NOT NULL, `image_url` TEXT, `image_type` TEXT, `image_size` INTEGER, `video_url` TEXT, `video_type` TEXT, `video_size` INTEGER, `audio_url` TEXT, `audio_type` TEXT, `audio_size` INTEGER, `message_link` TEXT, `timestamp` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`message_id`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorName",
-            "columnName": "author_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorIcon",
-            "columnName": "author_icon",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorLink",
-            "columnName": "author_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbUrl",
-            "columnName": "thumb_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLink",
-            "columnName": "title_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLinkDownload",
-            "columnName": "title_link_download",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "image_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageType",
-            "columnName": "image_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageSize",
-            "columnName": "image_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoUrl",
-            "columnName": "video_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoType",
-            "columnName": "video_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoSize",
-            "columnName": "video_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioUrl",
-            "columnName": "audio_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioType",
-            "columnName": "audio_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioSize",
-            "columnName": "audio_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageLink",
-            "columnName": "message_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "message_id"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachment_fields",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `title` TEXT NOT NULL, `value` TEXT NOT NULL, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "attachmentId",
-            "columnName": "attachmentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "attachments",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "attachmentId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "urls",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `messageId` TEXT NOT NULL, `url` TEXT NOT NULL, `hostname` TEXT, `title` TEXT, `description` TEXT, `imageUrl` TEXT, FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hostname",
-            "columnName": "hostname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "imageUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_urls_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_urls_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "reactions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, PRIMARY KEY(`reaction`))",
-        "fields": [
-          {
-            "fieldPath": "reaction",
-            "columnName": "reaction",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "reaction"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "reactions_message_relations",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `reactionId` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, FOREIGN KEY(`reactionId`) REFERENCES `reactions`(`reaction`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "reactionId",
-            "columnName": "reactionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "count",
-            "columnName": "count",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_reactions_message_relations_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_reactions_message_relations_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "reactions",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "reactionId"
-            ],
-            "referencedColumns": [
-              "reaction"
-            ]
-          },
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"03aec453cb4faec2d1357fdb673b151e\")"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/7.json b/app/schemas/chat.rocket.android.db.RCDatabase/7.json
deleted file mode 100644
index c0f12cf494..0000000000
--- a/app/schemas/chat.rocket.android.db.RCDatabase/7.json
+++ /dev/null
@@ -1,959 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 7,
-    "identityHash": "4d5ac4ae382ddb3aa3850842253e89d2",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "broadcast",
-            "columnName": "broadcast",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          },
-          {
-            "name": "index_chatrooms_lastMessageUserId",
-            "unique": false,
-            "columnNames": [
-              "lastMessageUserId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_lastMessageUserId` ON `${TABLE_NAME}` (`lastMessageUserId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `roomId` TEXT NOT NULL, `message` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `senderId` TEXT, `updatedAt` INTEGER, `editedAt` INTEGER, `editedBy` TEXT, `senderAlias` TEXT, `avatar` TEXT, `type` TEXT, `groupable` INTEGER NOT NULL, `parseUrls` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `role` TEXT, `synced` INTEGER NOT NULL, `unread` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`senderId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`editedBy`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "message",
-            "columnName": "message",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "senderId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedAt",
-            "columnName": "editedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedBy",
-            "columnName": "editedBy",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "senderAlias",
-            "columnName": "senderAlias",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "avatar",
-            "columnName": "avatar",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupable",
-            "columnName": "groupable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parseUrls",
-            "columnName": "parseUrls",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pinned",
-            "columnName": "pinned",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "synced",
-            "columnName": "synced",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "senderId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "editedBy"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_favorites",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_mentions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_channels",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `roomId` TEXT NOT NULL, `roomName` TEXT, PRIMARY KEY(`messageId`, `roomId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomName",
-            "columnName": "roomName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "roomId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachments",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` TEXT NOT NULL, `message_id` TEXT NOT NULL, `title` TEXT, `type` TEXT, `description` TEXT, `text` TEXT, `author_name` TEXT, `author_icon` TEXT, `author_link` TEXT, `thumb_url` TEXT, `color` TEXT, `fallback` TEXT, `title_link` TEXT, `title_link_download` INTEGER NOT NULL, `image_url` TEXT, `image_type` TEXT, `image_size` INTEGER, `video_url` TEXT, `video_type` TEXT, `video_size` INTEGER, `audio_url` TEXT, `audio_type` TEXT, `audio_size` INTEGER, `message_link` TEXT, `timestamp` INTEGER, PRIMARY KEY(`_id`), FOREIGN KEY(`message_id`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "_id",
-            "columnName": "_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorName",
-            "columnName": "author_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorIcon",
-            "columnName": "author_icon",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorLink",
-            "columnName": "author_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbUrl",
-            "columnName": "thumb_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "fallback",
-            "columnName": "fallback",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLink",
-            "columnName": "title_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLinkDownload",
-            "columnName": "title_link_download",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "image_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageType",
-            "columnName": "image_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageSize",
-            "columnName": "image_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoUrl",
-            "columnName": "video_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoType",
-            "columnName": "video_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoSize",
-            "columnName": "video_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioUrl",
-            "columnName": "audio_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioType",
-            "columnName": "audio_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioSize",
-            "columnName": "audio_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageLink",
-            "columnName": "message_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "_id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "message_id"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachment_fields",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `title` TEXT NOT NULL, `value` TEXT NOT NULL, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "attachmentId",
-            "columnName": "attachmentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "attachments",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "attachmentId"
-            ],
-            "referencedColumns": [
-              "_id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "urls",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`urlId` INTEGER PRIMARY KEY AUTOINCREMENT, `messageId` TEXT NOT NULL, `url` TEXT NOT NULL, `hostname` TEXT, `title` TEXT, `description` TEXT, `imageUrl` TEXT, FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "urlId",
-            "columnName": "urlId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hostname",
-            "columnName": "hostname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "imageUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "urlId"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_urls_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_urls_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "reactions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "reaction",
-            "columnName": "reaction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "count",
-            "columnName": "count",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "usernames",
-            "columnName": "usernames",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "reaction"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_reactions_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_reactions_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "messages_sync",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`roomId` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`roomId`))",
-        "fields": [
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "roomId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"4d5ac4ae382ddb3aa3850842253e89d2\")"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/8.json b/app/schemas/chat.rocket.android.db.RCDatabase/8.json
deleted file mode 100644
index 9874e166dc..0000000000
--- a/app/schemas/chat.rocket.android.db.RCDatabase/8.json
+++ /dev/null
@@ -1,1075 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 8,
-    "identityHash": "48d41bd13698c29cc5e0810934187c0e",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "broadcast",
-            "columnName": "broadcast",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          },
-          {
-            "name": "index_chatrooms_lastMessageUserId",
-            "unique": false,
-            "columnNames": [
-              "lastMessageUserId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_lastMessageUserId` ON `${TABLE_NAME}` (`lastMessageUserId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `roomId` TEXT NOT NULL, `message` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `senderId` TEXT, `updatedAt` INTEGER, `editedAt` INTEGER, `editedBy` TEXT, `senderAlias` TEXT, `avatar` TEXT, `type` TEXT, `groupable` INTEGER NOT NULL, `parseUrls` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `role` TEXT, `synced` INTEGER NOT NULL, `unread` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`senderId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`editedBy`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "message",
-            "columnName": "message",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "senderId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedAt",
-            "columnName": "editedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedBy",
-            "columnName": "editedBy",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "senderAlias",
-            "columnName": "senderAlias",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "avatar",
-            "columnName": "avatar",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupable",
-            "columnName": "groupable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parseUrls",
-            "columnName": "parseUrls",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pinned",
-            "columnName": "pinned",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "synced",
-            "columnName": "synced",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "senderId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "editedBy"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_favorites",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_mentions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_channels",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `roomId` TEXT NOT NULL, `roomName` TEXT, PRIMARY KEY(`messageId`, `roomId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomName",
-            "columnName": "roomName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "roomId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachments",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` TEXT NOT NULL, `message_id` TEXT NOT NULL, `title` TEXT, `type` TEXT, `description` TEXT, `text` TEXT, `author_name` TEXT, `author_icon` TEXT, `author_link` TEXT, `thumb_url` TEXT, `color` TEXT, `fallback` TEXT, `title_link` TEXT, `title_link_download` INTEGER NOT NULL, `image_url` TEXT, `image_type` TEXT, `image_size` INTEGER, `video_url` TEXT, `video_type` TEXT, `video_size` INTEGER, `audio_url` TEXT, `audio_type` TEXT, `audio_size` INTEGER, `message_link` TEXT, `timestamp` INTEGER, `has_actions` INTEGER NOT NULL, `button_alignment` TEXT, PRIMARY KEY(`_id`), FOREIGN KEY(`message_id`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "_id",
-            "columnName": "_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorName",
-            "columnName": "author_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorIcon",
-            "columnName": "author_icon",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorLink",
-            "columnName": "author_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbUrl",
-            "columnName": "thumb_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "fallback",
-            "columnName": "fallback",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLink",
-            "columnName": "title_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLinkDownload",
-            "columnName": "title_link_download",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "image_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageType",
-            "columnName": "image_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageSize",
-            "columnName": "image_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoUrl",
-            "columnName": "video_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoType",
-            "columnName": "video_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoSize",
-            "columnName": "video_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioUrl",
-            "columnName": "audio_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioType",
-            "columnName": "audio_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioSize",
-            "columnName": "audio_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageLink",
-            "columnName": "message_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "hasActions",
-            "columnName": "has_actions",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "buttonAlignment",
-            "columnName": "button_alignment",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "_id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "message_id"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachment_fields",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `title` TEXT NOT NULL, `value` TEXT NOT NULL, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "attachmentId",
-            "columnName": "attachmentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_attachment_fields_attachmentId",
-            "unique": false,
-            "columnNames": [
-              "attachmentId"
-            ],
-            "createSql": "CREATE  INDEX `index_attachment_fields_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "attachments",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "attachmentId"
-            ],
-            "referencedColumns": [
-              "_id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachment_action",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `type` TEXT NOT NULL, `text` TEXT, `url` TEXT, `isWebView` INTEGER, `webViewHeightRatio` TEXT, `imageUrl` TEXT, `message` TEXT, `isMessageInChatWindow` INTEGER, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "attachmentId",
-            "columnName": "attachmentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isWebView",
-            "columnName": "isWebView",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "webViewHeightRatio",
-            "columnName": "webViewHeightRatio",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "imageUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "message",
-            "columnName": "message",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isMessageInChatWindow",
-            "columnName": "isMessageInChatWindow",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_attachment_action_attachmentId",
-            "unique": false,
-            "columnNames": [
-              "attachmentId"
-            ],
-            "createSql": "CREATE  INDEX `index_attachment_action_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "attachments",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "attachmentId"
-            ],
-            "referencedColumns": [
-              "_id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "urls",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`urlId` INTEGER PRIMARY KEY AUTOINCREMENT, `messageId` TEXT NOT NULL, `url` TEXT NOT NULL, `hostname` TEXT, `title` TEXT, `description` TEXT, `imageUrl` TEXT, FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "urlId",
-            "columnName": "urlId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hostname",
-            "columnName": "hostname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "imageUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "urlId"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_urls_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_urls_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "reactions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "reaction",
-            "columnName": "reaction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "count",
-            "columnName": "count",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "usernames",
-            "columnName": "usernames",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "reaction"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_reactions_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_reactions_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "messages_sync",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`roomId` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`roomId`))",
-        "fields": [
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "roomId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"48d41bd13698c29cc5e0810934187c0e\")"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/schemas/chat.rocket.android.db.RCDatabase/9.json b/app/schemas/chat.rocket.android.db.RCDatabase/9.json
deleted file mode 100644
index 9724e557be..0000000000
--- a/app/schemas/chat.rocket.android.db.RCDatabase/9.json
+++ /dev/null
@@ -1,1081 +0,0 @@
-{
-  "formatVersion": 1,
-  "database": {
-    "version": 9,
-    "identityHash": "db46c12dbb8747200288f48d5dc5558b",
-    "entities": [
-      {
-        "tableName": "users",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `username` TEXT, `name` TEXT, `status` TEXT NOT NULL, `utcOffset` REAL, PRIMARY KEY(`id`))",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "username",
-            "columnName": "username",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "status",
-            "columnName": "status",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "utcOffset",
-            "columnName": "utcOffset",
-            "affinity": "REAL",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_users_username",
-            "unique": false,
-            "columnNames": [
-              "username"
-            ],
-            "createSql": "CREATE  INDEX `index_users_username` ON `${TABLE_NAME}` (`username`)"
-          }
-        ],
-        "foreignKeys": []
-      },
-      {
-        "tableName": "chatrooms",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `subscriptionId` TEXT NOT NULL, `type` TEXT NOT NULL, `name` TEXT NOT NULL, `fullname` TEXT, `userId` TEXT, `ownerId` TEXT, `readonly` INTEGER, `isDefault` INTEGER, `favorite` INTEGER, `open` INTEGER NOT NULL, `alert` INTEGER NOT NULL, `unread` INTEGER NOT NULL, `userMentions` INTEGER, `groupMentions` INTEGER, `updatedAt` INTEGER, `timestamp` INTEGER, `lastSeen` INTEGER, `lastMessageText` TEXT, `lastMessageUserId` TEXT, `lastMessageTimestamp` INTEGER, `broadcast` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`ownerId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`lastMessageUserId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "subscriptionId",
-            "columnName": "subscriptionId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "name",
-            "columnName": "name",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "fullname",
-            "columnName": "fullname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "ownerId",
-            "columnName": "ownerId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "readonly",
-            "columnName": "readonly",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isDefault",
-            "columnName": "isDefault",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "favorite",
-            "columnName": "favorite",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "open",
-            "columnName": "open",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "alert",
-            "columnName": "alert",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userMentions",
-            "columnName": "userMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupMentions",
-            "columnName": "groupMentions",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastSeen",
-            "columnName": "lastSeen",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageText",
-            "columnName": "lastMessageText",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageUserId",
-            "columnName": "lastMessageUserId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "lastMessageTimestamp",
-            "columnName": "lastMessageTimestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "broadcast",
-            "columnName": "broadcast",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_chatrooms_userId",
-            "unique": false,
-            "columnNames": [
-              "userId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_userId` ON `${TABLE_NAME}` (`userId`)"
-          },
-          {
-            "name": "index_chatrooms_ownerId",
-            "unique": false,
-            "columnNames": [
-              "ownerId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_ownerId` ON `${TABLE_NAME}` (`ownerId`)"
-          },
-          {
-            "name": "index_chatrooms_subscriptionId",
-            "unique": true,
-            "columnNames": [
-              "subscriptionId"
-            ],
-            "createSql": "CREATE UNIQUE INDEX `index_chatrooms_subscriptionId` ON `${TABLE_NAME}` (`subscriptionId`)"
-          },
-          {
-            "name": "index_chatrooms_updatedAt",
-            "unique": false,
-            "columnNames": [
-              "updatedAt"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_updatedAt` ON `${TABLE_NAME}` (`updatedAt`)"
-          },
-          {
-            "name": "index_chatrooms_lastMessageUserId",
-            "unique": false,
-            "columnNames": [
-              "lastMessageUserId"
-            ],
-            "createSql": "CREATE  INDEX `index_chatrooms_lastMessageUserId` ON `${TABLE_NAME}` (`lastMessageUserId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "ownerId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "lastMessageUserId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "messages",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` TEXT NOT NULL, `roomId` TEXT NOT NULL, `message` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, `senderId` TEXT, `updatedAt` INTEGER, `editedAt` INTEGER, `editedBy` TEXT, `senderAlias` TEXT, `avatar` TEXT, `type` TEXT, `groupable` INTEGER NOT NULL, `parseUrls` INTEGER NOT NULL, `pinned` INTEGER NOT NULL, `role` TEXT, `synced` INTEGER NOT NULL, `unread` INTEGER, PRIMARY KEY(`id`), FOREIGN KEY(`senderId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION , FOREIGN KEY(`editedBy`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "message",
-            "columnName": "message",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "senderId",
-            "columnName": "senderId",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "updatedAt",
-            "columnName": "updatedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedAt",
-            "columnName": "editedAt",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "editedBy",
-            "columnName": "editedBy",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "senderAlias",
-            "columnName": "senderAlias",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "avatar",
-            "columnName": "avatar",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "groupable",
-            "columnName": "groupable",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "parseUrls",
-            "columnName": "parseUrls",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "pinned",
-            "columnName": "pinned",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "role",
-            "columnName": "role",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "synced",
-            "columnName": "synced",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "unread",
-            "columnName": "unread",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "senderId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "editedBy"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_favorites",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_mentions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `userId` TEXT NOT NULL, PRIMARY KEY(`messageId`, `userId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE , FOREIGN KEY(`userId`) REFERENCES `users`(`id`) ON UPDATE NO ACTION ON DELETE NO ACTION )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "userId",
-            "columnName": "userId",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "userId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          },
-          {
-            "table": "users",
-            "onDelete": "NO ACTION",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "userId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "message_channels",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`messageId` TEXT NOT NULL, `roomId` TEXT NOT NULL, `roomName` TEXT, PRIMARY KEY(`messageId`, `roomId`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "roomName",
-            "columnName": "roomName",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "messageId",
-            "roomId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachments",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`_id` TEXT NOT NULL, `message_id` TEXT NOT NULL, `title` TEXT, `type` TEXT, `description` TEXT, `text` TEXT, `author_name` TEXT, `author_icon` TEXT, `author_link` TEXT, `thumb_url` TEXT, `color` TEXT, `fallback` TEXT, `title_link` TEXT, `title_link_download` INTEGER NOT NULL, `image_url` TEXT, `image_type` TEXT, `image_size` INTEGER, `video_url` TEXT, `video_type` TEXT, `video_size` INTEGER, `audio_url` TEXT, `audio_type` TEXT, `audio_size` INTEGER, `message_link` TEXT, `timestamp` INTEGER, `has_actions` INTEGER NOT NULL, `has_fields` INTEGER NOT NULL, `button_alignment` TEXT, PRIMARY KEY(`_id`), FOREIGN KEY(`message_id`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "_id",
-            "columnName": "_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "message_id",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorName",
-            "columnName": "author_name",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorIcon",
-            "columnName": "author_icon",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "authorLink",
-            "columnName": "author_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "thumbUrl",
-            "columnName": "thumb_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "color",
-            "columnName": "color",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "fallback",
-            "columnName": "fallback",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLink",
-            "columnName": "title_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "titleLinkDownload",
-            "columnName": "title_link_download",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "image_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageType",
-            "columnName": "image_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageSize",
-            "columnName": "image_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoUrl",
-            "columnName": "video_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoType",
-            "columnName": "video_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "videoSize",
-            "columnName": "video_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioUrl",
-            "columnName": "audio_url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioType",
-            "columnName": "audio_type",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "audioSize",
-            "columnName": "audio_size",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageLink",
-            "columnName": "message_link",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "hasActions",
-            "columnName": "has_actions",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hasFields",
-            "columnName": "has_fields",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "buttonAlignment",
-            "columnName": "button_alignment",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "_id"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "message_id"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachment_fields",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `title` TEXT NOT NULL, `value` TEXT NOT NULL, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "attachmentId",
-            "columnName": "attachmentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "value",
-            "columnName": "value",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_attachment_fields_attachmentId",
-            "unique": false,
-            "columnNames": [
-              "attachmentId"
-            ],
-            "createSql": "CREATE  INDEX `index_attachment_fields_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "attachments",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "attachmentId"
-            ],
-            "referencedColumns": [
-              "_id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "attachment_action",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `attachmentId` TEXT NOT NULL, `type` TEXT NOT NULL, `text` TEXT, `url` TEXT, `isWebView` INTEGER, `webViewHeightRatio` TEXT, `imageUrl` TEXT, `message` TEXT, `isMessageInChatWindow` INTEGER, FOREIGN KEY(`attachmentId`) REFERENCES `attachments`(`_id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "id",
-            "columnName": "id",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "attachmentId",
-            "columnName": "attachmentId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "type",
-            "columnName": "type",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "text",
-            "columnName": "text",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isWebView",
-            "columnName": "isWebView",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "webViewHeightRatio",
-            "columnName": "webViewHeightRatio",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "imageUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "message",
-            "columnName": "message",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "isMessageInChatWindow",
-            "columnName": "isMessageInChatWindow",
-            "affinity": "INTEGER",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "id"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_attachment_action_attachmentId",
-            "unique": false,
-            "columnNames": [
-              "attachmentId"
-            ],
-            "createSql": "CREATE  INDEX `index_attachment_action_attachmentId` ON `${TABLE_NAME}` (`attachmentId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "attachments",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "attachmentId"
-            ],
-            "referencedColumns": [
-              "_id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "urls",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`urlId` INTEGER PRIMARY KEY AUTOINCREMENT, `messageId` TEXT NOT NULL, `url` TEXT NOT NULL, `hostname` TEXT, `title` TEXT, `description` TEXT, `imageUrl` TEXT, FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "urlId",
-            "columnName": "urlId",
-            "affinity": "INTEGER",
-            "notNull": false
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "url",
-            "columnName": "url",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "hostname",
-            "columnName": "hostname",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "title",
-            "columnName": "title",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "description",
-            "columnName": "description",
-            "affinity": "TEXT",
-            "notNull": false
-          },
-          {
-            "fieldPath": "imageUrl",
-            "columnName": "imageUrl",
-            "affinity": "TEXT",
-            "notNull": false
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "urlId"
-          ],
-          "autoGenerate": true
-        },
-        "indices": [
-          {
-            "name": "index_urls_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_urls_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "reactions",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`reaction` TEXT NOT NULL, `messageId` TEXT NOT NULL, `count` INTEGER NOT NULL, `usernames` TEXT NOT NULL, PRIMARY KEY(`reaction`), FOREIGN KEY(`messageId`) REFERENCES `messages`(`id`) ON UPDATE NO ACTION ON DELETE CASCADE )",
-        "fields": [
-          {
-            "fieldPath": "reaction",
-            "columnName": "reaction",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "messageId",
-            "columnName": "messageId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "count",
-            "columnName": "count",
-            "affinity": "INTEGER",
-            "notNull": true
-          },
-          {
-            "fieldPath": "usernames",
-            "columnName": "usernames",
-            "affinity": "TEXT",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "reaction"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [
-          {
-            "name": "index_reactions_messageId",
-            "unique": false,
-            "columnNames": [
-              "messageId"
-            ],
-            "createSql": "CREATE  INDEX `index_reactions_messageId` ON `${TABLE_NAME}` (`messageId`)"
-          }
-        ],
-        "foreignKeys": [
-          {
-            "table": "messages",
-            "onDelete": "CASCADE",
-            "onUpdate": "NO ACTION",
-            "columns": [
-              "messageId"
-            ],
-            "referencedColumns": [
-              "id"
-            ]
-          }
-        ]
-      },
-      {
-        "tableName": "messages_sync",
-        "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`roomId` TEXT NOT NULL, `timestamp` INTEGER NOT NULL, PRIMARY KEY(`roomId`))",
-        "fields": [
-          {
-            "fieldPath": "roomId",
-            "columnName": "roomId",
-            "affinity": "TEXT",
-            "notNull": true
-          },
-          {
-            "fieldPath": "timestamp",
-            "columnName": "timestamp",
-            "affinity": "INTEGER",
-            "notNull": true
-          }
-        ],
-        "primaryKey": {
-          "columnNames": [
-            "roomId"
-          ],
-          "autoGenerate": false
-        },
-        "indices": [],
-        "foreignKeys": []
-      }
-    ],
-    "setupQueries": [
-      "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)",
-      "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, \"db46c12dbb8747200288f48d5dc5558b\")"
-    ]
-  }
-}
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 3a342f59ae..9bb4177bb3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -90,7 +90,7 @@
             android:theme="@style/AppTheme"
             android:windowSoftInputMode="adjustResize|stateAlwaysHidden" />
 
-        <!-- TODO: Change to fragment-->
+        <!-- TODO: Change to fragment -->
         <activity
             android:name=".settings.password.ui.PasswordActivity"
             android:theme="@style/AppTheme" />
diff --git a/app/src/main/java/chat/rocket/android/about/di/AboutFragmentProvider.kt b/app/src/main/java/chat/rocket/android/about/di/AboutFragmentProvider.kt
deleted file mode 100644
index 9ad3f3eb50..0000000000
--- a/app/src/main/java/chat/rocket/android/about/di/AboutFragmentProvider.kt
+++ /dev/null
@@ -1,12 +0,0 @@
-package chat.rocket.android.about.di
-
-import chat.rocket.android.about.ui.AboutFragment
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-
-@Module
-abstract class AboutFragmentProvider {
-
-    @ContributesAndroidInjector()
-    abstract fun provideAboutFragment(): AboutFragment
-}
diff --git a/app/src/main/java/chat/rocket/android/about/ui/AboutFragment.kt b/app/src/main/java/chat/rocket/android/about/ui/AboutFragment.kt
deleted file mode 100644
index 08047eb1bc..0000000000
--- a/app/src/main/java/chat/rocket/android/about/ui/AboutFragment.kt
+++ /dev/null
@@ -1,66 +0,0 @@
-package chat.rocket.android.about.ui
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import chat.rocket.android.BuildConfig
-import chat.rocket.android.R
-import chat.rocket.android.analytics.AnalyticsManager
-import chat.rocket.android.analytics.event.ScreenViewEvent
-import chat.rocket.android.main.ui.MainActivity
-import dagger.android.support.AndroidSupportInjection
-import kotlinx.android.synthetic.main.app_bar.*
-import kotlinx.android.synthetic.main.fragment_about.*
-import javax.inject.Inject
-
-internal const val TAG_ABOUT_FRAGMENT = "AboutFragment"
-
-class AboutFragment : Fragment() {
-    @Inject
-    lateinit var analyticsManager: AnalyticsManager
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        AndroidSupportInjection.inject(this)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? = inflater.inflate(R.layout.fragment_about, container, false)
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        setupViews()
-
-        analyticsManager.logScreenView(ScreenViewEvent.About)
-    }
-
-    override fun onResume() {
-        super.onResume()
-        setupToolbar()
-    }
-
-    private fun setupViews() {
-        text_version_name.text = BuildConfig.VERSION_NAME
-        text_build_number.text = getString(
-            R.string.msg_build, BuildConfig.VERSION_CODE,
-            BuildConfig.GIT_SHA, BuildConfig.FLAVOR
-        )
-    }
-
-    private fun setupToolbar() {
-        with((activity as MainActivity).toolbar) {
-            title = getString(R.string.title_about)
-            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-            setNavigationOnClickListener { activity?.onBackPressed() }
-        }
-    }
-
-    companion object {
-        fun newInstance() = AboutFragment()
-    }
-}
diff --git a/app/src/main/java/chat/rocket/android/analytics/Analytics.kt b/app/src/main/java/chat/rocket/android/analytics/Analytics.kt
index d1adf4ce95..90750184cb 100644
--- a/app/src/main/java/chat/rocket/android/analytics/Analytics.kt
+++ b/app/src/main/java/chat/rocket/android/analytics/Analytics.kt
@@ -10,7 +10,7 @@ interface Analytics {
      * Logs the login event.
      *
      * @param event The [AuthenticationEvent] used to log in.
-     * @param loginSucceeded True if successful logged in, false otherwise.
+     * @param loginSucceeded True if logged in successfully, false otherwise.
      */
     fun logLogin(event: AuthenticationEvent, loginSucceeded: Boolean) {}
 
@@ -18,7 +18,7 @@ interface Analytics {
      * Logs the sign up event.
      *
      * @param event The [AuthenticationEvent] used to sign up.
-     * @param signUpSucceeded True if successful signed up, false otherwise.
+     * @param signUpSucceeded True if signed up successfully, false otherwise.
      */
     fun logSignUp(event: AuthenticationEvent, signUpSucceeded: Boolean) {}
 
diff --git a/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt b/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt
index b96de69855..a1f6fc6f8a 100644
--- a/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt
+++ b/app/src/main/java/chat/rocket/android/analytics/event/ScreenViewEvent.kt
@@ -27,4 +27,5 @@ sealed class ScreenViewEvent(val screenName: String) {
     object Preferences : ScreenViewEvent("PreferencesFragment")
     object Profile : ScreenViewEvent("ProfileFragment")
     object Settings : ScreenViewEvent("SettingsFragment")
+    object Directory : ScreenViewEvent("DirectoryFragment")
 }
diff --git a/app/src/main/java/chat/rocket/android/app/AppLifecycleObserver.kt b/app/src/main/java/chat/rocket/android/app/AppLifecycleObserver.kt
index 749fab04ff..c236f3a769 100644
--- a/app/src/main/java/chat/rocket/android/app/AppLifecycleObserver.kt
+++ b/app/src/main/java/chat/rocket/android/app/AppLifecycleObserver.kt
@@ -4,7 +4,7 @@ import androidx.lifecycle.Lifecycle
 import androidx.lifecycle.LifecycleObserver
 import androidx.lifecycle.OnLifecycleEvent
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.common.model.UserStatus
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
diff --git a/app/src/main/java/chat/rocket/android/app/DrawableHelper.kt b/app/src/main/java/chat/rocket/android/app/DrawableHelper.kt
index b808072efa..8b3220472c 100644
--- a/app/src/main/java/chat/rocket/android/app/DrawableHelper.kt
+++ b/app/src/main/java/chat/rocket/android/app/DrawableHelper.kt
@@ -1,8 +1,9 @@
 import android.content.Context
 import android.graphics.drawable.Drawable
+import android.view.View
+import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.core.graphics.drawable.DrawableCompat
-import android.widget.TextView
 import chat.rocket.android.R
 import chat.rocket.common.model.UserStatus
 
@@ -43,7 +44,7 @@ object DrawableHelper {
     /**
      * Tints an array of Drawable.
      *
-     * REMARK: you MUST always wrap the array of Drawable before tint it.
+     * REMARK: you MUST always wrap the array of Drawable before tinting it.
      *
      * @param drawables The array of Drawable to tint.
      * @param context The context.
@@ -60,7 +61,7 @@ object DrawableHelper {
     /**
      * Tints a Drawable.
      *
-     * REMARK: you MUST always wrap the Drawable before tint it.
+     * REMARK: you MUST always wrap the Drawable before tinting it.
      *
      * @param drawable The Drawable to tint.
      * @param context The context.
@@ -72,43 +73,74 @@ object DrawableHelper {
         DrawableCompat.setTint(drawable, ContextCompat.getColor(context, resId))
 
     /**
-     * Compounds an array of Drawable (to appear to the left of the text) into an array of TextView.
+     * Compounds an array of Drawable (to appear on the start side of a text) into an array of TextView.
      *
-     * REMARK: the number of elements in both array of Drawable and EditText MUST be equal.
+     * REMARK: the number of elements in both arrays of Drawable and TextView MUST be equal.
      *
      * @param textView The array of TextView.
      * @param drawables The array of Drawable.
-     * @see compoundDrawable
+     * @see compoundStartDrawable
      */
     fun compoundDrawables(textView: Array<TextView>, drawables: Array<Drawable>) {
         if (textView.size != drawables.size) {
             return
         } else {
             for (i in textView.indices) {
-                textView[i].setCompoundDrawablesWithIntrinsicBounds(drawables[i], null, null, null)
+                if (textView[i].resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
+                    textView[i].setCompoundDrawablesWithIntrinsicBounds(null, null, drawables[i], null)
+                } else {
+                    textView[i].setCompoundDrawablesWithIntrinsicBounds(drawables[i], null, null, null)
+                }
             }
         }
     }
 
     /**
-     * Compounds a Drawable (to appear on the left side of a text) into a TextView.
+     * Compounds a Drawable (to appear on the start side of a text) into a TextView.
      *
      * @param textView The TextView.
      * @param drawable The Drawable.
      * @see compoundDrawables
      */
-    fun compoundDrawable(textView: TextView, drawable: Drawable) =
-        textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+    fun compoundStartDrawable(textView: TextView, drawable: Drawable) =
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+        }
 
     /**
-     * Compounds a Drawable (to appear on the right side of a text) into a TextView.
+     * Compounds a Drawable (to appear on the end side of a text) into a TextView.
      *
      * @param textView The TextView.
      * @param drawable The Drawable.
-     * @see compoundDrawable
+     * @see compoundStartDrawable
      */
-    fun compoundRightDrawable(textView: TextView, drawable: Drawable) =
-        textView.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
+    fun compoundEndDrawable(textView: TextView, drawable: Drawable) =
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(drawable, null, null, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(null, null, drawable, null)
+        }
+
+    /**
+     * Compounds a Drawable (to appear on the start and end side of a text) into a TextView.
+     *
+     * @param textView The TextView.
+     * @param startDrawable The start Drawable.
+     * @param endDrawable The end Drawable.
+     * @see compoundStartDrawable
+     */
+    fun compoundStartAndEndDrawable(
+        textView: TextView,
+        startDrawable: Drawable,
+        endDrawable: Drawable
+    ) =
+        if (textView.resources.configuration.layoutDirection == View.LAYOUT_DIRECTION_RTL) {
+            textView.setCompoundDrawablesWithIntrinsicBounds(endDrawable, null, startDrawable, null)
+        } else {
+            textView.setCompoundDrawablesWithIntrinsicBounds(startDrawable, null, endDrawable, null)
+        }
 
     /**
      * Returns the user status drawable.
@@ -126,4 +158,4 @@ object DrawableHelper {
             else -> getDrawableFromId(R.drawable.ic_status_invisible_12dp, context)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt b/app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt
index 08279a74cd..5410d3d7f2 100644
--- a/app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt
+++ b/app/src/main/java/chat/rocket/android/app/RocketChatApplication.kt
@@ -24,7 +24,7 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.SITE_URL
 import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.retryIO
 import chat.rocket.android.util.setupFabric
 import chat.rocket.common.RocketChatException
@@ -115,7 +115,7 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         // TODO - remove this
         checkCurrentServer()
 
-        // TODO - FIXME - we need to proper inject the EmojiRepository and initialize it properly
+        // TODO - FIXME - we need to properly inject and initialize the EmojiRepository
         loadEmojis()
     }
 
@@ -176,7 +176,7 @@ class RocketChatApplication : Application(), HasActivityInjector, HasServiceInje
         val currentServer = getCurrentServerInteractor.get()
         currentServer?.let { server ->
             GlobalScope.launch {
-                val client = factory.create(server)
+                val client = factory.get(server)
                 EmojiRepository.setCurrentServerUrl(server)
                 val customEmojiList = mutableListOf<Emoji>()
                 try {
diff --git a/app/src/main/java/chat/rocket/android/authentication/infraestructure/SharedPreferencesMultiServerTokenRepository.kt b/app/src/main/java/chat/rocket/android/authentication/infrastructure/SharedPreferencesMultiServerTokenRepository.kt
similarity index 94%
rename from app/src/main/java/chat/rocket/android/authentication/infraestructure/SharedPreferencesMultiServerTokenRepository.kt
rename to app/src/main/java/chat/rocket/android/authentication/infrastructure/SharedPreferencesMultiServerTokenRepository.kt
index f4875cfdfe..23b9af7376 100644
--- a/app/src/main/java/chat/rocket/android/authentication/infraestructure/SharedPreferencesMultiServerTokenRepository.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/infrastructure/SharedPreferencesMultiServerTokenRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.authentication.infraestructure
+package chat.rocket.android.authentication.infrastructure
 
 import chat.rocket.android.authentication.domain.model.TokenModel
 import chat.rocket.android.dagger.scope.PerActivity
diff --git a/app/src/main/java/chat/rocket/android/authentication/infraestructure/SharedPreferencesTokenRepository.kt b/app/src/main/java/chat/rocket/android/authentication/infrastructure/SharedPreferencesTokenRepository.kt
similarity index 97%
rename from app/src/main/java/chat/rocket/android/authentication/infraestructure/SharedPreferencesTokenRepository.kt
rename to app/src/main/java/chat/rocket/android/authentication/infrastructure/SharedPreferencesTokenRepository.kt
index b2348662e1..cb7bead7be 100644
--- a/app/src/main/java/chat/rocket/android/authentication/infraestructure/SharedPreferencesTokenRepository.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/infrastructure/SharedPreferencesTokenRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.authentication.infraestructure
+package chat.rocket.android.authentication.infrastructure
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
diff --git a/app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt b/app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt
index b560c1c034..d3be18ae94 100644
--- a/app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/login/presentation/LoginPresenter.kt
@@ -15,8 +15,9 @@ import chat.rocket.android.server.domain.favicon
 import chat.rocket.android.server.domain.isLdapAuthenticationEnabled
 import chat.rocket.android.server.domain.isPasswordResetEnabled
 import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.server.domain.siteName
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.isEmail
@@ -50,6 +51,7 @@ class LoginPresenter @Inject constructor(
 ) {
     // TODO - we should validate the current server when opening the app, and have a nonnull get()
     private var currentServer = serverInteractor.get()!!
+    private val token = tokenRepository.get(currentServer)
     private lateinit var client: RocketChatClient
     private lateinit var settings: PublicSettings
 
@@ -60,7 +62,7 @@ class LoginPresenter @Inject constructor(
 
     private fun setupConnectionInfo(serverUrl: String) {
         currentServer = serverUrl
-        client = factory.create(currentServer)
+        client = factory.get(currentServer)
         settings = settingsInteractor.get(currentServer)
     }
 
@@ -140,8 +142,15 @@ class LoginPresenter @Inject constructor(
         val logo = settings.wideTile()?.let {
             currentServer.serverLogoUrl(it)
         }
-        val thumb = currentServer.avatarUrl(username)
-        val account = Account(currentServer, icon, logo, username, thumb)
+        val thumb = currentServer.avatarUrl(username, token?.userId, token?.authToken)
+        val account = Account(
+            settings.siteName() ?: currentServer,
+            currentServer,
+            icon,
+            logo,
+            username,
+            thumb
+        )
         saveAccountInteractor.save(account)
     }
 
diff --git a/app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsPresenter.kt b/app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsPresenter.kt
index be36edab69..c9650cf273 100644
--- a/app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsPresenter.kt
@@ -14,8 +14,9 @@ import chat.rocket.android.server.domain.SaveCurrentServerInteractor
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.favicon
 import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.server.domain.siteName
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.serverLogoUrl
@@ -54,6 +55,7 @@ class LoginOptionsPresenter @Inject constructor(
 ) {
     // TODO - we should validate the current server when opening the app, and have a nonnull get()
     private var currentServer = serverInteractor.get()!!
+    private val token = tokenRepository.get(currentServer)
     private lateinit var client: RocketChatClient
     private lateinit var settings: PublicSettings
     private lateinit var credentialToken: String
@@ -169,7 +171,7 @@ class LoginOptionsPresenter @Inject constructor(
 
     private fun setupConnectionInfo(serverUrl: String) {
         currentServer = serverUrl
-        client = factory.create(currentServer)
+        client = factory.get(currentServer)
         settings = settingsInteractor.get(currentServer)
     }
 
@@ -180,8 +182,15 @@ class LoginOptionsPresenter @Inject constructor(
         val logo = settings.wideTile()?.let {
             currentServer.serverLogoUrl(it)
         }
-        val thumb = currentServer.avatarUrl(username)
-        val account = Account(currentServer, icon, logo, username, thumb)
+        val thumb = currentServer.avatarUrl(username, token?.userId, token?.authToken)
+        val account = Account(
+            settings.siteName() ?: currentServer,
+            currentServer,
+            icon,
+            logo,
+            username,
+            thumb
+        )
         saveAccountInteractor.save(account)
     }
 
diff --git a/app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsView.kt b/app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsView.kt
index 5364c7a0c4..45d6a2e748 100644
--- a/app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsView.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/loginoptions/presentation/LoginOptionsView.kt
@@ -25,18 +25,18 @@ interface LoginOptionsView : LoadingView, MessageView {
     fun setupFacebookButtonListener(facebookOauthUrl: String, state: String)
 
     /**
-     * Shows the "login by Github" view if it is enabled by the server settings.
+     * Shows the "login by GitHub" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Github button listener before enabling it
+     * REMARK: We must set up the GitHub button listener before enabling it
      * [setupGithubButtonListener].
      * @see [showAccountsView]
      */
     fun enableLoginByGithub()
 
     /**
-     * Setups the Github button.
+     * Setups the GitHub button.
      *
-     * @param githubUrl The Github OAuth URL to authenticate with.
+     * @param githubUrl The GitHub OAuth URL to authenticate with.
      * @param state A random string generated by the app, which you'll verify later
      * (to protect against forgery attacks).
      */
@@ -61,36 +61,36 @@ interface LoginOptionsView : LoadingView, MessageView {
     fun setupGoogleButtonListener(googleUrl: String, state: String)
 
     /**
-     * Shows the "login by Linkedin" view if it is enabled by the server settings.
+     * Shows the "login by LinkedIn" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Linkedin button listener before enabling it
+     * REMARK: We must set up the LinkedIn button listener before enabling it
      * [setupLinkedinButtonListener].
      * @see [showAccountsView]
      */
     fun enableLoginByLinkedin()
 
     /**
-     * Setups the Linkedin button.
+     * Setups the LinkedIn button.
      *
-     * @param linkedinUrl The Linkedin OAuth URL to authenticate with.
+     * @param linkedinUrl The LinkedIn OAuth URL to authenticate with.
      * @param state A random string generated by the app, which you'll verify later
      * (to protect against forgery attacks).
      */
     fun setupLinkedinButtonListener(linkedinUrl: String, state: String)
 
     /**
-     * Shows the "login by Gitlab" view if it is enabled by the server settings.
+     * Shows the "login by GitLab" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Gitlab button listener before enabling it
+     * REMARK: We must set up the GitLab button listener before enabling it
      * [setupGitlabButtonListener].
      * @see [showAccountsView]
      */
     fun enableLoginByGitlab()
 
     /**
-     * Setups the Gitlab button.
+     * Setups the GitLab button.
      *
-     * @param gitlabUrl The Gitlab OAuth URL to authenticate with.
+     * @param gitlabUrl The GitLab OAuth URL to authenticate with.
      * @param state A random string generated by the app, which you'll verify later
      * (to protect against forgery attacks).
      */
@@ -99,7 +99,7 @@ interface LoginOptionsView : LoadingView, MessageView {
     /**
      * Shows the "login by WordPress" view if it is enabled by the server settings.
      *
-     * REMARK: We must set up the Gitlab button listener before enabling it [setupWordpressButtonListener].
+     * REMARK: We must set up the GitLab button listener before enabling it [setupWordpressButtonListener].
      */
     fun enableLoginByWordpress()
 
diff --git a/app/src/main/java/chat/rocket/android/authentication/loginoptions/ui/LoginOptionsFragment.kt b/app/src/main/java/chat/rocket/android/authentication/loginoptions/ui/LoginOptionsFragment.kt
index 33bbb00593..d0d1abd971 100644
--- a/app/src/main/java/chat/rocket/android/authentication/loginoptions/ui/LoginOptionsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/loginoptions/ui/LoginOptionsFragment.kt
@@ -1,5 +1,8 @@
 package chat.rocket.android.authentication.loginoptions.ui
 
+import android.animation.Animator
+import android.animation.AnimatorListenerAdapter
+import android.animation.ValueAnimator
 import android.app.Activity
 import android.content.Intent
 import android.graphics.PorterDuff
@@ -7,10 +10,13 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.animation.AlphaAnimation
+import android.view.animation.Animation
 import android.widget.Button
 import android.widget.LinearLayout
 import androidx.appcompat.view.ContextThemeWrapper
 import androidx.core.view.isVisible
+import androidx.core.view.marginTop
 import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
@@ -28,6 +34,7 @@ import chat.rocket.android.webview.sso.ui.ssoWebViewIntent
 import dagger.android.support.AndroidSupportInjection
 import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.fragment_authentication_login_options.*
+import timber.log.Timber
 import javax.inject.Inject
 
 private const val SERVER_NAME = "server_name"
@@ -61,6 +68,8 @@ internal const val REQUEST_CODE_FOR_OAUTH = 1
 internal const val REQUEST_CODE_FOR_CAS = 2
 internal const val REQUEST_CODE_FOR_SAML = 3
 
+private const val DEFAULT_ANIMATION_DURATION = 400L
+
 fun newInstance(
     serverName: String,
     state: String? = null,
@@ -238,7 +247,6 @@ class LoginOptionsFragment : Fragment(), LoginOptionsView {
             enableLoginByLinkedin()
         }
 
-
         if (gitlabOauthUrl != null && state != null) {
             setupGitlabButtonListener(gitlabOauthUrl.toString(), state.toString())
             enableLoginByGitlab()
@@ -390,11 +398,11 @@ class LoginOptionsFragment : Fragment(), LoginOptionsView {
             var isAccountsCollapsed = true
             button_expand_collapse_accounts.setOnClickListener {
                 isAccountsCollapsed = if (isAccountsCollapsed) {
-                    button_expand_collapse_accounts.rotateBy(180F, 400)
+                    button_expand_collapse_accounts.rotateBy(180F, DEFAULT_ANIMATION_DURATION)
                     expandAccountsView()
                     false
                 } else {
-                    button_expand_collapse_accounts.rotateBy(180F, 400)
+                    button_expand_collapse_accounts.rotateBy(180F, DEFAULT_ANIMATION_DURATION)
                     collapseAccountsView()
                     true
                 }
@@ -532,17 +540,73 @@ class LoginOptionsFragment : Fragment(), LoginOptionsView {
     }
 
     private fun expandAccountsView() {
-        (0..accounts_container.childCount)
+        val buttons = (0..accounts_container.childCount)
             .mapNotNull { accounts_container.getChildAt(it) as? Button }
             .filter { it.isClickable && !it.isVisible }
-            .forEach { it.isVisible = true }
+        val optionHeight = accounts_container.getChildAt(1).height +
+            accounts_container.getChildAt(1).marginTop
+        val collapsedHeight = accounts_container.height
+        val expandedHeight = collapsedHeight + optionHeight * buttons.size
+
+        with(ValueAnimator.ofInt(collapsedHeight, expandedHeight)) {
+            addUpdateListener {
+                val params = accounts_container.layoutParams
+                params.height = animatedValue as Int
+                accounts_container.layoutParams = params
+            }
+            addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationStart(animator: Animator) {
+                    buttons.forEach {
+                        it.isVisible = true
+                        val anim = AlphaAnimation(0.0f, 1.0f)
+                        anim.duration = DEFAULT_ANIMATION_DURATION
+                        it.startAnimation(anim)
+                    }
+                }
+            })
+            setDuration(DEFAULT_ANIMATION_DURATION).start()
+        }
     }
 
     private fun collapseAccountsView() {
-        (0..accounts_container.childCount)
+        val buttons = (0..accounts_container.childCount)
             .mapNotNull { accounts_container.getChildAt(it) as? Button }
             .filter { it.isClickable && it.isVisible }
             .drop(3)
-            .forEach { it.isVisible = false }
+        val optionHeight = accounts_container.getChildAt(1).height +
+            accounts_container.getChildAt(1).marginTop
+        val expandedHeight = accounts_container.height
+        val collapsedHeight = expandedHeight - optionHeight * buttons.size
+
+        with(ValueAnimator.ofInt(expandedHeight, collapsedHeight)) {
+            addUpdateListener {
+                val params = accounts_container.layoutParams
+                params.height = animatedValue as Int
+                accounts_container.layoutParams = params
+            }
+            addListener(object : AnimatorListenerAdapter() {
+                override fun onAnimationStart(animator: Animator) {
+                    buttons.forEach {
+                        val anim = AlphaAnimation(1.0f, 0.0f)
+                        anim.duration = DEFAULT_ANIMATION_DURATION
+                        anim.setAnimationListener(object : Animation.AnimationListener {
+                            override fun onAnimationStart(animation: Animation) {
+                                Timber.d("Animation starts: $animation")
+                            }
+
+                            override fun onAnimationEnd(animation: Animation) {
+                                it.isVisible = false
+                            }
+
+                            override fun onAnimationRepeat(animation: Animation) {
+                                Timber.d("Animation repeats: $animation")
+                            }
+                        })
+                        it.startAnimation(anim)
+                    }
+                }
+            })
+            setDuration(DEFAULT_ANIMATION_DURATION).start()
+        }
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/authentication/onboarding/presentation/OnBoardingPresenter.kt b/app/src/main/java/chat/rocket/android/authentication/onboarding/presentation/OnBoardingPresenter.kt
index 532c6f56d9..37979843ad 100644
--- a/app/src/main/java/chat/rocket/android/authentication/onboarding/presentation/OnBoardingPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/onboarding/presentation/OnBoardingPresenter.kt
@@ -7,7 +7,7 @@ import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
 import chat.rocket.android.server.domain.SaveConnectingServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extension.launchUI
 import kotlinx.coroutines.Dispatchers
diff --git a/app/src/main/java/chat/rocket/android/authentication/registerusername/presentation/RegisterUsernamePresenter.kt b/app/src/main/java/chat/rocket/android/authentication/registerusername/presentation/RegisterUsernamePresenter.kt
index f50137136e..a5d21a8762 100644
--- a/app/src/main/java/chat/rocket/android/authentication/registerusername/presentation/RegisterUsernamePresenter.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/registerusername/presentation/RegisterUsernamePresenter.kt
@@ -12,8 +12,9 @@ import chat.rocket.android.server.domain.SaveCurrentServerInteractor
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.favicon
 import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.server.domain.siteName
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.serverLogoUrl
@@ -38,8 +39,9 @@ class RegisterUsernamePresenter @Inject constructor(
     val settingsInteractor: GetSettingsInteractor
 ) {
     private val currentServer = serverInteractor.get()!!
-    private val client: RocketChatClient = factory.create(currentServer)
-    private var settings: PublicSettings = settingsInteractor.get(serverInteractor.get()!!)
+    private val client: RocketChatClient = factory.get(currentServer)
+    private var settings: PublicSettings = settingsInteractor.get(currentServer)
+    private val token = tokenRepository.get(currentServer)
 
     fun registerUsername(username: String, userId: String, authToken: String) {
         launchUI(strategy) {
@@ -72,15 +74,22 @@ class RegisterUsernamePresenter @Inject constructor(
         }
     }
 
-    private suspend fun saveAccount(username: String) {
+    private fun saveAccount(username: String) {
         val icon = settings.favicon()?.let {
             currentServer.serverLogoUrl(it)
         }
         val logo = settings.wideTile()?.let {
             currentServer.serverLogoUrl(it)
         }
-        val thumb = currentServer.avatarUrl(username)
-        val account = Account(currentServer, icon, logo, username, thumb)
+        val thumb = currentServer.avatarUrl(username, token?.userId, token?.authToken)
+        val account = Account(
+            settings.siteName() ?: currentServer,
+            currentServer,
+            icon,
+            logo,
+            username,
+            thumb
+        )
         saveAccountInteractor.save(account)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt b/app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt
index 2ec6b49119..0ddd217bd4 100644
--- a/app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/registerusername/ui/RegisterUsernameFragment.kt
@@ -140,7 +140,7 @@ class RegisterUsernameFragment : Fragment(), RegisterUsernameView {
             val atDrawable = DrawableHelper.getDrawableFromId(R.drawable.ic_at_black_20dp, it)
             DrawableHelper.wrapDrawable(atDrawable)
             DrawableHelper.tintDrawable(atDrawable, it, R.color.colorDrawableTintGrey)
-            DrawableHelper.compoundDrawable(text_username, atDrawable)
+            DrawableHelper.compoundStartDrawable(text_username, atDrawable)
         }
     }
 
diff --git a/app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordPresenter.kt b/app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordPresenter.kt
index ab750d4a42..c129db9f49 100644
--- a/app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordPresenter.kt
@@ -3,7 +3,7 @@ package chat.rocket.android.authentication.resetpassword.presentation
 import chat.rocket.android.authentication.presentation.AuthenticationNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetConnectingServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
@@ -21,7 +21,7 @@ class ResetPasswordPresenter @Inject constructor(
     serverInteractor: GetConnectingServerInteractor
 ) {
     private val currentServer = serverInteractor.get()!!
-    private val client: RocketChatClient = factory.create(currentServer)
+    private val client: RocketChatClient = factory.get(currentServer)
 
     fun resetPassword(email: String) {
         launchUI(strategy) {
diff --git a/app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordView.kt b/app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordView.kt
index 6dd2e51518..fb72f60f63 100644
--- a/app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordView.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/resetpassword/presentation/ResetPasswordView.kt
@@ -21,7 +21,7 @@ interface ResetPasswordView : LoadingView, MessageView {
     fun enableButtonConnect()
 
     /**
-     * Disables the button to reset the password when the user entered an invalid email address
+     * Disables the button to reset the password when the user has entered an invalid email address
      */
     fun disableButtonConnect()
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt b/app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt
index 415ace7783..d6192390cc 100644
--- a/app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/server/presentation/ServerPresenter.kt
@@ -8,7 +8,7 @@ import chat.rocket.android.server.domain.GetAccountsInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
 import chat.rocket.android.server.domain.SaveConnectingServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.isValidUrl
diff --git a/app/src/main/java/chat/rocket/android/authentication/server/presentation/VersionCheckView.kt b/app/src/main/java/chat/rocket/android/authentication/server/presentation/VersionCheckView.kt
index 89711b6e96..0b93cf0ac2 100644
--- a/app/src/main/java/chat/rocket/android/authentication/server/presentation/VersionCheckView.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/server/presentation/VersionCheckView.kt
@@ -26,7 +26,7 @@ interface VersionCheckView {
     fun versionOk() {}
 
     /**
-     * Alters the user this protocol is invalid. This is optional.
+     * Alters the user that this protocol is invalid. This is optional.
      */
     fun errorInvalidProtocol() {}
 
diff --git a/app/src/main/java/chat/rocket/android/authentication/signup/presentation/SignupPresenter.kt b/app/src/main/java/chat/rocket/android/authentication/signup/presentation/SignupPresenter.kt
index 4d6b7d16f9..1633e36228 100644
--- a/app/src/main/java/chat/rocket/android/authentication/signup/presentation/SignupPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/signup/presentation/SignupPresenter.kt
@@ -10,10 +10,12 @@ import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.SaveAccountInteractor
 import chat.rocket.android.server.domain.SaveCurrentServerInteractor
+import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.favicon
 import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.server.domain.siteName
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.privacyPolicyUrl
@@ -38,13 +40,15 @@ class SignupPresenter @Inject constructor(
     private val analyticsManager: AnalyticsManager,
     private val factory: RocketChatClientFactory,
     private val saveAccountInteractor: SaveAccountInteractor,
+    tokenRepository: TokenRepository,
     settingsInteractor: GetSettingsInteractor
 ) {
     private val currentServer = serverInteractor.get()!!
-    private var settings: PublicSettings = settingsInteractor.get(serverInteractor.get()!!)
+    private var settings: PublicSettings = settingsInteractor.get(currentServer)
+    private val token = tokenRepository.get(currentServer)
 
     fun signup(name: String, username: String, password: String, email: String) {
-        val client = factory.create(currentServer)
+        val client = factory.get(currentServer)
         launchUI(strategy) {
             view.showLoading()
             try {
@@ -98,8 +102,15 @@ class SignupPresenter @Inject constructor(
         val logo = settings.wideTile()?.let {
             currentServer.serverLogoUrl(it)
         }
-        val thumb = currentServer.avatarUrl(me.username!!)
-        val account = Account(currentServer, icon, logo, me.username!!, thumb)
+        val thumb = currentServer.avatarUrl(me.username!!, token?.userId, token?.authToken)
+        val account = Account(
+            settings.siteName() ?: currentServer,
+            currentServer,
+            icon,
+            logo,
+            me.username!!,
+            thumb
+        )
         saveAccountInteractor.save(account)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/authentication/twofactor/presentation/TwoFAPresenter.kt b/app/src/main/java/chat/rocket/android/authentication/twofactor/presentation/TwoFAPresenter.kt
index c4c6dbace0..a6e15b5ca9 100644
--- a/app/src/main/java/chat/rocket/android/authentication/twofactor/presentation/TwoFAPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/authentication/twofactor/presentation/TwoFAPresenter.kt
@@ -13,8 +13,9 @@ import chat.rocket.android.server.domain.SaveCurrentServerInteractor
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.favicon
 import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.server.domain.siteName
 import chat.rocket.android.server.domain.wideTile
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.isEmail
@@ -43,7 +44,8 @@ class TwoFAPresenter @Inject constructor(
     val settingsInteractor: GetSettingsInteractor
 ) {
     private val currentServer = serverInteractor.get()!!
-    private var settings: PublicSettings = settingsInteractor.get(serverInteractor.get()!!)
+    private var settings: PublicSettings = settingsInteractor.get(currentServer)
+    private val token = tokenRepository.get(currentServer)
 
     fun authenticate(
         usernameOrEmail: String,
@@ -51,7 +53,7 @@ class TwoFAPresenter @Inject constructor(
         twoFactorAuthenticationCode: String
     ) {
         launchUI(strategy) {
-            val client = factory.create(currentServer)
+            val client = factory.get(currentServer)
             view.showLoading()
             try {
                 // The token is saved via the client TokenProvider
@@ -101,8 +103,15 @@ class TwoFAPresenter @Inject constructor(
         val logo = settings.wideTile()?.let {
             currentServer.serverLogoUrl(it)
         }
-        val thumb = currentServer.avatarUrl(me.username!!)
-        val account = Account(currentServer, icon, logo, me.username!!, thumb)
+        val thumb = currentServer.avatarUrl(me.username!!, token?.userId, token?.authToken)
+        val account = Account(
+            settings.siteName() ?: currentServer,
+            currentServer,
+            icon,
+            logo,
+            me.username!!,
+            thumb
+        )
         saveAccountInteractor.save(account)
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
index ae8c3b8ea5..0e03a35c28 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/presentation/ChatDetailsPresenter.kt
@@ -4,7 +4,7 @@ import chat.rocket.android.chatdetails.domain.ChatDetails
 import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
index 87de3850e0..2e957adfb4 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/ui/ChatDetailsFragment.kt
@@ -195,7 +195,7 @@ class ChatDetailsFragment : Fragment(), ChatDetailsView {
             val wrappedDrawable = DrawableHelper.wrapDrawable(it)
             val mutableDrawable = wrappedDrawable.mutate()
             DrawableHelper.tintDrawable(mutableDrawable, context!!, R.color.colorPrimary)
-            DrawableHelper.compoundDrawable(name, mutableDrawable)
+            DrawableHelper.compoundStartDrawable(name, mutableDrawable)
         }
     }
 
diff --git a/app/src/main/java/chat/rocket/android/chatdetails/ui/Menu.kt b/app/src/main/java/chat/rocket/android/chatdetails/ui/Menu.kt
index d1f9a58060..c8961173a1 100644
--- a/app/src/main/java/chat/rocket/android/chatdetails/ui/Menu.kt
+++ b/app/src/main/java/chat/rocket/android/chatdetails/ui/Menu.kt
@@ -13,7 +13,7 @@ internal fun ChatDetailsFragment.setupMenu(menu: Menu) {
         with(settings.get(it)) {
             if (isJitsiEnabled()) {
                 if (roomTypeOf(chatRoomType) !is RoomType.DirectMessage && !isJitsiEnabledForChannels()) {
-                    return
+                    return@let
                 }
                 menu.add(
                     Menu.NONE,
diff --git a/app/src/main/java/chat/rocket/android/chatinformation/presentation/MessageInfoPresenter.kt b/app/src/main/java/chat/rocket/android/chatinformation/presentation/MessageInfoPresenter.kt
index 3f1ecc41f8..2b8b2b1d88 100644
--- a/app/src/main/java/chat/rocket/android/chatinformation/presentation/MessageInfoPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatinformation/presentation/MessageInfoPresenter.kt
@@ -3,7 +3,7 @@ package chat.rocket.android.chatinformation.presentation
 import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
diff --git a/app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt b/app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt
index 8f6d881a6d..986f9f3ec1 100644
--- a/app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatinformation/ui/MessageInfoFragment.kt
@@ -42,7 +42,6 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
-        setHasOptionsMenu(true)
 
         val bundle = arguments
         if (bundle != null) {
@@ -50,6 +49,8 @@ class MessageInfoFragment : Fragment(), MessageInfoView {
         } else {
             requireNotNull(bundle) { "no arguments supplied when the fragment was instantiated" }
         }
+
+        setHasOptionsMenu(true)
     }
 
     override fun onCreateView(
diff --git a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
index 260daba587..c14782ece9 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/di/ChatRoomFragmentModule.kt
@@ -56,6 +56,7 @@ class ChatRoomFragmentModule {
         context: Application,
         repository: SettingsRepository,
         userInteractor: GetCurrentUserInteractor,
+        tokenRepository: TokenRepository,
         @Named("currentServer") serverUrl: String,
         permissionsInteractor: PermissionsInteractor
     ): RoomUiModelMapper {
@@ -63,6 +64,7 @@ class ChatRoomFragmentModule {
             context,
             repository.get(serverUrl),
             userInteractor,
+            tokenRepository,
             serverUrl,
             permissionsInteractor
         )
diff --git a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
index 324c337a37..cf856debd1 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/presentation/ChatRoomPresenter.kt
@@ -29,12 +29,13 @@ import chat.rocket.android.server.domain.JobSchedulerInteractor
 import chat.rocket.android.server.domain.MessagesRepository
 import chat.rocket.android.server.domain.PermissionsInteractor
 import chat.rocket.android.server.domain.PublicSettings
+import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.UsersRepository
 import chat.rocket.android.server.domain.uploadMaxFileSize
 import chat.rocket.android.server.domain.uploadMimeTypeFilter
 import chat.rocket.android.server.domain.useRealName
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.state
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.state
 import chat.rocket.android.util.extension.getByteArray
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
@@ -101,6 +102,7 @@ class ChatRoomPresenter @Inject constructor(
     private val jobSchedulerInteractor: JobSchedulerInteractor,
     private val messageHelper: MessageHelper,
     private val dbManager: DatabaseManager,
+    tokenRepository: TokenRepository,
     getSettingsInteractor: GetSettingsInteractor,
     serverInteractor: GetCurrentServerInteractor,
     factory: ConnectionManagerFactory
@@ -109,18 +111,21 @@ class ChatRoomPresenter @Inject constructor(
     private val manager = factory.create(currentServer)
     private val client = manager.client
     private var settings: PublicSettings = getSettingsInteractor.get(serverInteractor.get()!!)
+    private val token = tokenRepository.get(currentServer)
     private val currentLoggedUsername = userHelper.username()
     private val messagesChannel = Channel<Message>()
 
     private var chatRoomId: String? = null
     private lateinit var chatRoomType: String
-    private var chatIsBroadcast: Boolean = false
+    private lateinit var chatRoomName: String
+    private var isBroadcast: Boolean = false
     private var chatRoles = emptyList<ChatRoomRole>()
     private val stateChannel = Channel<State>()
     private var typingStatusSubscriptionId: String? = null
     private var lastState = manager.state
     private var typingStatusList = arrayListOf<String>()
     private val roomChangesChannel = Channel<Room>(Channel.CONFLATED)
+    private var lastMessageId: String? = null
     private lateinit var draftKey: String
 
     fun setupChatRoom(
@@ -132,47 +137,77 @@ class ChatRoomPresenter @Inject constructor(
         draftKey = "${currentServer}_${LocalRepository.DRAFT_KEY}$roomId"
         chatRoomId = roomId
         chatRoomType = roomType
+        chatRoomName = roomName
+        chatRoles = emptyList()
+        var canModerate = isOwnerOrMod()
+
         GlobalScope.launch(Dispatchers.IO + strategy.jobs) {
-            try {
-                chatRoles = if (roomTypeOf(roomType) !is RoomType.DirectMessage) {
-                    client.chatRoomRoles(roomType = roomTypeOf(roomType), roomName = roomName)
-                } else {
-                    emptyList()
-                }
-            } catch (ex: Exception) {
-                Timber.e(ex)
-                chatRoles = emptyList()
-            } finally {
-                // User has at least an 'owner' or 'moderator' role.
-                val canModerate = isOwnerOrMod()
-                // Can post anyway if has the 'post-readonly' permission on server.
-                val room = dbManager.getRoom(roomId)
-                room?.let {
-                    chatIsBroadcast = it.chatRoom.broadcast ?: false
-                    val roomUiModel = roomMapper.map(it, true)
-                    launchUI(strategy) {
-                        view.onRoomUpdated(roomUiModel = roomUiModel.copy(
-                            broadcast = chatIsBroadcast,
+            // Can post anyway if has the 'post-readonly' permission on server.
+            val room = dbManager.getRoom(roomId)
+            room?.let {
+                isBroadcast = it.chatRoom.broadcast ?: false
+                val roomUiModel = roomMapper.map(it, true)
+                launchUI(strategy) {
+                    view.onRoomUpdated(
+                        roomUiModel = roomUiModel.copy(
+                            broadcast = isBroadcast,
                             canModerate = canModerate,
                             writable = roomUiModel.writable || canModerate
-                        ))
-                    }
+                        )
+                    )
                 }
+            }
 
-                loadMessages(roomId, roomType, clearDataSet = true)
-                chatRoomMessage?.let { messageHelper.messageIdFromPermalink(it) }
-                    ?.let { messageId ->
-                        val name = messageHelper.roomNameFromPermalink(chatRoomMessage)
-                        citeMessage(
-                            name!!,
-                            messageHelper.roomTypeFromPermalink(chatRoomMessage)!!,
-                            messageId,
-                            true
-                        )
-                    }
-                subscribeRoomChanges()
+            loadMessages(roomId, chatRoomType, clearDataSet = true)
+            loadActiveMembers(roomId, chatRoomType, filterSelfOut = true)
+
+            chatRoomMessage?.let { messageHelper.messageIdFromPermalink(it) }
+                ?.let { messageId ->
+                    val name = messageHelper.roomNameFromPermalink(chatRoomMessage)
+                    citeMessage(
+                        name!!,
+                        messageHelper.roomTypeFromPermalink(chatRoomMessage)!!,
+                        messageId,
+                        true
+                    )
+                }
+
+
+            /*FIXME:  Get chat role can cause unresponsive problems especially on slower connections
+                      We are updating the room again after the first step so that initial messages
+                      get loaded in and the system appears more responsive.  Something should be
+                      done to either fix the load in speed of moderator roles or store the
+                      information locally*/
+            if (getChatRole()) {
+                canModerate = isOwnerOrMod()
+                if (canModerate) {
+                    //FIXME: add this in when moderator page is actually created
+                    //view.updateModeration()
+                }
+            }
+
+            subscribeRoomChanges()
+        }
+    }
+
+    private suspend fun getChatRole(): Boolean {
+        try {
+            if (roomTypeOf(chatRoomType) !is RoomType.DirectMessage) {
+                chatRoles = withContext(Dispatchers.IO + strategy.jobs) {
+                    client.chatRoomRoles(
+                        roomType = roomTypeOf(chatRoomType),
+                        roomName = chatRoomName
+                    )
+                }
+                return true
+            } else {
+                chatRoles = emptyList()
             }
+        } catch (ex: Exception) {
+            Timber.e(ex)
+            chatRoles = emptyList()
         }
+        return false
     }
 
     private suspend fun subscribeRoomChanges() {
@@ -181,7 +216,12 @@ class ChatRoomPresenter @Inject constructor(
                 manager.addRoomChannel(it, roomChangesChannel)
                 for (room in roomChangesChannel) {
                     dbManager.getRoom(room.id)?.let { chatRoom ->
-                        view.onRoomUpdated(roomMapper.map(chatRoom = chatRoom, showLastMessage = true))
+                        view.onRoomUpdated(
+                            roomMapper.map(
+                                chatRoom = chatRoom,
+                                showLastMessage = true
+                            )
+                        )
                     }
                 }
             }
@@ -206,8 +246,8 @@ class ChatRoomPresenter @Inject constructor(
     ) {
         this.chatRoomId = chatRoomId
         this.chatRoomType = chatRoomType
-        launchUI(strategy) {
-            view.showLoading()
+
+        GlobalScope.launch(Dispatchers.IO + strategy.jobs) {
             try {
                 if (offset == 0L) {
                     // FIXME - load just 50 messages from DB to speed up. We will reload from Network after that
@@ -215,11 +255,12 @@ class ChatRoomPresenter @Inject constructor(
                     val localMessages = messagesRepository.getRecentMessages(chatRoomId, 50)
                     val oldMessages = mapper.map(
                         localMessages, RoomUiModel(
-                        roles = chatRoles,
-                        // FIXME: Why are we fixing isRoom attribute to true here?
-                        isBroadcast = chatIsBroadcast, isRoom = true
-                    )
+                            roles = chatRoles,
+                            // FIXME: Why are we fixing isRoom attribute to true here?
+                            isBroadcast = isBroadcast, isRoom = true
+                        )
                     )
+                    lastMessageId = localMessages.firstOrNull()?.id
                     val lastSyncDate = messagesRepository.getLastSyncDate(chatRoomId)
                     if (oldMessages.isNotEmpty() && lastSyncDate != null) {
                         view.showMessages(oldMessages, clearDataSet)
@@ -232,7 +273,7 @@ class ChatRoomPresenter @Inject constructor(
                 }
 
                 // TODO: For now we are marking the room as read if we can get the messages (I mean, no exception occurs)
-                // but should mark only when the user see the first unread message.
+                // but should mark only when the user sees the first unread message.
                 markRoomAsRead(chatRoomId)
 
                 subscribeMessages(chatRoomId)
@@ -243,8 +284,6 @@ class ChatRoomPresenter @Inject constructor(
                 }.ifNull {
                     view.showGenericErrorMessage()
                 }
-            } finally {
-                view.hideLoading()
             }
 
             subscribeTypingStatus()
@@ -279,7 +318,7 @@ class ChatRoomPresenter @Inject constructor(
         view.showMessages(
             mapper.map(
                 messages,
-                RoomUiModel(roles = chatRoles, isBroadcast = chatIsBroadcast, isRoom = true)
+                RoomUiModel(roles = chatRoles, isBroadcast = isBroadcast, isRoom = true)
             ),
             clearDataSet
         )
@@ -295,7 +334,7 @@ class ChatRoomPresenter @Inject constructor(
                 view.showSearchedMessages(
                     mapper.map(
                         messages,
-                        RoomUiModel(chatRoles, chatIsBroadcast, true)
+                        RoomUiModel(chatRoles, isBroadcast, true)
                     )
                 )
             } catch (ex: Exception) {
@@ -327,7 +366,11 @@ class ChatRoomPresenter @Inject constructor(
                         timestamp = Instant.now().toEpochMilli(),
                         sender = SimpleUser(user?.id, user?.username ?: username, user?.name),
                         attachments = null,
-                        avatar = currentServer.avatarUrl(username ?: ""),
+                        avatar = currentServer.avatarUrl(
+                            username!!,
+                            token?.userId,
+                            token?.authToken
+                        ),
                         channels = null,
                         editedAt = null,
                         editedBy = null,
@@ -349,7 +392,7 @@ class ChatRoomPresenter @Inject constructor(
                         view.showNewMessage(
                             mapper.map(
                                 newMessage,
-                                RoomUiModel(roles = chatRoles, isBroadcast = chatIsBroadcast)
+                                RoomUiModel(roles = chatRoles, isBroadcast = isBroadcast)
                             ), false
                         )
                         client.sendMessage(id, chatRoomId, text)
@@ -368,6 +411,7 @@ class ChatRoomPresenter @Inject constructor(
                             throw ex
                         }
                     }
+                    lastMessageId = id
                 } else {
                     client.updateMessage(chatRoomId, messageId, text)
                 }
@@ -599,16 +643,21 @@ class ChatRoomPresenter @Inject constructor(
                     Timber.d("History: $messages")
 
                     if (messages.result.isNotEmpty()) {
-                        val models = mapper.map(messages.result, RoomUiModel(
-                            roles = chatRoles,
-                            isBroadcast = chatIsBroadcast,
-                            // FIXME: Why are we fixing isRoom attribute to true here?
-                            isRoom = true
-                        ))
+                        val models = mapper.map(
+                            messages.result, RoomUiModel(
+                                roles = chatRoles,
+                                isBroadcast = isBroadcast,
+                                // FIXME: Why are we fixing isRoom attribute to true here?
+                                isRoom = true
+                            )
+                        )
                         messagesRepository.saveAll(messages.result)
                         //if success - saving last synced time
                         //assume that BE returns ordered messages, the first message is the latest one
-                        messagesRepository.saveLastSyncDate(chatRoomId, messages.result.first().timestamp)
+                        messagesRepository.saveLastSyncDate(
+                            chatRoomId,
+                            messages.result.first().timestamp
+                        )
 
                         launchUI(strategy) {
                             view.showNewMessage(models, true)
@@ -685,9 +734,9 @@ class ChatRoomPresenter @Inject constructor(
                     replyMarkdown = "[ ]($currentServer/$chatRoomType/$room?msg=$id) $mention ",
                     quotedMessage = mapper.map(
                         message, RoomUiModel(
-                        roles = chatRoles,
-                        isBroadcast = chatIsBroadcast
-                    )
+                            roles = chatRoles,
+                            isBroadcast = isBroadcast
+                        )
                     ).last().preview?.message ?: ""
                 )
             }
@@ -790,13 +839,15 @@ class ChatRoomPresenter @Inject constructor(
         }
     }
 
-    fun loadActiveMembers(
+    suspend fun loadActiveMembers(
         chatRoomId: String,
         chatRoomType: String,
         offset: Long = 0,
         filterSelfOut: Boolean = false
     ) {
-        launchUI(strategy) {
+        val activeUsers = mutableListOf<PeopleSuggestionUiModel>()
+
+        withContext(Dispatchers.IO + strategy.jobs) {
             try {
                 val members = retryIO("getMembers($chatRoomId, $chatRoomType, $offset)") {
                     client.getMembers(chatRoomId, roomTypeOf(chatRoomType), offset, 50).result
@@ -807,12 +858,12 @@ class ChatRoomPresenter @Inject constructor(
                 // Take at most the 100 most recent messages distinguished by user. Can return less.
                 val recentMessages = messagesRepository.getRecentMessages(chatRoomId, 100)
                     .filterNot { filterSelfOut && it.sender?.username == self }
-                val activeUsers = mutableListOf<PeopleSuggestionUiModel>()
                 recentMessages.forEach {
                     val sender = it.sender
                     val username = sender?.username ?: ""
                     val name = sender?.name ?: ""
-                    val avatarUrl = currentServer.avatarUrl(username)
+                    val avatarUrl =
+                        currentServer.avatarUrl(username, token?.userId, token?.authToken)
                     val found = members.firstOrNull { member -> member.username == username }
                     val status = if (found != null) found.status else UserStatus.Offline()
                     val searchList = mutableListOf(username, name)
@@ -833,7 +884,8 @@ class ChatRoomPresenter @Inject constructor(
                 activeUsers.addAll(others.map {
                     val username = it.username ?: ""
                     val name = it.name ?: ""
-                    val avatarUrl = currentServer.avatarUrl(username)
+                    val avatarUrl =
+                        currentServer.avatarUrl(username, token?.userId, token?.authToken)
                     val searchList = mutableListOf(username, name)
                     PeopleSuggestionUiModel(
                         avatarUrl,
@@ -846,11 +898,13 @@ class ChatRoomPresenter @Inject constructor(
                     )
                 })
 
-                view.populatePeopleSuggestions(activeUsers)
             } catch (e: RocketChatException) {
                 Timber.e(e)
             }
         }
+        launchUI(strategy) {
+            view.populatePeopleSuggestions(activeUsers)
+        }
     }
 
     fun spotlight(query: String, @AutoCompleteType type: Int, filterSelfOut: Boolean = false) {
@@ -869,7 +923,7 @@ class ChatRoomPresenter @Inject constructor(
                             val searchList = mutableListOf(username, name)
                             it.emails?.forEach { email -> searchList.add(email.address) }
                             PeopleSuggestionUiModel(
-                                currentServer.avatarUrl(username),
+                                currentServer.avatarUrl(username, token?.userId, token?.authToken),
                                 username, username, name, it.status, false, searchList
                             )
                         }.filterNot { filterSelfOut && self != null && self == it.text })
@@ -931,6 +985,7 @@ class ChatRoomPresenter @Inject constructor(
                     ChatRoom(
                         id = id,
                         subscriptionId = subscriptionId,
+                        parentId = parentId,
                         type = roomTypeOf(type),
                         unread = unread,
                         broadcast = broadcast ?: false,
@@ -962,47 +1017,49 @@ class ChatRoomPresenter @Inject constructor(
     }
 
     // TODO: move this to new interactor or FetchChatRoomsInteractor?
-    private suspend fun getChatRoomsAsync(name: String? = null): List<ChatRoom> = withContext(Dispatchers.IO) {
-        retryDB("getAllSync()") {
-            dbManager.chatRoomDao().getAllSync().filter {
-                if (name == null) {
-                    return@filter true
-                }
-                it.chatRoom.name == name || it.chatRoom.fullname == name
-            }.map {
-                with(it.chatRoom) {
-                    ChatRoom(
-                        id = id,
-                        subscriptionId = subscriptionId,
-                        type = roomTypeOf(type),
-                        unread = unread,
-                        broadcast = broadcast ?: false,
-                        alert = alert,
-                        fullName = fullname,
-                        name = name ?: "",
-                        favorite = favorite ?: false,
-                        default = isDefault ?: false,
-                        readonly = readonly,
-                        open = open,
-                        lastMessage = null,
-                        archived = false,
-                        status = null,
-                        user = null,
-                        userMentions = userMentions,
-                        client = client,
-                        announcement = null,
-                        description = null,
-                        groupMentions = groupMentions,
-                        roles = null,
-                        topic = null,
-                        lastSeen = this.lastSeen,
-                        timestamp = timestamp,
-                        updatedAt = updatedAt
-                    )
+    private suspend fun getChatRoomsAsync(name: String? = null): List<ChatRoom> =
+        withContext(Dispatchers.IO) {
+            retryDB("getAllSync()") {
+                dbManager.chatRoomDao().getAllSync().filter {
+                    if (name == null) {
+                        return@filter true
+                    }
+                    it.chatRoom.name == name || it.chatRoom.fullname == name
+                }.map {
+                    with(it.chatRoom) {
+                        ChatRoom(
+                            id = id,
+                            subscriptionId = subscriptionId,
+                            parentId = parentId,
+                            type = roomTypeOf(type),
+                            unread = unread,
+                            broadcast = broadcast ?: false,
+                            alert = alert,
+                            fullName = fullname,
+                            name = name ?: "",
+                            favorite = favorite ?: false,
+                            default = isDefault ?: false,
+                            readonly = readonly,
+                            open = open,
+                            lastMessage = null,
+                            archived = false,
+                            status = null,
+                            user = null,
+                            userMentions = userMentions,
+                            client = client,
+                            announcement = null,
+                            description = null,
+                            groupMentions = groupMentions,
+                            roles = null,
+                            topic = null,
+                            lastSeen = this.lastSeen,
+                            timestamp = timestamp,
+                            updatedAt = updatedAt
+                        )
+                    }
                 }
             }
         }
-    }
 
     fun joinChat(chatRoomId: String) {
         launchUI(strategy) {
@@ -1011,7 +1068,8 @@ class ChatRoomPresenter @Inject constructor(
                 val canPost = permissions.canPostToReadOnlyChannels()
                 dbManager.getRoom(chatRoomId)?.let {
                     val roomUiModel = roomMapper.map(it, true).copy(
-                        writable = canPost)
+                        writable = canPost
+                    )
                     view.onJoined(roomUiModel = roomUiModel)
                     view.onRoomUpdated(roomUiModel = roomUiModel)
                 }
@@ -1098,6 +1156,31 @@ class ChatRoomPresenter @Inject constructor(
         }
     }
 
+    fun reactToLastMessage(text: String, roomId: String) {
+        launchUI(strategy) {
+            lastMessageId?.let { messageId ->
+                val emoji = text.substring(1).trimEnd()
+                if (emoji.length >= 2 && emoji.startsWith(":") && emoji.endsWith(":")) {
+                    try {
+                        retryIO("toggleEmoji($messageId, $emoji)") {
+                            client.toggleReaction(messageId, emoji.removeSurrounding(":"))
+                        }
+                        logReactionEvent()
+                        view.clearMessageComposition(true)
+                    } catch (ex: RocketChatException) {
+                        Timber.e(ex)
+                        // emoji is not valid, post it
+                        sendMessage(roomId, text, null)
+                    }
+                } else {
+                    sendMessage(roomId, text, null)
+                }
+            }.ifNull {
+                sendMessage(roomId, text, null)
+            }
+        }
+    }
+
     private fun logReactionEvent() {
         when {
             roomTypeOf(chatRoomType) is RoomType.DirectMessage ->
@@ -1171,18 +1254,19 @@ class ChatRoomPresenter @Inject constructor(
                     sendMessage(roomId, text, null)
                 } else {
                     view.disableSendMessageButton()
-                    val command = text.split(" ")
-                    val name = command[0].substring(1)
+                    val index = text.indexOf(" ")
+                    var name = ""
                     var params = ""
-                    command.forEachIndexed { index, param ->
-                        if (index > 0) {
-                            params += "$param "
-                        }
+                    if (index >= 1) {
+                        name = text.substring(1, index)
+                        params = text.substring(index + 1).trim()
                     }
                     val result = retryIO("runCommand($name, $params, $roomId)") {
                         client.runCommand(Command(name, params), roomId)
                     }
-                    if (!result) {
+                    if (result) {
+                        view.clearMessageComposition(true)
+                    } else {
                         // failed, command is not valid so post it
                         sendMessage(roomId, text, null)
                     }
@@ -1260,7 +1344,7 @@ class ChatRoomPresenter @Inject constructor(
         launchUI(strategy) {
             val viewModelStreamedMessage = mapper.map(
                 streamedMessage, RoomUiModel(
-                    roles = chatRoles, isBroadcast = chatIsBroadcast, isRoom = true
+                    roles = chatRoles, isBroadcast = isBroadcast, isRoom = true
                 )
             )
             val roomMessages = messagesRepository.getByRoomId(streamedMessage.roomId)
@@ -1295,6 +1379,7 @@ class ChatRoomPresenter @Inject constructor(
     fun clearDraftMessage() {
         localRepository.clear(draftKey)
     }
+
     /**
      * Get unfinished message from local repository, when user left chat room without
      * sending a message and now the user is back.
diff --git a/app/src/main/java/chat/rocket/android/chatroom/service/MessageService.kt b/app/src/main/java/chat/rocket/android/chatroom/service/MessageService.kt
index 14bdb6dbb7..53fbb16f2e 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/service/MessageService.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/service/MessageService.kt
@@ -4,9 +4,9 @@ import android.app.job.JobParameters
 import android.app.job.JobService
 import chat.rocket.android.db.DatabaseManagerFactory
 import chat.rocket.android.server.domain.GetAccountsInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.DatabaseMessageMapper
-import chat.rocket.android.server.infraestructure.DatabaseMessagesRepository
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.DatabaseMessageMapper
+import chat.rocket.android.server.infrastructure.DatabaseMessagesRepository
 import chat.rocket.core.internal.rest.sendMessage
 import chat.rocket.core.model.Message
 import dagger.android.AndroidInjection
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt
index c881a45621..207a9f8a07 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomActivity.kt
@@ -10,7 +10,7 @@ import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 import chat.rocket.android.chatroom.presentation.ChatRoomNavigator
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extensions.addFragment
 import chat.rocket.android.util.extensions.textContent
 import dagger.android.AndroidInjection
@@ -139,7 +139,7 @@ class ChatRoomActivity : AppCompatActivity(), HasSupportFragmentInjector {
     }
 
     fun setupExpandMoreForToolbar(listener: (View) -> Unit) {
-        DrawableHelper.compoundRightDrawable(
+        DrawableHelper.compoundEndDrawable(
             text_toolbar_title,
             DrawableHelper.getDrawableFromId(R.drawable.ic_chatroom_toolbar_expand_more_20dp, this)
         )
diff --git a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
index a597ebe238..9f60804723 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
@@ -5,6 +5,7 @@ import android.content.ClipData
 import android.content.ClipboardManager
 import android.content.Context
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.drawable.Drawable
 import android.net.Uri
 import android.os.Bundle
@@ -28,14 +29,17 @@ import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.recyclerview.widget.DefaultItemAnimator
+import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.chatroom.adapter.AttachmentViewHolder
 import chat.rocket.android.chatroom.adapter.ChatRoomAdapter
 import chat.rocket.android.chatroom.adapter.CommandSuggestionsAdapter
 import chat.rocket.android.chatroom.adapter.EmojiSuggestionsAdapter
+import chat.rocket.android.chatroom.adapter.MessageViewHolder
 import chat.rocket.android.chatroom.adapter.PEOPLE
 import chat.rocket.android.chatroom.adapter.PeopleSuggestionsAdapter
 import chat.rocket.android.chatroom.adapter.RoomSuggestionsAdapter
@@ -61,11 +65,16 @@ import chat.rocket.android.emoji.EmojiPickerPopup
 import chat.rocket.android.emoji.EmojiReactionListener
 import chat.rocket.android.emoji.internal.isCustom
 import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
-import chat.rocket.android.helper.ImageHelper
 import chat.rocket.android.helper.KeyboardHelper
 import chat.rocket.android.helper.MessageParser
+import chat.rocket.android.helper.AndroidPermissionsHelper
+import chat.rocket.android.helper.AndroidPermissionsHelper.getCameraPermission
+import chat.rocket.android.helper.AndroidPermissionsHelper.getWriteExternalStoragePermission
+import chat.rocket.android.helper.AndroidPermissionsHelper.hasCameraPermission
+import chat.rocket.android.helper.AndroidPermissionsHelper.hasWriteExternalStoragePermission
 import chat.rocket.android.util.extension.asObservable
 import chat.rocket.android.util.extension.createImageFile
+import chat.rocket.android.util.extension.orFalse
 import chat.rocket.android.util.extensions.circularRevealOrUnreveal
 import chat.rocket.android.util.extensions.clearLightStatusBar
 import chat.rocket.android.util.extensions.fadeIn
@@ -81,6 +90,7 @@ import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.core.internal.realtime.socket.model.State
 import com.bumptech.glide.Glide
+import com.google.android.material.snackbar.Snackbar
 import dagger.android.support.AndroidSupportInjection
 import io.reactivex.Observable
 import io.reactivex.disposables.CompositeDisposable
@@ -149,7 +159,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     lateinit var analyticsManager: AnalyticsManager
     @Inject
     lateinit var navigator: ChatRoomNavigator
-    private lateinit var adapter: ChatRoomAdapter
+    private lateinit var chatRoomAdapter: ChatRoomAdapter
     internal lateinit var chatRoomId: String
     private lateinit var chatRoomName: String
     internal lateinit var chatRoomType: String
@@ -268,7 +278,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
-        setHasOptionsMenu(true)
 
         arguments?.run {
             chatRoomId = getString(BUNDLE_CHAT_ROOM_ID, "")
@@ -283,7 +292,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
             ?: requireNotNull(arguments) { "no arguments supplied when the fragment was instantiated" }
 
-        adapter = ChatRoomAdapter(
+        chatRoomAdapter = ChatRoomAdapter(
             roomId = chatRoomId,
             roomType = chatRoomType,
             roomName = chatRoomName,
@@ -292,6 +301,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             navigator = navigator,
             analyticsManager = analyticsManager
         )
+
+        setHasOptionsMenu(true)
     }
 
     override fun onCreateView(
@@ -380,7 +391,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     override fun showMessages(dataSet: List<BaseUiModel<*>>, clearDataSet: Boolean) {
         ui {
             if (clearDataSet) {
-                adapter.clearData()
+                chatRoomAdapter.clearData()
             }
 
             if (dataSet.isNotEmpty()) {
@@ -421,35 +432,22 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 }
             }
 
-            if (recycler_view.adapter == null) {
-                recycler_view.adapter = adapter
-                if (dataSet.size >= 30) {
-                    recycler_view.addOnScrollListener(endlessRecyclerViewScrollListener)
-                }
-                recycler_view.addOnLayoutChangeListener(layoutChangeListener)
-                recycler_view.addOnScrollListener(onScrollListener)
-
-                // Load just once, on the first page...
-                presenter.loadActiveMembers(chatRoomId, chatRoomType, filterSelfOut = true)
-            }
-
-            val oldMessagesCount = adapter.itemCount
-            adapter.appendData(dataSet)
+            val oldMessagesCount = chatRoomAdapter.itemCount
+            chatRoomAdapter.appendData(dataSet)
             if (oldMessagesCount == 0 && dataSet.isNotEmpty()) {
                 recycler_view.scrollToPosition(0)
                 verticalScrollOffset.set(0)
             }
-            presenter.loadActiveMembers(chatRoomId, chatRoomType, filterSelfOut = true)
-            empty_chat_view.isVisible = adapter.itemCount == 0
+            empty_chat_view.isVisible = chatRoomAdapter.itemCount == 0
             dismissEmojiKeyboard()
         }
     }
 
     override fun showSearchedMessages(dataSet: List<BaseUiModel<*>>) {
         recycler_view.removeOnScrollListener(endlessRecyclerViewScrollListener)
-        adapter.clearData()
-        adapter.prependData(dataSet)
-        empty_chat_view.isVisible = adapter.itemCount == 0
+        chatRoomAdapter.clearData()
+        chatRoomAdapter.prependData(dataSet)
+        empty_chat_view.isVisible = chatRoomAdapter.itemCount == 0
         dismissEmojiKeyboard()
     }
 
@@ -460,21 +458,21 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             setupToolbar(roomUiModel.name.toString())
             setupMessageComposer(roomUiModel)
             isBroadcastChannel = roomUiModel.broadcast
-            if (isBroadcastChannel && !roomUiModel.canModerate) {
-                disableMenu = true
-                activity?.invalidateOptionsMenu()
-            }
+            isFavorite = roomUiModel.favorite.orFalse()
+            disableMenu = (roomUiModel.broadcast && !roomUiModel.canModerate)
+            activity?.invalidateOptionsMenu()
         }
     }
 
-
     override fun sendMessage(text: String) {
         ui {
             if (!text.isBlank()) {
-                if (!text.startsWith("/")) {
-                    presenter.sendMessage(chatRoomId, text, editingMessageId)
-                } else {
+                if (text.startsWith("/")) {
                     presenter.runCommand(text, chatRoomId)
+                } else if (text.startsWith("+")) {
+                    presenter.reactToLastMessage(text, chatRoomId)
+                } else {
+                    presenter.sendMessage(chatRoomId, text, editingMessageId)
                 }
             }
         }
@@ -519,7 +517,6 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
-
     override fun clearMessageComposition(deleteMessage: Boolean) {
         ui {
             citation = null
@@ -533,7 +530,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
     override fun showNewMessage(message: List<BaseUiModel<*>>, isMessageReceived: Boolean) {
         ui {
-            adapter.prependData(message)
+            chatRoomAdapter.prependData(message)
             if (isMessageReceived && button_fab.isVisible) {
                 newMessageCount++
                 if (newMessageCount <= 99) {
@@ -546,7 +543,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 recycler_view.scrollToPosition(0)
             }
             verticalScrollOffset.set(0)
-            empty_chat_view.isVisible = adapter.itemCount == 0
+            empty_chat_view.isVisible = chatRoomAdapter.itemCount == 0
             dismissEmojiKeyboard()
         }
     }
@@ -556,9 +553,9 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             // TODO - investigate WHY we get a empty list here
             if (message.isEmpty()) return@ui
 
-            if (adapter.updateItem(message.last())) {
+            if (chatRoomAdapter.updateItem(message.last())) {
                 if (message.size > 1) {
-                    adapter.prependData(listOf(message.first()))
+                    chatRoomAdapter.prependData(listOf(message.first()))
                 }
             } else {
                 showNewMessage(message, true)
@@ -569,7 +566,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
     override fun dispatchDeleteMessage(msgId: String) {
         ui {
-            adapter.removeItem(msgId)
+            chatRoomAdapter.removeItem(msgId)
         }
     }
 
@@ -596,45 +593,31 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
     }
 
     override fun showMessage(message: String) {
-        ui {
-            showToast(message)
-        }
+        ui { showToast(message) }
     }
 
     override fun showMessage(resId: Int) {
-        ui {
-            showToast(resId)
-        }
+        ui { showToast(resId) }
     }
 
     override fun showGenericErrorMessage() {
-        ui {
-            showMessage(getString(R.string.msg_generic_error))
-        }
+        ui { showMessage(getString(R.string.msg_generic_error)) }
     }
 
     override fun populatePeopleSuggestions(members: List<PeopleSuggestionUiModel>) {
-        ui {
-            suggestions_view.addItems("@", members)
-        }
+        ui { suggestions_view.addItems("@", members) }
     }
 
     override fun populateRoomSuggestions(chatRooms: List<ChatRoomSuggestionUiModel>) {
-        ui {
-            suggestions_view.addItems("#", chatRooms)
-        }
+        ui { suggestions_view.addItems("#", chatRooms) }
     }
 
     override fun populateCommandSuggestions(commands: List<CommandSuggestionUiModel>) {
-        ui {
-            suggestions_view.addItems("/", commands)
-        }
+        ui { suggestions_view.addItems("/", commands) }
     }
 
     override fun populateEmojiSuggestions(emojis: List<EmojiSuggestionUiModel>) {
-        ui {
-            suggestions_view.addItems(":", emojis)
-        }
+        ui { suggestions_view.addItems(":", emojis) }
     }
 
     override fun copyToClipboard(message: String) {
@@ -812,7 +795,56 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
                 presenter.loadMessages(chatRoomId, chatRoomType, page * 30L)
             }
         }
-        recycler_view.addOnScrollListener(fabScrollListener)
+
+        with (recycler_view) {
+            adapter = chatRoomAdapter
+            addOnScrollListener(endlessRecyclerViewScrollListener)
+            addOnLayoutChangeListener(layoutChangeListener)
+            addOnScrollListener(onScrollListener)
+            addOnScrollListener(fabScrollListener)
+        }
+        if (!isReadOnly) {
+            val touchCallback: ItemTouchHelper.SimpleCallback =
+                object : ItemTouchHelper.SimpleCallback(0, ItemTouchHelper.LEFT) {
+                    override fun onMove(
+                        recyclerView: RecyclerView,
+                        viewHolder: RecyclerView.ViewHolder,
+                        target: RecyclerView.ViewHolder
+                    ): Boolean {
+                        return true
+                    }
+
+                    override fun onSwiped(viewHolder: RecyclerView.ViewHolder, direction: Int) {
+                        var replyId: String? = null
+
+                        when (viewHolder) {
+                            is MessageViewHolder -> replyId = viewHolder.data?.messageId
+                            is AttachmentViewHolder -> replyId = viewHolder.data?.messageId
+                        }
+
+                        replyId?.let {
+                            citeMessage(chatRoomName, chatRoomType, it, true)
+                        }
+
+                        chatRoomAdapter.notifyItemChanged(viewHolder.adapterPosition)
+                    }
+
+                    override fun getSwipeDirs(
+                        recyclerView: RecyclerView,
+                        viewHolder: RecyclerView.ViewHolder
+                    ): Int {
+                        // Currently enable swipes for text and attachment messages only
+
+                        if (viewHolder is MessageViewHolder || viewHolder is AttachmentViewHolder) {
+                            return super.getSwipeDirs(recyclerView, viewHolder)
+                        }
+
+                        return 0
+                    }
+                }
+
+            ItemTouchHelper(touchCallback).attachToRecyclerView(recycler_view)
+        }
     }
 
     private fun setupFab() {
@@ -903,8 +935,14 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
             button_add_reaction_or_show_keyboard.setOnClickListener { toggleKeyboard() }
 
             button_take_a_photo.setOnClickListener {
-                dispatchTakePictureIntent()
-
+                // Check for camera permission
+                context?.let {
+                    if (hasCameraPermission(it)) {
+                        dispatchTakePictureIntent()
+                    } else {
+                        getCameraPermission(this)
+                    }
+                }
                 handler.postDelayed({
                     hideAttachmentOptions()
                 }, 400)
@@ -922,11 +960,10 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
 
             button_drawing.setOnClickListener {
                 activity?.let { fragmentActivity ->
-                    if (!ImageHelper.canWriteToExternalStorage(fragmentActivity)) {
-                        ImageHelper.checkWritingPermission(fragmentActivity)
+                    if (!hasWriteExternalStoragePermission(fragmentActivity)) {
+                        getWriteExternalStoragePermission(this)
                     } else {
-                        val intent = Intent(fragmentActivity, DrawingActivity::class.java)
-                        startActivityForResult(intent, REQUEST_CODE_FOR_DRAW)
+                        dispatchDrawingIntent()
                     }
                 }
 
@@ -937,6 +974,11 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
+    private fun dispatchDrawingIntent() {
+        val intent = Intent(activity, DrawingActivity::class.java)
+        startActivityForResult(intent, REQUEST_CODE_FOR_DRAW)
+    }
+
     private fun dispatchTakePictureIntent() {
         Intent(MediaStore.ACTION_IMAGE_CAPTURE).also { takePictureIntent ->
             // Create the File where the photo should go
@@ -957,6 +999,44 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
         }
     }
 
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        when (requestCode) {
+            AndroidPermissionsHelper.CAMERA_CODE -> {
+                if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    // permission was granted
+                    dispatchTakePictureIntent()
+                } else {
+                    // permission denied
+                    Snackbar.make(
+                        root_layout,
+                        R.string.msg_camera_permission_denied,
+                        Snackbar.LENGTH_SHORT
+                    ).show()
+                }
+                return
+            }
+            AndroidPermissionsHelper.WRITE_EXTERNAL_STORAGE_CODE -> {
+                if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    // permission was granted
+                    dispatchDrawingIntent()
+                } else {
+                    // permission denied
+                    Snackbar.make(
+                        root_layout,
+                        R.string.msg_storage_permission_denied,
+                        Snackbar.LENGTH_SHORT
+                    ).show()
+                }
+                return
+            }
+        }
+    }
+
     private fun getDraftMessage() {
         val unfinishedMessage = presenter.getDraftUnfinishedMessage()
         if (unfinishedMessage.isNotNullNorEmpty()) {
diff --git a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
index 3cdd187d40..4a1be35286 100644
--- a/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/chatroom/uimodel/UiModelMapper.kt
@@ -30,7 +30,7 @@ import chat.rocket.android.server.domain.baseUrl
 import chat.rocket.android.server.domain.messageReadReceiptEnabled
 import chat.rocket.android.server.domain.messageReadReceiptStoreUsers
 import chat.rocket.android.server.domain.useRealName
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.isImage
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.ifNotNullNorEmpty
@@ -108,7 +108,7 @@ class UiModelMapper @Inject constructor(
         readReceipts.forEach {
             list.add(
                 ReadReceiptViewModel(
-                    avatar = baseUrl.avatarUrl(it.user.username ?: ""),
+                    avatar = baseUrl.avatarUrl(it.user.username!!, token?.userId, token?.authToken),
                     name = userHelper.displayName(it.user),
                     time = DateTimeHelper.getTime(DateTimeHelper.getLocalDateTime(it.timestamp))
                 )
@@ -173,6 +173,7 @@ class UiModelMapper @Inject constructor(
                 ChatRoom(
                     id = id,
                     subscriptionId = subscriptionId,
+                    parentId = parentId,
                     type = roomTypeOf(type),
                     unread = unread,
                     broadcast = broadcast ?: false,
@@ -527,7 +528,7 @@ class UiModelMapper @Inject constructor(
 
         val username = message.sender?.username ?: "?"
         return baseUrl.let {
-            baseUrl.avatarUrl(username)
+            baseUrl.avatarUrl(username, token?.userId, token?.authToken)
         }
     }
 
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
index 0dc298d137..739f4adbc6 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomUiModelMapper.kt
@@ -8,11 +8,13 @@ import chat.rocket.android.db.model.ChatRoom
 import chat.rocket.android.server.domain.GetCurrentUserInteractor
 import chat.rocket.android.server.domain.PermissionsInteractor
 import chat.rocket.android.server.domain.PublicSettings
+import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.showLastMessage
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.domain.useSpecialCharsOnRoom
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.date
+import chat.rocket.android.util.extensions.isNotNullNorEmpty
 import chat.rocket.android.util.extensions.localDateTime
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.User
@@ -26,10 +28,12 @@ class RoomUiModelMapper(
     private val context: Application,
     private val settings: PublicSettings,
     private val userInteractor: GetCurrentUserInteractor,
+    private val tokenRepository: TokenRepository,
     private val serverUrl: String,
     private val permissions: PermissionsInteractor
 ) {
     private val currentUser by lazy { userInteractor.get() }
+    private val token by lazy { tokenRepository.get(serverUrl) }
 
     fun map(
         rooms: List<ChatRoom>,
@@ -80,7 +84,7 @@ class RoomUiModelMapper(
     private fun mapUser(user: User): RoomUiModel = with(user) {
         val name = mapName(user.username!!, user.name)
         val status = user.status
-        val avatar = serverUrl.avatarUrl(user.username!!)
+        val avatar = serverUrl.avatarUrl(user.username!!, token?.userId, token?.authToken)
         val username = user.username!!
 
         RoomUiModel(
@@ -98,7 +102,7 @@ class RoomUiModelMapper(
                 id = id,
                 name = name!!,
                 type = type,
-                avatar = serverUrl.avatarUrl(name!!, isGroupOrChannel = true),
+                avatar = serverUrl.avatarUrl(name!!, token?.userId, token?.authToken, isGroupOrChannel = true),
                 lastMessage = if (showLastMessage) {
                     mapLastMessage(
                         lastMessage?.sender?.id,
@@ -115,36 +119,40 @@ class RoomUiModelMapper(
         )
     }
 
-    fun map(chatRoom: ChatRoom, showLastMessage: Boolean = true): RoomUiModel = with(chatRoom.chatRoom) {
-        val isUnread = alert || unread > 0
-        val type = roomTypeOf(type)
-        val status = chatRoom.status?.let { userStatusOf(it) }
-        val roomName = mapName(name, fullname)
-        val favorite = favorite
-        val timestamp = mapDate(lastMessageTimestamp ?: updatedAt)
-        val avatar = if (type is RoomType.DirectMessage) {
-            serverUrl.avatarUrl(name)
-        } else {
-            serverUrl.avatarUrl(name, isGroupOrChannel = true)
-        }
-        val unread = mapUnread(unread)
-        val lastMessage = if (showLastMessage) {
-            mapLastMessage(
+    fun map(chatRoom: ChatRoom, showLastMessage: Boolean = true): RoomUiModel =
+        with(chatRoom.chatRoom) {
+            val isUnread = alert || unread > 0
+            val type = roomTypeOf(type)
+            val status = chatRoom.status?.let { userStatusOf(it) }
+            val roomName = mapName(name, fullname)
+            val favorite = favorite
+            val timestamp = mapDate(lastMessageTimestamp ?: updatedAt)
+            val avatar =
+                if (type is RoomType.DirectMessage) {
+                    serverUrl.avatarUrl(name, token?.userId, token?.authToken)
+                } else {
+                    serverUrl.avatarUrl(name, token?.userId, token?.authToken, isGroupOrChannel = true)
+                }
+            val unread = mapUnread(unread)
+            val lastMessage = if (showLastMessage) {
+                mapLastMessage(
                     lastMessageUserId,
                     chatRoom.lastMessageUserName,
                     chatRoom.lastMessageUserFullName,
                     lastMessageText,
                     type is RoomType.DirectMessage
-            )
-        } else {
-            null
-        }
-        val hasMentions = mapMentions(userMentions, groupMentions)
-        val open = open
-        val lastMessageMarkdown = lastMessage?.let { Markwon.markdown(context, it.toString()).toString() }
+                )
+            } else {
+                null
+            }
+            val hasMentions = mapMentions(userMentions, groupMentions)
+            val open = open
+            val lastMessageMarkdown =
+                lastMessage?.let { Markwon.markdown(context, it.toString()).toString() }
 
-        RoomUiModel(
+            RoomUiModel(
                 id = id,
+                isDiscussion = parentId.isNotNullNorEmpty(),
                 name = roomName,
                 type = type,
                 avatar = avatar,
@@ -159,8 +167,8 @@ class RoomUiModelMapper(
                 username = if (type is RoomType.DirectMessage) name else null,
                 muted = muted.orEmpty(),
                 writable = isChannelWritable(muted)
-        )
-    }
+            )
+        }
 
     private fun isChannelWritable(muted: List<String>?): Boolean {
         val canWriteToReadOnlyChannels = permissions.canPostToReadOnlyChannels()
@@ -169,7 +177,7 @@ class RoomUiModelMapper(
 
     private fun roomType(type: String): String = with(context.resources) {
         when (type) {
-            RoomType.CHANNEL -> getString(R.string.header_channel)
+            RoomType.CHANNEL -> getString(R.string.msg_channels)
             RoomType.PRIVATE_GROUP -> getString(R.string.header_private_groups)
             RoomType.DIRECT_MESSAGE -> getString(R.string.header_direct_messages)
             RoomType.LIVECHAT -> getString(R.string.header_live_chats)
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
index 2317178adf..9a4da09a36 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/RoomViewHolder.kt
@@ -3,6 +3,7 @@ package chat.rocket.android.chatrooms.adapter
 import android.content.res.Resources
 import android.graphics.drawable.Drawable
 import android.view.View
+import android.widget.TextView
 import androidx.core.view.isGone
 import androidx.core.view.isInvisible
 import androidx.core.view.isVisible
@@ -11,14 +12,17 @@ import chat.rocket.android.chatrooms.adapter.model.RoomUiModel
 import chat.rocket.android.util.extension.setTextViewAppearance
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.UserStatus
+import com.bumptech.glide.Glide
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners
+import com.bumptech.glide.request.RequestOptions
 import kotlinx.android.synthetic.main.item_chat.view.*
-import kotlinx.android.synthetic.main.unread_messages_badge.view.*
 
 class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit) :
     ViewHolder<RoomItemHolder>(itemView) {
     private val resources: Resources = itemView.resources
     private val channelIcon: Drawable = resources.getDrawable(R.drawable.ic_hashtag_12dp, null)
     private val groupIcon: Drawable = resources.getDrawable(R.drawable.ic_lock_12_dp, null)
+    private val discussionIcon: Drawable = resources.getDrawable(R.drawable.ic_discussion_20dp, null)
     private val onlineIcon: Drawable = resources.getDrawable(R.drawable.ic_status_online_12dp, null)
     private val awayIcon: Drawable = resources.getDrawable(R.drawable.ic_status_away_12dp, null)
     private val busyIcon: Drawable = resources.getDrawable(R.drawable.ic_status_busy_12dp, null)
@@ -27,10 +31,16 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
     override fun bindViews(data: RoomItemHolder) {
         val room = data.data
         with(itemView) {
-            image_avatar.setImageURI(room.avatar)
+            Glide.with(image_avatar.context)
+                .load(room.avatar)
+                .apply(RequestOptions.bitmapTransform(RoundedCorners(10)))
+                .into(image_avatar)
+
             text_chat_name.text = room.name
 
-            if (room.status != null && room.type is RoomType.DirectMessage) {
+            if (room.isDiscussion) {
+                image_chat_icon.setImageDrawable(discussionIcon)
+            } else if (room.status != null && room.type is RoomType.DirectMessage) {
                 image_chat_icon.setImageDrawable(getStatusDrawable(room.status))
             } else {
                 image_chat_icon.setImageDrawable(getRoomDrawable(room.type))
@@ -51,6 +61,7 @@ class RoomViewHolder(itemView: View, private val listener: (RoomUiModel) -> Unit
             }
 
             if (room.alert) {
+                val text_total_unread_messages = text_total_unread_messages as TextView
                 if (room.unread == null) text_total_unread_messages.text = "!"
                 if (room.unread != null) text_total_unread_messages.text = room.unread
                 if (room.mentions) text_total_unread_messages.text = "@${room.unread}"
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt b/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
index 8531d41a70..4b536b3d4f 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/adapter/model/RoomUiModel.kt
@@ -5,6 +5,7 @@ import chat.rocket.common.model.UserStatus
 
 data class RoomUiModel(
     val id: String,
+    val isDiscussion: Boolean = false,
     val type: RoomType,
     val name: CharSequence,
     val avatar: String,
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt b/app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt
index f231837cd1..bea2578b3a 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/di/ChatRoomsFragmentModule.kt
@@ -10,15 +10,14 @@ import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.db.ChatRoomDao
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.db.UserDao
-import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.GetCurrentUserInteractor
 import chat.rocket.android.server.domain.PermissionsInteractor
 import chat.rocket.android.server.domain.PublicSettings
 import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.infraestructure.ConnectionManager
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.ConnectionManager
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.core.RocketChatClient
 import dagger.Module
 import dagger.Provides
@@ -45,7 +44,7 @@ class ChatRoomsFragmentModule {
         factory: RocketChatClientFactory,
         @Named("currentServer") currentServer: String
     ): RocketChatClient {
-        return factory.create(currentServer)
+        return factory.get(currentServer)
     }
 
     @Provides
@@ -87,12 +86,20 @@ class ChatRoomsFragmentModule {
     @PerFragment
     fun provideRoomMapper(
         context: Application,
-        repository: SettingsRepository,
+        settingsRepository: SettingsRepository,
         userInteractor: GetCurrentUserInteractor,
+        tokenRepository: TokenRepository,
         @Named("currentServer") serverUrl: String,
         permissionsInteractor: PermissionsInteractor
     ): RoomUiModelMapper {
-        return RoomUiModelMapper(context, repository.get(serverUrl), userInteractor, serverUrl, permissionsInteractor)
+        return RoomUiModelMapper(
+            context,
+            settingsRepository.get(serverUrl),
+            userInteractor,
+            tokenRepository,
+            serverUrl,
+            permissionsInteractor
+        )
     }
 
     @Provides
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/infrastructure/ChatRoomsRepository.kt b/app/src/main/java/chat/rocket/android/chatrooms/infrastructure/ChatRoomsRepository.kt
index 41850a4cb1..96695c4039 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/infrastructure/ChatRoomsRepository.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/infrastructure/ChatRoomsRepository.kt
@@ -15,6 +15,10 @@ class ChatRoomsRepository @Inject constructor(private val dao: ChatRoomDao) {
             Order.GROUPED_ACTIVITY -> dao.getAllGrouped()
             Order.NAME -> dao.getAllAlphabetically()
             Order.GROUPED_NAME -> dao.getAllAlphabeticallyGrouped()
+            Order.UNREAD_ON_TOP_ACTIVITY -> dao.getAllUnread();
+            Order.UNREAD_ON_TOP_NAME -> dao.getAllAlphabeticallyUnread();
+            Order.UNREAD_ON_TOP_GROUPED_ACTIVITY -> dao.getAllGroupedUnread();
+            Order.UNREAD_ON_TOP_GROUPED_NAME -> dao.getAllAlphabeticallyGroupedUnread();
         }
     }
 
@@ -28,8 +32,16 @@ class ChatRoomsRepository @Inject constructor(private val dao: ChatRoomDao) {
         GROUPED_ACTIVITY,
         NAME,
         GROUPED_NAME,
+        UNREAD_ON_TOP_ACTIVITY,
+        UNREAD_ON_TOP_NAME,
+        UNREAD_ON_TOP_GROUPED_ACTIVITY,
+        UNREAD_ON_TOP_GROUPED_NAME
     }
 }
 
 fun ChatRoomsRepository.Order.isGrouped(): Boolean = this == ChatRoomsRepository.Order.GROUPED_ACTIVITY
-        || this == ChatRoomsRepository.Order.GROUPED_NAME
\ No newline at end of file
+        || this == ChatRoomsRepository.Order.GROUPED_NAME
+
+fun ChatRoomsRepository.Order.isUnreadOnTop(): Boolean = this == ChatRoomsRepository.Order.UNREAD_ON_TOP_ACTIVITY
+        || this == ChatRoomsRepository.Order.UNREAD_ON_TOP_NAME
+
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt b/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
index 4f1ee432d2..5646f96bb3 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsPresenter.kt
@@ -10,9 +10,11 @@ import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.server.domain.SettingsRepository
+import chat.rocket.android.server.domain.SortingAndGroupingInteractor
+import chat.rocket.android.server.domain.siteName
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.server.domain.useSpecialCharsOnRoom
-import chat.rocket.android.server.infraestructure.ConnectionManager
+import chat.rocket.android.server.infrastructure.ConnectionManager
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryDB
 import chat.rocket.android.util.retryIO
@@ -35,6 +37,7 @@ class ChatRoomsPresenter @Inject constructor(
     private val strategy: CancelStrategy,
     private val navigator: MainNavigator,
     @Named("currentServer") private val currentServer: String,
+    private val sortingAndGroupingInteractor: SortingAndGroupingInteractor,
     private val dbManager: DatabaseManager,
     manager: ConnectionManager,
     private val localRepository: LocalRepository,
@@ -44,29 +47,44 @@ class ChatRoomsPresenter @Inject constructor(
     private val client = manager.client
     private val settings = settingsRepository.get(currentServer)
 
+    fun toCreateChannel() = navigator.toCreateChannel()
+
+    fun toSettings() = navigator.toSettings()
+
+    fun toDirectory() = navigator.toDirectory()
+
+    fun getCurrentServerName() = view.setupToolbar(settings.siteName() ?: currentServer)
+
+    fun getSortingAndGroupingPreferences() {
+        with(sortingAndGroupingInteractor) {
+            view.setupSortingAndGrouping(
+                getSortByName(currentServer),
+                getUnreadOnTop(currentServer),
+                getGroupByType(currentServer),
+                getGroupByFavorites(currentServer)
+            )
+        }
+    }
+
     fun loadChatRoom(roomId: String) {
         launchUI(strategy) {
-            view.showLoadingRoom("")
             try {
                 val room = dbManager.getRoom(roomId)
                 if (room != null) {
                     loadChatRoom(room.chatRoom, true)
                 } else {
-                    Timber.d("Error loading channel")
+                    Timber.e("Error loading channel")
                     view.showGenericErrorMessage()
                 }
             } catch (ex: Exception) {
-                Timber.d(ex, "Error loading channel")
+                Timber.e(ex, "Error loading channel")
                 view.showGenericErrorMessage()
-            } finally {
-                view.hideLoadingRoom()
             }
         }
     }
 
     fun loadChatRoom(chatRoom: RoomUiModel) {
         launchUI(strategy) {
-            view.showLoadingRoom(chatRoom.name)
             try {
                 val room = retryDB("getRoom(${chatRoom.id}") { dbManager.getRoom(chatRoom.id) }
                 if (room != null) {
@@ -76,6 +94,7 @@ class ChatRoomsPresenter @Inject constructor(
                         val entity = ChatRoomEntity(
                             id = id,
                             subscriptionId = "",
+                            parentId = null,
                             type = type.toString(),
                             name = username ?: name.toString(),
                             fullname = name.toString(),
@@ -86,10 +105,8 @@ class ChatRoomsPresenter @Inject constructor(
                     }
                 }
             } catch (ex: Exception) {
-                Timber.d(ex, "Error loading channel")
+                Timber.e(ex, "Error loading channel")
                 view.showGenericErrorMessage()
-            } finally {
-                view.hideLoadingRoom()
             }
         }
     }
@@ -97,11 +114,12 @@ class ChatRoomsPresenter @Inject constructor(
     suspend fun loadChatRoom(chatRoom: ChatRoomEntity, local: Boolean = false) {
         with(chatRoom) {
             val isDirectMessage = roomTypeOf(type) is RoomType.DirectMessage
-            val roomName = if (settings.useSpecialCharsOnRoom() || (isDirectMessage && settings.useRealName())) {
-                fullname ?: name
-            } else {
-                name
-            }
+            val roomName =
+                if (settings.useSpecialCharsOnRoom() || (isDirectMessage && settings.useRealName())) {
+                    fullname ?: name
+                } else {
+                    name
+                }
 
             val myself = getCurrentUser()
             if (myself?.username == null) {
@@ -131,14 +149,14 @@ class ChatRoomsPresenter @Inject constructor(
                 }
 
                 navigator.toChatRoom(
-                        chatRoomId = id,
-                        chatRoomName = roomName,
-                        chatRoomType = type,
-                        isReadOnly = readonly ?: false,
-                        chatRoomLastSeen = lastSeen ?: -1,
-                        isSubscribed = open,
-                        isCreator = ownerId == myself.id || isDirectMessage,
-                        isFavorite = favorite ?: false
+                    chatRoomId = id,
+                    chatRoomName = roomName,
+                    chatRoomType = type,
+                    isReadOnly = readonly ?: false,
+                    chatRoomLastSeen = lastSeen ?: -1,
+                    isSubscribed = open,
+                    isCreator = ownerId == myself.id || isDirectMessage,
+                    isFavorite = favorite ?: false
                 )
             }
         }
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsView.kt b/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsView.kt
index 638abd4234..e40130f71f 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsView.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/presentation/ChatRoomsView.kt
@@ -4,7 +4,27 @@ import chat.rocket.android.core.behaviours.LoadingView
 import chat.rocket.android.core.behaviours.MessageView
 
 interface ChatRoomsView : LoadingView, MessageView {
-    fun showLoadingRoom(name: CharSequence)
 
-    fun hideLoadingRoom()
+    /**
+     * Setups the toolbar with the current logged in server name.
+     *
+     * @param serverName The current logged in server name to show on Toolbar.
+     */
+    fun setupToolbar(serverName: String)
+
+    /**
+     * Setups the sorting and grouping in the bases of the user preference for
+     * the current logged in server.
+     *
+     * @param isSortByName True if sorting by name, false otherwise.
+     * @param isUnreadOnTop True if grouping by unread on top, false otherwise.
+     * @param isGroupByType True if grouping by type , false otherwise.
+     * @param isGroupByFavorites True if grouping by favorites, false otherwise.
+     */
+    fun setupSortingAndGrouping(
+        isSortByName: Boolean,
+        isUnreadOnTop: Boolean,
+        isGroupByType: Boolean,
+        isGroupByFavorites: Boolean
+    )
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
index 58f3355722..33bb481171 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
@@ -1,19 +1,15 @@
 package chat.rocket.android.chatrooms.ui
 
-import androidx.appcompat.app.AlertDialog
-import android.app.ProgressDialog
 import android.os.Bundle
-import android.os.Handler
 import android.view.LayoutInflater
 import android.view.Menu
 import android.view.MenuInflater
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.widget.CheckBox
-import android.widget.RadioGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.widget.SearchView
+import androidx.core.view.isGone
 import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
@@ -30,12 +26,9 @@ import chat.rocket.android.chatrooms.viewmodel.ChatRoomsViewModel
 import chat.rocket.android.chatrooms.viewmodel.ChatRoomsViewModelFactory
 import chat.rocket.android.chatrooms.viewmodel.LoadingState
 import chat.rocket.android.chatrooms.viewmodel.Query
-import chat.rocket.android.helper.ChatRoomsSortOrder
-import chat.rocket.android.helper.Constants
-import chat.rocket.android.helper.SharedPreferenceHelper
+import chat.rocket.android.servers.ui.ServersBottomSheetFragment
+import chat.rocket.android.sortingandgrouping.ui.SortingAndGroupingBottomSheetFragment
 import chat.rocket.android.util.extension.onQueryTextListener
-import chat.rocket.android.util.extensions.fadeIn
-import chat.rocket.android.util.extensions.fadeOut
 import chat.rocket.android.util.extensions.ifNotNullNotEmpty
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
@@ -43,6 +36,7 @@ import chat.rocket.android.util.extensions.ui
 import chat.rocket.android.widget.DividerItemDecoration
 import chat.rocket.core.internal.realtime.socket.model.State
 import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.app_bar_chat_rooms.*
 import kotlinx.android.synthetic.main.fragment_chat_rooms.*
 import timber.log.Timber
 import javax.inject.Inject
@@ -51,46 +45,37 @@ internal const val TAG_CHAT_ROOMS_FRAGMENT = "ChatRoomsFragment"
 
 private const val BUNDLE_CHAT_ROOM_ID = "BUNDLE_CHAT_ROOM_ID"
 
-class ChatRoomsFragment : Fragment(), ChatRoomsView {
-    @Inject
-    lateinit var presenter: ChatRoomsPresenter
-    @Inject
-    lateinit var factory: ChatRoomsViewModelFactory
-    @Inject
-    lateinit var analyticsManager: AnalyticsManager
+fun newInstance(chatRoomId: String?): Fragment = ChatRoomsFragment().apply {
+    arguments = Bundle(1).apply {
+        putString(BUNDLE_CHAT_ROOM_ID, chatRoomId)
+    }
+}
 
+class ChatRoomsFragment : Fragment(), ChatRoomsView {
+    @Inject lateinit var presenter: ChatRoomsPresenter
+    @Inject lateinit var factory: ChatRoomsViewModelFactory
+    @Inject lateinit var analyticsManager: AnalyticsManager
     private lateinit var viewModel: ChatRoomsViewModel
-
-    private var searchView: SearchView? = null
-    private var sortView: MenuItem? = null
-    private val handler = Handler()
     private var chatRoomId: String? = null
-    private var progressDialog: ProgressDialog? = null
-
-    companion object {
-        fun newInstance(chatRoomId: String? = null): ChatRoomsFragment = ChatRoomsFragment().apply {
-            arguments = Bundle(1).apply {
-                putString(BUNDLE_CHAT_ROOM_ID, chatRoomId)
-            }
-        }
-    }
+    private var isSortByName = false
+    private var isUnreadOnTop = false
+    private var isGroupByType = false
+    private var isGroupByFavorites = false
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         AndroidSupportInjection.inject(this)
-        setHasOptionsMenu(true)
+
         arguments?.run {
             chatRoomId = getString(BUNDLE_CHAT_ROOM_ID)
-            chatRoomId.ifNotNullNotEmpty { roomId ->
-                presenter.loadChatRoom(roomId)
+
+            chatRoomId.ifNotNullNotEmpty {
+                presenter.loadChatRoom(it)
                 chatRoomId = null
             }
         }
-    }
 
-    override fun onDestroy() {
-        handler.removeCallbacks(dismissStatus)
-        super.onDestroy()
+        setHasOptionsMenu(true)
     }
 
     override fun onCreateView(
@@ -102,62 +87,48 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
 
+        with(presenter) {
+            getCurrentServerName()
+            getSortingAndGroupingPreferences()
+        }
+
         viewModel = ViewModelProviders.of(this, factory).get(ChatRoomsViewModel::class.java)
         subscribeUi()
-
-        setupToolbar()
+        setupListeners()
 
         analyticsManager.logScreenView(ScreenViewEvent.ChatRooms)
     }
 
-    private fun subscribeUi() {
-        ui {
-            val adapter = RoomsAdapter { room ->
-                presenter.loadChatRoom(room)
+    override fun setupToolbar(serverName: String) {
+        with((activity as AppCompatActivity)) {
+            with(toolbar) {
+                setSupportActionBar(this)
+                supportActionBar?.setDisplayShowTitleEnabled(false)
+                setNavigationOnClickListener { presenter.toSettings() }
             }
+        }
+        text_server_name.text = serverName
+    }
 
-            recycler_view.layoutManager = LinearLayoutManager(it)
-            recycler_view.addItemDecoration(
-                DividerItemDecoration(
-                    it,
-                    resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_start),
-                    resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_end)
-                )
+    override fun setupSortingAndGrouping(
+        isSortByName: Boolean,
+        isUnreadOnTop: Boolean,
+        isGroupByType: Boolean,
+        isGroupByFavorites: Boolean
+    ) {
+        this.isSortByName = isSortByName
+        this.isUnreadOnTop = isUnreadOnTop
+        this.isGroupByType = isGroupByType
+        this.isGroupByFavorites = isGroupByFavorites
+
+        if (isSortByName) {
+            text_sort_by.text =
+                getString(R.string.msg_sort_by_placeholder, getString(R.string.msg_sort_by_name).toLowerCase())
+        } else {
+            text_sort_by.text = getString(
+                R.string.msg_sort_by_placeholder,
+                getString(R.string.msg_sort_by_activity).toLowerCase()
             )
-            recycler_view.itemAnimator = DefaultItemAnimator()
-
-            viewModel.getChatRooms().observe(viewLifecycleOwner, Observer { rooms ->
-                rooms?.let {
-                    Timber.d("Got items: $it")
-                    adapter.values = it
-                    if (recycler_view.adapter != adapter) {
-                        recycler_view.adapter = adapter
-                    }
-                    if (rooms.isNotEmpty()) {
-                        text_no_data_to_display.isVisible = false
-                    }
-                }
-            })
-
-            viewModel.loadingState.observe(viewLifecycleOwner, Observer { state ->
-                when (state) {
-                    is LoadingState.Loading -> if (state.count == 0L) showLoading()
-                    is LoadingState.Loaded -> {
-                        hideLoading()
-                        if (state.count == 0L) showNoChatRoomsToDisplay()
-                    }
-                    is LoadingState.Error -> {
-                        hideLoading()
-                        showGenericErrorMessage()
-                    }
-                }
-            })
-
-            viewModel.getStatus().observe(viewLifecycleOwner, Observer { status ->
-                status?.let { showConnectionState(status) }
-            })
-
-            updateSort()
         }
     }
 
@@ -165,120 +136,42 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
         super.onCreateOptionsMenu(menu, inflater)
         inflater.inflate(R.menu.chatrooms, menu)
 
-        sortView = menu.findItem(R.id.action_sort)
+        val searchMenuItem = menu.findItem(R.id.action_search)
+        val searchView = searchMenuItem?.actionView as SearchView
 
-        val searchItem = menu.findItem(R.id.action_search)
-        searchView = searchItem?.actionView as? SearchView
-        searchView?.setIconifiedByDefault(false)
-        searchView?.maxWidth = Integer.MAX_VALUE
-        searchView?.onQueryTextListener { queryChatRoomsByName(it) }
+        with(searchView) {
+            setIconifiedByDefault(false)
+            maxWidth = Integer.MAX_VALUE
+            onQueryTextListener { queryChatRoomsByName(it) }
+        }
 
-        val expandListener = object : MenuItem.OnActionExpandListener {
+        searchMenuItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
             override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
-                // Simply setting sortView to visible won't work, so we invalidate the options
-                // to recreate the entire menu...
-                viewModel.showLastMessage = true
+                // We need to show all the menu items here by invalidating the options to recreate the entire menu.
                 activity?.invalidateOptionsMenu()
                 queryChatRoomsByName(null)
+                hideDirectoryView()
                 return true
             }
 
             override fun onMenuItemActionExpand(item: MenuItem): Boolean {
-                viewModel.showLastMessage = false
-                sortView?.isVisible = false
+                // We need to hide the all the menu items here.
+                menu.findItem(R.id.action_new_channel).isVisible = false
+                showDirectoryView()
                 return true
             }
-        }
-        searchItem?.setOnActionExpandListener(expandListener)
+        })
     }
 
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
-            // TODO - simplify this
-            R.id.action_sort -> {
-                val dialogLayout = layoutInflater.inflate(R.layout.chatroom_sort_dialog, null)
-                val sortType = SharedPreferenceHelper.getInt(
-                    Constants.CHATROOM_SORT_TYPE_KEY,
-                    ChatRoomsSortOrder.ACTIVITY
-                )
-                val groupByType =
-                    SharedPreferenceHelper.getBoolean(Constants.CHATROOM_GROUP_BY_TYPE_KEY, false)
-
-                val radioGroup = dialogLayout.findViewById<RadioGroup>(R.id.radio_group_sort)
-                val groupByTypeCheckBox =
-                    dialogLayout.findViewById<CheckBox>(R.id.checkbox_group_by_type)
-
-                radioGroup.check(
-                    when (sortType) {
-                        0 -> R.id.radio_sort_alphabetical
-                        else -> R.id.radio_sort_activity
-                    }
-                )
-                radioGroup.setOnCheckedChangeListener { _, checkedId ->
-                    run {
-                        SharedPreferenceHelper.putInt(
-                            Constants.CHATROOM_SORT_TYPE_KEY, when (checkedId) {
-                                R.id.radio_sort_alphabetical -> 0
-                                R.id.radio_sort_activity -> 1
-                                else -> 1
-                            }
-                        )
-                    }
-                }
-
-                groupByTypeCheckBox.isChecked = groupByType
-                groupByTypeCheckBox.setOnCheckedChangeListener { _, isChecked ->
-                    SharedPreferenceHelper.putBoolean(
-                        Constants.CHATROOM_GROUP_BY_TYPE_KEY,
-                        isChecked
-                    )
-                }
-
-                context?.let {
-                    AlertDialog.Builder(it)
-                        .setTitle(R.string.dialog_sort_title)
-                        .setView(dialogLayout)
-                        .setPositiveButton(R.string.msg_sort) { dialog, _ ->
-                            invalidateQueryOnSearch()
-                            updateSort()
-                            dialog.dismiss()
-                        }.show()
-                }
-            }
+            R.id.action_new_channel -> presenter.toCreateChannel()
         }
         return super.onOptionsItemSelected(item)
     }
 
-    private fun updateSort() {
-        val sortType = SharedPreferenceHelper.getInt(
-            Constants.CHATROOM_SORT_TYPE_KEY,
-            ChatRoomsSortOrder.ACTIVITY
-        )
-        val grouped = SharedPreferenceHelper.getBoolean(Constants.CHATROOM_GROUP_BY_TYPE_KEY, false)
-
-        val query = when (sortType) {
-            ChatRoomsSortOrder.ALPHABETICAL -> {
-                Query.ByName(grouped)
-            }
-            ChatRoomsSortOrder.ACTIVITY -> {
-                Query.ByActivity(grouped)
-            }
-            else -> Query.ByActivity()
-        }
-
-        viewModel.setQuery(query)
-    }
-
-    private fun invalidateQueryOnSearch() {
-        searchView?.let {
-            if (!searchView!!.isIconified) {
-                queryChatRoomsByName(searchView!!.query.toString())
-            }
-        }
-    }
-
     private fun showNoChatRoomsToDisplay() {
-        ui { text_no_data_to_display.isVisible = true }
+//        ui { text_no_data_to_display.isVisible = true }
     }
 
     override fun showLoading() {
@@ -303,55 +196,147 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
 
     override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
 
-    override fun showLoadingRoom(name: CharSequence) {
-        ui {
-            progressDialog = ProgressDialog.show(activity, "Rocket.Chat", "Loading room $name")
-        }
-    }
-
-    override fun hideLoadingRoom() {
-        progressDialog?.dismiss()
-    }
-
     private fun showConnectionState(state: State) {
         Timber.d("Got new state: $state")
+//        ui {
+//            text_connection_status.fadeIn()
+//            handler.removeCallbacks(dismissStatus)
+//            text_connection_status.text = when (state) {
+//                is State.Connected -> {
+//                    handler.postDelayed(dismissStatus, 2000)
+//                    getString(R.string.status_connected)
+//                }
+//                is State.Disconnected -> getString(R.string.status_disconnected)
+//                is State.Connecting -> getString(R.string.status_connecting)
+//                is State.Authenticating -> getString(R.string.status_authenticating)
+//                is State.Disconnecting -> getString(R.string.status_disconnecting)
+//                is State.Waiting -> getString(R.string.status_waiting, state.seconds)
+//                else -> {
+//                    handler.postDelayed(dismissStatus, 500)
+//                    ""
+//                }
+//            }
+//        }
+    }
+
+    private fun subscribeUi() {
         ui {
-            text_connection_status.fadeIn()
-            handler.removeCallbacks(dismissStatus)
-            text_connection_status.text = when (state) {
-                is State.Connected -> {
-                    handler.postDelayed(dismissStatus, 2000)
-                    getString(R.string.status_connected)
+            val adapter = RoomsAdapter { room ->
+                presenter.loadChatRoom(room)
+            }
+
+            with(recycler_view) {
+                layoutManager = LinearLayoutManager(it)
+                addItemDecoration(
+                    DividerItemDecoration(
+                        it,
+                        resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_start),
+                        resources.getDimensionPixelSize(R.dimen.divider_item_decorator_bound_end)
+                    )
+                )
+                itemAnimator = DefaultItemAnimator()
+            }
+
+            viewModel.getChatRooms().observe(viewLifecycleOwner, Observer { rooms ->
+                rooms?.let {
+                    adapter.values = it
+                    if (recycler_view.adapter != adapter) {
+                        recycler_view.adapter = adapter
+                    }
+                    if (rooms.isNotEmpty()) {
+//                        text_no_data_to_display.isVisible = false
+                    }
                 }
-                is State.Disconnected -> getString(R.string.status_disconnected)
-                is State.Connecting -> getString(R.string.status_connecting)
-                is State.Authenticating -> getString(R.string.status_authenticating)
-                is State.Disconnecting -> getString(R.string.status_disconnecting)
-                is State.Waiting -> getString(R.string.status_waiting, state.seconds)
-                else -> {
-                    handler.postDelayed(dismissStatus, 500)
-                    ""
+            })
+
+            viewModel.loadingState.observe(viewLifecycleOwner, Observer { state ->
+                when (state) {
+                    is LoadingState.Loading -> if (state.count == 0L) showLoading()
+                    is LoadingState.Loaded -> {
+                        hideLoading()
+                        if (state.count == 0L) showNoChatRoomsToDisplay()
+                    }
+                    is LoadingState.Error -> {
+                        hideLoading()
+                        showGenericErrorMessage()
+                    }
                 }
-            }
+            })
+
+            viewModel.getStatus().observe(viewLifecycleOwner, Observer { status ->
+                status?.let { showConnectionState(status) }
+            })
+
+            showAllChats()
         }
     }
 
-    private val dismissStatus = {
-        if (text_connection_status != null) {
-            text_connection_status.fadeOut()
+    private fun setupListeners() {
+        text_server_name.setOnClickListener {
+            ServersBottomSheetFragment().show(
+                activity?.supportFragmentManager,
+                chat.rocket.android.servers.ui.TAG
+            )
+        }
+
+        text_sort_by.setOnClickListener {
+            SortingAndGroupingBottomSheetFragment().show(
+                activity?.supportFragmentManager,
+                chat.rocket.android.sortingandgrouping.ui.TAG
+            )
+        }
+
+        text_directory.setOnClickListener { presenter.toDirectory() }
+    }
+
+    fun sortChatRoomsList(
+        isSortByName: Boolean,
+        isUnreadOnTop: Boolean,
+        isGroupByType: Boolean,
+        isGroupByFavorites: Boolean
+    ) {
+        this.isSortByName = isSortByName
+        this.isUnreadOnTop = isUnreadOnTop
+        this.isGroupByType = isGroupByType
+        this.isGroupByFavorites = isGroupByFavorites
+
+        if (isSortByName) {
+            viewModel.setQuery(Query.ByName(isGroupByType, isUnreadOnTop))
+            changeSortByTitle(getString(R.string.msg_sort_by_name))
+        } else {
+            viewModel.setQuery(Query.ByActivity(isGroupByType, isUnreadOnTop))
+            changeSortByTitle(getString(R.string.msg_sort_by_activity))
         }
     }
 
-    private fun setupToolbar() {
-        (activity as AppCompatActivity?)?.supportActionBar?.title = getString(R.string.title_chats)
+    private fun changeSortByTitle(text: String) {
+        text_sort_by.text = getString(R.string.msg_sort_by_placeholder, text.toLowerCase())
     }
 
     private fun queryChatRoomsByName(name: String?): Boolean {
         if (name.isNullOrEmpty()) {
-            updateSort()
+            showAllChats()
         } else {
-            viewModel.setQuery(Query.Search(name!!))
+            viewModel.setQuery(Query.Search(name))
         }
         return true
     }
+
+    private fun showAllChats() {
+        if (isSortByName) {
+            viewModel.setQuery(Query.ByName(isGroupByType, isUnreadOnTop))
+        } else {
+            viewModel.setQuery(Query.ByActivity(isGroupByType, isUnreadOnTop))
+        }
+    }
+
+    private fun showDirectoryView() {
+        text_directory.isVisible = true
+        text_sort_by.isGone = true
+    }
+
+    private fun hideDirectoryView() {
+        text_directory.isGone = true
+        text_sort_by.isVisible = true
+    }
 }
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt b/app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt
index 6f4532e7a2..c5c0952894 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModel.kt
@@ -9,7 +9,7 @@ import chat.rocket.android.chatrooms.adapter.LoadingItemHolder
 import chat.rocket.android.chatrooms.adapter.RoomUiModelMapper
 import chat.rocket.android.chatrooms.domain.FetchChatRoomsInteractor
 import chat.rocket.android.chatrooms.infrastructure.ChatRoomsRepository
-import chat.rocket.android.server.infraestructure.ConnectionManager
+import chat.rocket.android.server.infrastructure.ConnectionManager
 import chat.rocket.android.util.livedata.transform
 import chat.rocket.android.util.livedata.wrap
 import chat.rocket.android.util.retryIO
@@ -140,8 +140,10 @@ sealed class LoadingState {
 }
 
 sealed class Query {
-    data class ByActivity(val grouped: Boolean = false) : Query()
-    data class ByName(val grouped: Boolean = false) : Query()
+
+    data class ByActivity(val grouped: Boolean = false, val unreadOnTop: Boolean = false) : Query()
+    data class ByName(val grouped: Boolean = false, val unreadOnTop: Boolean = false ) : Query()
+
     data class Search(val query: String) : Query()
 }
 
@@ -155,22 +157,44 @@ fun Query.isGrouped(): Boolean {
     }
 }
 
+fun Query.isUnreadOnTop(): Boolean {
+    return when(this) {
+        is Query.Search -> false
+        is Query.ByName -> unreadOnTop
+        is Query.ByActivity -> unreadOnTop
+    }
+}
+
 fun Query.asSortingOrder(): ChatRoomsRepository.Order {
     return when(this) {
         is Query.ByName -> {
-            if (grouped) {
+            if (grouped  && !unreadOnTop) {
                 ChatRoomsRepository.Order.GROUPED_NAME
-            } else {
+            }
+            else if(unreadOnTop && !grouped){
+                ChatRoomsRepository.Order.UNREAD_ON_TOP_NAME
+            }
+            else if(unreadOnTop && grouped){
+                ChatRoomsRepository.Order.UNREAD_ON_TOP_GROUPED_NAME
+            }
+            else {
                 ChatRoomsRepository.Order.NAME
             }
         }
         is Query.ByActivity -> {
-            if (grouped) {
+            if (grouped && !unreadOnTop) {
                 ChatRoomsRepository.Order.GROUPED_ACTIVITY
-            } else {
+            }
+            else if(unreadOnTop && !grouped){
+                ChatRoomsRepository.Order.UNREAD_ON_TOP_ACTIVITY
+            }
+            else if(unreadOnTop && grouped){
+                ChatRoomsRepository.Order.UNREAD_ON_TOP_GROUPED_ACTIVITY
+            }
+            else {
                 ChatRoomsRepository.Order.ACTIVITY
             }
         }
         else -> throw IllegalArgumentException("Should be ByName or ByActivity")
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModelFactory.kt b/app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModelFactory.kt
index db5c6ccce3..77edce808c 100644
--- a/app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModelFactory.kt
+++ b/app/src/main/java/chat/rocket/android/chatrooms/viewmodel/ChatRoomsViewModelFactory.kt
@@ -5,7 +5,7 @@ import androidx.lifecycle.ViewModelProvider
 import chat.rocket.android.chatrooms.adapter.RoomUiModelMapper
 import chat.rocket.android.chatrooms.domain.FetchChatRoomsInteractor
 import chat.rocket.android.chatrooms.infrastructure.ChatRoomsRepository
-import chat.rocket.android.server.infraestructure.ConnectionManager
+import chat.rocket.android.server.infrastructure.ConnectionManager
 import javax.inject.Inject
 
 class ChatRoomsViewModelFactory @Inject constructor(
diff --git a/app/src/main/java/chat/rocket/android/core/behaviours/AppLanguageView.kt b/app/src/main/java/chat/rocket/android/core/behaviours/AppLanguageView.kt
new file mode 100644
index 0000000000..56044e8f12
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/core/behaviours/AppLanguageView.kt
@@ -0,0 +1,12 @@
+package chat.rocket.android.core.behaviours
+
+interface AppLanguageView {
+
+    /**
+     * Updates the app language
+     *
+     * @param language The app language to be updated.
+     * @param country Opcional. The country code to be updated.
+     */
+    fun updateLanguage(language: String, country: String? = null)
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/createchannel/presentation/CreateChannelPresenter.kt b/app/src/main/java/chat/rocket/android/createchannel/presentation/CreateChannelPresenter.kt
index 354aaa1f3d..fd031ddedd 100644
--- a/app/src/main/java/chat/rocket/android/createchannel/presentation/CreateChannelPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/createchannel/presentation/CreateChannelPresenter.kt
@@ -4,7 +4,7 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.members.uimodel.MemberUiModelMapper
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.RoomType
@@ -22,7 +22,7 @@ class CreateChannelPresenter @Inject constructor(
     val serverInteractor: GetCurrentServerInteractor,
     val factory: RocketChatClientFactory
 ) {
-    private val client: RocketChatClient = factory.create(serverInteractor.get()!!)
+    private val client: RocketChatClient = factory.get(serverInteractor.get()!!)
 
     fun createChannel(
         roomType: RoomType,
@@ -35,7 +35,6 @@ class CreateChannelPresenter @Inject constructor(
             view.disableUserInput()
             try {
                 client.createChannel(roomType, channelName, usersList, readOnly)
-                view.prepareToShowChatList()
                 view.showChannelCreatedSuccessfullyMessage()
                 toChatList()
             } catch (exception: RocketChatException) {
diff --git a/app/src/main/java/chat/rocket/android/createchannel/presentation/CreateChannelView.kt b/app/src/main/java/chat/rocket/android/createchannel/presentation/CreateChannelView.kt
index eb29f5f0cd..463fb760ba 100644
--- a/app/src/main/java/chat/rocket/android/createchannel/presentation/CreateChannelView.kt
+++ b/app/src/main/java/chat/rocket/android/createchannel/presentation/CreateChannelView.kt
@@ -28,12 +28,6 @@ interface CreateChannelView : LoadingView, MessageView {
      */
     fun hideSuggestionViewInProgress()
 
-    /**
-     * Shows the navigation drawer with the chat item checked before showing the chat list.
-     * This function is invoked after successfully created the channel.
-     */
-    fun prepareToShowChatList()
-
     /**
      * Shows a message that a channel was successfully created.
      */
diff --git a/app/src/main/java/chat/rocket/android/createchannel/ui/CreateChannelFragment.kt b/app/src/main/java/chat/rocket/android/createchannel/ui/CreateChannelFragment.kt
index 57f60a6f18..4baf9af6ab 100644
--- a/app/src/main/java/chat/rocket/android/createchannel/ui/CreateChannelFragment.kt
+++ b/app/src/main/java/chat/rocket/android/createchannel/ui/CreateChannelFragment.kt
@@ -9,7 +9,6 @@ import android.view.ViewGroup
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.core.view.isVisible
-import androidx.core.view.postDelayed
 import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.DividerItemDecoration
 import androidx.recyclerview.widget.LinearLayoutManager
@@ -19,7 +18,6 @@ import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
 import chat.rocket.android.createchannel.presentation.CreateChannelPresenter
 import chat.rocket.android.createchannel.presentation.CreateChannelView
-import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.members.adapter.MembersAdapter
 import chat.rocket.android.members.uimodel.MemberUiModel
 import chat.rocket.android.util.extension.asObservable
@@ -32,17 +30,18 @@ import com.google.android.material.chip.Chip
 import dagger.android.support.AndroidSupportInjection
 import io.reactivex.android.schedulers.AndroidSchedulers
 import io.reactivex.disposables.CompositeDisposable
+import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.fragment_create_channel.*
 import java.util.concurrent.TimeUnit
 import javax.inject.Inject
 
 internal const val TAG_CREATE_CHANNEL_FRAGMENT = "CreateChannelFragment"
 
+fun newInstance() = CreateChannelFragment()
+
 class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback {
-    @Inject
-    lateinit var createChannelPresenter: CreateChannelPresenter
-    @Inject
-    lateinit var analyticsManager: AnalyticsManager
+    @Inject lateinit var presenter: CreateChannelPresenter
+    @Inject lateinit var analyticsManager: AnalyticsManager
     private var actionMode: ActionMode? = null
     private val adapter: MembersAdapter = MembersAdapter {
         it.username?.run { processSelectedMember(this) }
@@ -52,10 +51,6 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
     private var isChannelReadOnly: Boolean = false
     private var memberList = arrayListOf<String>()
 
-    companion object {
-        fun newInstance() = CreateChannelFragment()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidSupportInjection.inject(this)
         super.onCreate(savedInstanceState)
@@ -93,7 +88,7 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
     override fun onActionItemClicked(mode: ActionMode, menuItem: MenuItem): Boolean {
         return when (menuItem.itemId) {
             R.id.action_create_channel -> {
-                createChannelPresenter.createChannel(
+                presenter.createChannel(
                     roomTypeOf(channelType),
                     text_channel_name.text.toString(),
                     memberList,
@@ -165,17 +160,6 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
         view_member_suggestion_loading.isVisible = false
     }
 
-    override fun prepareToShowChatList() {
-        with(activity as MainActivity) {
-            setCheckedNavDrawerItem(R.id.menu_action_chats)
-            openDrawer()
-            getDrawerLayout().postDelayed(1000) {
-                closeDrawer()
-                createChannelPresenter.toChatList()
-            }
-        }
-    }
-
     override fun showChannelCreatedSuccessfullyMessage() {
         showMessage(getString(R.string.msg_channel_created_successfully))
     }
@@ -191,8 +175,14 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
     }
 
     private fun setupToolBar() {
-        (activity as AppCompatActivity?)?.supportActionBar?.title =
-            getString(R.string.title_create_channel)
+        with((activity as AppCompatActivity)) {
+            with(toolbar) {
+                setSupportActionBar(this)
+                title = getString(R.string.title_create_channel)
+                setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+                setNavigationOnClickListener { activity?.onBackPressed() }
+            }
+        }
     }
 
     private fun setupViewListeners() {
@@ -247,7 +237,7 @@ class CreateChannelFragment : Fragment(), CreateChannelView, ActionMode.Callback
             .filter { t -> t.isNotBlank() }
             .subscribe {
                 if (it.length >= 3) {
-                    createChannelPresenter.searchUser(it.toString())
+                    presenter.searchUser(it.toString())
                 } else {
                     view_member_suggestion.isVisible = false
                 }
diff --git a/app/src/main/java/chat/rocket/android/dagger/AppComponent.kt b/app/src/main/java/chat/rocket/android/dagger/AppComponent.kt
index 1812840193..e9963c8da5 100644
--- a/app/src/main/java/chat/rocket/android/dagger/AppComponent.kt
+++ b/app/src/main/java/chat/rocket/android/dagger/AppComponent.kt
@@ -14,9 +14,15 @@ import dagger.android.support.AndroidSupportInjectionModule
 import javax.inject.Singleton
 
 @Singleton
-@Component(modules = [AndroidSupportInjectionModule::class,
-    AppModule::class, ActivityBuilder::class, ServiceBuilder::class, ReceiverBuilder::class,
-    AndroidWorkerInjectionModule::class])
+@Component(
+    modules = [
+        AndroidSupportInjectionModule::class,
+        AppModule::class,
+        ActivityBuilder::class,
+        ServiceBuilder::class,
+        ReceiverBuilder::class,
+        AndroidWorkerInjectionModule::class]
+)
 interface AppComponent {
 
     @Component.Builder
diff --git a/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt b/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
index bea265f32d..2893e634dd 100644
--- a/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
+++ b/app/src/main/java/chat/rocket/android/dagger/module/ActivityBuilder.kt
@@ -1,6 +1,5 @@
 package chat.rocket.android.dagger.module
 
-import chat.rocket.android.about.di.AboutFragmentProvider
 import chat.rocket.android.authentication.di.AuthenticationModule
 import chat.rocket.android.authentication.login.di.LoginFragmentProvider
 import chat.rocket.android.authentication.loginoptions.di.LoginOptionsFragmentProvider
@@ -20,6 +19,7 @@ import chat.rocket.android.chatroom.ui.ChatRoomActivity
 import chat.rocket.android.chatrooms.di.ChatRoomsFragmentProvider
 import chat.rocket.android.createchannel.di.CreateChannelProvider
 import chat.rocket.android.dagger.scope.PerActivity
+import chat.rocket.android.directory.di.DirectoryFragmentProvider
 import chat.rocket.android.draw.main.di.DrawModule
 import chat.rocket.android.draw.main.ui.DrawingActivity
 import chat.rocket.android.favoritemessages.di.FavoriteMessagesFragmentProvider
@@ -29,13 +29,14 @@ import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.members.di.MembersFragmentProvider
 import chat.rocket.android.mentions.di.MentionsFragmentProvider
 import chat.rocket.android.pinnedmessages.di.PinnedMessagesFragmentProvider
-import chat.rocket.android.preferences.di.PreferencesFragmentProvider
 import chat.rocket.android.profile.di.ProfileFragmentProvider
 import chat.rocket.android.server.di.ChangeServerModule
 import chat.rocket.android.server.ui.ChangeServerActivity
+import chat.rocket.android.servers.di.ServersBottomSheetFragmentProvider
 import chat.rocket.android.settings.di.SettingsFragmentProvider
 import chat.rocket.android.settings.password.di.PasswordFragmentProvider
 import chat.rocket.android.settings.password.ui.PasswordActivity
+import chat.rocket.android.sortingandgrouping.di.SortingAndGroupingBottomSheetFragmentProvider
 import chat.rocket.android.userdetails.di.UserDetailsFragmentProvider
 import chat.rocket.android.videoconference.di.VideoConferenceModule
 import chat.rocket.android.videoconference.ui.VideoConferenceActivity
@@ -65,12 +66,13 @@ abstract class ActivityBuilder {
     @ContributesAndroidInjector(
         modules = [MainModule::class,
             ChatRoomsFragmentProvider::class,
+            ServersBottomSheetFragmentProvider::class,
+            SortingAndGroupingBottomSheetFragmentProvider::class,
             CreateChannelProvider::class,
             ProfileFragmentProvider::class,
             SettingsFragmentProvider::class,
-            AboutFragmentProvider::class,
-            PreferencesFragmentProvider::class,
-            AdminPanelWebViewFragmentProvider::class
+            AdminPanelWebViewFragmentProvider::class,
+            DirectoryFragmentProvider::class
         ]
     )
     abstract fun bindMainActivity(): MainActivity
diff --git a/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt b/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt
index c06b4c4cf9..536192cd8d 100644
--- a/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt
+++ b/app/src/main/java/chat/rocket/android/dagger/module/AppModule.kt
@@ -12,8 +12,8 @@ import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.AnswersAnalytics
 import chat.rocket.android.analytics.GoogleAnalyticsForFirebase
-import chat.rocket.android.authentication.infraestructure.SharedPreferencesMultiServerTokenRepository
-import chat.rocket.android.authentication.infraestructure.SharedPreferencesTokenRepository
+import chat.rocket.android.authentication.infrastructure.SharedPreferencesMultiServerTokenRepository
+import chat.rocket.android.authentication.infrastructure.SharedPreferencesTokenRepository
 import chat.rocket.android.chatroom.service.MessageService
 import chat.rocket.android.dagger.qualifier.ForAuthentication
 import chat.rocket.android.dagger.qualifier.ForMessages
@@ -27,37 +27,41 @@ import chat.rocket.android.push.PushManager
 import chat.rocket.android.server.domain.AccountsRepository
 import chat.rocket.android.server.domain.AnalyticsTrackingInteractor
 import chat.rocket.android.server.domain.AnalyticsTrackingRepository
+import chat.rocket.android.server.domain.BasicAuthRepository
 import chat.rocket.android.server.domain.ChatRoomsRepository
 import chat.rocket.android.server.domain.CurrentServerRepository
 import chat.rocket.android.server.domain.GetAccountInteractor
 import chat.rocket.android.server.domain.GetAccountsInteractor
+import chat.rocket.android.server.domain.GetBasicAuthInteractor
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
 import chat.rocket.android.server.domain.JobSchedulerInteractor
 import chat.rocket.android.server.domain.MessagesRepository
 import chat.rocket.android.server.domain.MultiServerTokenRepository
 import chat.rocket.android.server.domain.PermissionsRepository
+import chat.rocket.android.server.domain.SaveBasicAuthInteractor
 import chat.rocket.android.server.domain.SettingsRepository
+import chat.rocket.android.server.domain.SortingAndGroupingRepository
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.UsersRepository
-import chat.rocket.android.server.domain.BasicAuthRepository
-import chat.rocket.android.server.domain.GetBasicAuthInteractor
-import chat.rocket.android.server.domain.SaveBasicAuthInteractor
-import chat.rocket.android.server.infraestructure.SharedPrefsBasicAuthRepository
-import chat.rocket.android.server.infraestructure.DatabaseMessageMapper
-import chat.rocket.android.server.infraestructure.DatabaseMessagesRepository
-import chat.rocket.android.server.infraestructure.JobSchedulerInteractorImpl
-import chat.rocket.android.server.infraestructure.MemoryChatRoomsRepository
-import chat.rocket.android.server.infraestructure.MemoryUsersRepository
-import chat.rocket.android.server.infraestructure.SharedPreferencesAccountsRepository
-import chat.rocket.android.server.infraestructure.SharedPreferencesPermissionsRepository
-import chat.rocket.android.server.infraestructure.SharedPreferencesSettingsRepository
-import chat.rocket.android.server.infraestructure.SharedPrefsAnalyticsTrackingRepository
-import chat.rocket.android.server.infraestructure.SharedPrefsConnectingServerRepository
-import chat.rocket.android.server.infraestructure.SharedPrefsCurrentServerRepository
+import chat.rocket.android.server.infrastructure.CurrentLanguageRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsCurrentLanguageRepository
+import chat.rocket.android.server.infrastructure.DatabaseMessageMapper
+import chat.rocket.android.server.infrastructure.DatabaseMessagesRepository
+import chat.rocket.android.server.infrastructure.JobSchedulerInteractorImpl
+import chat.rocket.android.server.infrastructure.MemoryChatRoomsRepository
+import chat.rocket.android.server.infrastructure.MemoryUsersRepository
+import chat.rocket.android.server.infrastructure.SharedPreferencesAccountsRepository
+import chat.rocket.android.server.infrastructure.SharedPreferencesPermissionsRepository
+import chat.rocket.android.server.infrastructure.SharedPreferencesSettingsRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsAnalyticsTrackingRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsBasicAuthRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsConnectingServerRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsCurrentServerRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsSortingAndGroupingRepository
 import chat.rocket.android.util.AppJsonAdapterFactory
-import chat.rocket.android.util.HttpLoggingInterceptor
 import chat.rocket.android.util.BasicAuthenticatorInterceptor
+import chat.rocket.android.util.HttpLoggingInterceptor
 import chat.rocket.android.util.TimberLogger
 import chat.rocket.common.internal.FallbackSealedClassJsonAdapter
 import chat.rocket.common.internal.ISO8601Date
@@ -123,7 +127,10 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideOkHttpClient(logger: HttpLoggingInterceptor, basicAuthenticator: BasicAuthenticatorInterceptor): OkHttpClient {
+    fun provideOkHttpClient(
+        logger: HttpLoggingInterceptor,
+        basicAuthenticator: BasicAuthenticatorInterceptor
+    ): OkHttpClient {
         return OkHttpClient.Builder()
             .addInterceptor(logger)
             .addInterceptor(basicAuthenticator)
@@ -170,7 +177,6 @@ class AppModule {
     fun provideSharedPreferences(context: Application) =
         context.getSharedPreferences("rocket.chat", Context.MODE_PRIVATE)
 
-
     @Provides
     @ForMessages
     fun provideMessagesSharedPreferences(context: Application) =
@@ -194,12 +200,24 @@ class AppModule {
         return SharedPrefsAnalyticsTrackingRepository(prefs)
     }
 
+    @Provides
+    @Singleton
+    fun provideSortingAndGroupingRepository(prefs: SharedPreferences): SortingAndGroupingRepository {
+        return SharedPrefsSortingAndGroupingRepository(prefs)
+    }
+
     @Provides
     @ForAuthentication
     fun provideConnectingServerRepository(prefs: SharedPreferences): CurrentServerRepository {
         return SharedPrefsConnectingServerRepository(prefs)
     }
 
+    @Provides
+    @Singleton
+    fun provideCurrentLanguageRepository(prefs: SharedPreferences): CurrentLanguageRepository {
+        return SharedPrefsCurrentLanguageRepository(prefs)
+    }
+
     @Provides
     @Singleton
     fun provideSettingsRepository(localRepository: LocalRepository): SettingsRepository {
@@ -293,10 +311,10 @@ class AppModule {
 
     @Provides
     @Singleton
-    fun provideBasicAuthRepository (
+    fun provideBasicAuthRepository(
         preferences: SharedPreferences,
         moshi: Moshi
-    ): BasicAuthRepository = 
+    ): BasicAuthRepository =
         SharedPrefsBasicAuthRepository(preferences, moshi)
 
     @Provides
diff --git a/app/src/main/java/chat/rocket/android/dagger/module/LocalModule.kt b/app/src/main/java/chat/rocket/android/dagger/module/LocalModule.kt
index e6e08f148e..26df5c5f4c 100644
--- a/app/src/main/java/chat/rocket/android/dagger/module/LocalModule.kt
+++ b/app/src/main/java/chat/rocket/android/dagger/module/LocalModule.kt
@@ -6,7 +6,7 @@ import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.infrastructure.SharedPreferencesLocalRepository
 import chat.rocket.android.server.domain.CurrentServerRepository
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.SharedPrefsCurrentServerRepository
+import chat.rocket.android.server.infrastructure.SharedPrefsCurrentServerRepository
 import chat.rocket.android.util.AppJsonAdapterFactory
 import chat.rocket.android.util.TimberLogger
 import chat.rocket.common.internal.FallbackSealedClassJsonAdapter
diff --git a/app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt b/app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt
index 11bc281296..6b95702243 100644
--- a/app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt
+++ b/app/src/main/java/chat/rocket/android/db/ChatRoomDao.kt
@@ -65,11 +65,59 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
         """)
     abstract fun getAllGrouped(): LiveData<List<ChatRoom>>
 
+        @Transaction
+        @Query("""
+        $BASE_QUERY
+        $FILTER_NOT_OPENED
+        ORDER BY
+            $UNREAD,
+	        CASE
+		        WHEN lastMessageTimeStamp IS NOT NULL THEN lastMessageTimeStamp
+		        ELSE updatedAt
+	        END DESC
+        """)
+    abstract fun getAllUnread(): LiveData<List<ChatRoom>>
+
+    @Transaction
+    @Query("""
+        $BASE_QUERY
+        $FILTER_NOT_OPENED
+        ORDER BY
+            $UNREAD,
+            name COLLATE NOCASE
+        """)
+    abstract fun getAllAlphabeticallyUnread(): LiveData<List<ChatRoom>>
+
     @Transaction
     @Query("""
         $BASE_QUERY
         $FILTER_NOT_OPENED
-        ORDER BY name
+        ORDER BY
+            $TYPE_ORDER,
+            $UNREAD,
+            name COLLATE NOCASE
+        """)
+    abstract fun getAllAlphabeticallyGroupedUnread(): LiveData<List<ChatRoom>>
+
+    @Transaction
+    @Query("""
+        $BASE_QUERY
+        $FILTER_NOT_OPENED
+        ORDER BY
+            $TYPE_ORDER,
+            $UNREAD,
+	        CASE
+		        WHEN lastMessageTimeStamp IS NOT NULL THEN lastMessageTimeStamp
+		        ELSE updatedAt
+	        END DESC
+        """)
+    abstract fun getAllGroupedUnread(): LiveData<List<ChatRoom>>
+
+    @Transaction
+    @Query("""
+        $BASE_QUERY
+        $FILTER_NOT_OPENED
+        ORDER BY name COLLATE NOCASE
         """)
     abstract fun getAllAlphabetically(): LiveData<List<ChatRoom>>
 
@@ -79,7 +127,7 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
         $FILTER_NOT_OPENED
         ORDER BY
             $TYPE_ORDER,
-            name
+            name COLLATE NOCASE
         """)
     abstract fun getAllAlphabeticallyGrouped(): LiveData<List<ChatRoom>>
 
@@ -139,5 +187,11 @@ abstract class ChatRoomDao : BaseDao<ChatRoomEntity> {
 		        ELSE 5
 	        END
         """
+        const val UNREAD = """
+            CASE
+		        WHEN alert OR unread > 0 THEN 1
+		        ELSE 2
+	        END
+        """
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
index 0dffbf8f16..8363352372 100644
--- a/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
+++ b/app/src/main/java/chat/rocket/android/db/DatabaseManager.kt
@@ -1,6 +1,7 @@
 package chat.rocket.android.db
 
 import android.app.Application
+import androidx.core.net.toUri
 import chat.rocket.android.R
 import chat.rocket.android.db.model.BaseMessageEntity
 import chat.rocket.android.db.model.BaseUserEntity
@@ -15,6 +16,7 @@ import chat.rocket.android.db.model.UrlEntity
 import chat.rocket.android.db.model.UserEntity
 import chat.rocket.android.db.model.UserStatus
 import chat.rocket.android.db.model.asEntity
+import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.extensions.exhaustive
 import chat.rocket.android.util.extensions.removeTrailingSlash
 import chat.rocket.android.util.extensions.toEntity
@@ -23,6 +25,7 @@ import chat.rocket.android.util.retryDB
 import chat.rocket.common.model.BaseRoom
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.SimpleUser
+import chat.rocket.common.model.Token
 import chat.rocket.common.model.User
 import chat.rocket.core.internal.model.Subscription
 import chat.rocket.core.internal.realtime.socket.model.StreamMessage
@@ -32,6 +35,7 @@ import chat.rocket.core.model.Message
 import chat.rocket.core.model.Myself
 import chat.rocket.core.model.Room
 import chat.rocket.core.model.userId
+import com.facebook.drawee.backends.pipeline.Fresco
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.Job
 import kotlinx.coroutines.channels.Channel
@@ -48,8 +52,7 @@ import kotlin.collections.component2
 import kotlin.collections.set
 import kotlin.system.measureTimeMillis
 
-class DatabaseManager(val context: Application, val serverUrl: String) {
-
+class DatabaseManager(val context: Application, val serverUrl: String, val token: Token) {
     private val database: RCDatabase = androidx.room.Room.databaseBuilder(
         context,
         RCDatabase::class.java, serverUrl.databaseName()
@@ -58,23 +61,23 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
         .build()
     private val dbContext = newSingleThreadContext("$serverUrl-db-context")
     private val dbManagerContext = newSingleThreadContext("$serverUrl-db-manager-context")
-
     private val writeChannel = Channel<Operation>(Channel.UNLIMITED)
     private var dbJob: Job? = null
-
     private val insertSubs = HashMap<String, Subscription>()
     private val insertRooms = HashMap<String, Room>()
     private val updateSubs = LinkedHashMap<String, Subscription>()
     private val updateRooms = LinkedHashMap<String, Room>()
 
-    fun chatRoomDao(): ChatRoomDao = database.chatRoomDao()
-    fun userDao(): UserDao = database.userDao()
-    fun messageDao(): MessageDao = database.messageDao()
-
     init {
         start()
     }
 
+    fun chatRoomDao(): ChatRoomDao = database.chatRoomDao()
+
+    fun userDao(): UserDao = database.userDao()
+
+    fun messageDao(): MessageDao = database.messageDao()
+
     fun start() {
         dbJob?.cancel()
         dbJob = GlobalScope.launch(dbContext) {
@@ -138,7 +141,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
     }
 
     /*
-     * Creates a list of data base operations
+     * Creates a list of database operations
      */
     fun processChatRoomsBatch(batch: List<StreamMessage<BaseRoom>>) {
         GlobalScope.launch(dbManagerContext) {
@@ -189,6 +192,20 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
                 status = myself.status?.toString() ?: user.status
             ) ?: myself.asUser().toEntity()
 
+            if (myself.avatarOrigin != null && myself.active == null &&
+                myself.name == null && myself.username == null
+            ) {
+                user?.username?.let {
+                    Fresco.getImagePipeline().evictFromCache(
+                        serverUrl.avatarUrl(
+                            it,
+                            token.userId,
+                            token.authToken
+                        ).toUri()
+                    )
+                }
+            }
+
             Timber.d("UPDATING SELF: $entity")
             entity?.let { sendOperation(Operation.UpsertUser(it)) }
         }
@@ -472,6 +489,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
         return ChatRoomEntity(
             id = room.id,
             subscriptionId = subscription.id,
+            parentId = subscription.parentId,
             type = room.type.toString(),
             name = room.name ?: subscription.name
             ?: throw NullPointerException(), // this should be filtered on the SDK
@@ -513,6 +531,7 @@ class DatabaseManager(val context: Application, val serverUrl: String) {
             return ChatRoomEntity(
                 id = id,
                 subscriptionId = subscriptionId,
+                parentId = parentId,
                 type = type.toString(),
                 name = name,
                 fullname = fullName,
diff --git a/app/src/main/java/chat/rocket/android/db/DatabaseManagerFactory.kt b/app/src/main/java/chat/rocket/android/db/DatabaseManagerFactory.kt
index 19a67975f6..08e3936de7 100644
--- a/app/src/main/java/chat/rocket/android/db/DatabaseManagerFactory.kt
+++ b/app/src/main/java/chat/rocket/android/db/DatabaseManagerFactory.kt
@@ -1,12 +1,16 @@
 package chat.rocket.android.db
 
 import android.app.Application
+import chat.rocket.android.server.domain.TokenRepository
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
 
 @Singleton
-class DatabaseManagerFactory @Inject constructor(private val context: Application) {
+class DatabaseManagerFactory @Inject constructor(
+    private val context: Application,
+    private val tokenRepository: TokenRepository
+) {
     private val cache = HashMap<String, DatabaseManager>()
 
     fun create(serverUrl: String): DatabaseManager {
@@ -15,9 +19,10 @@ class DatabaseManagerFactory @Inject constructor(private val context: Applicatio
             return it
         }
 
-        Timber.d("Returning FRESH database for $serverUrl")
-        val db = DatabaseManager(context, serverUrl)
-        cache[serverUrl] = db
-        return db
+        Timber.d("Returning fresh database for $serverUrl")
+        with(DatabaseManager(context, serverUrl, tokenRepository.get(serverUrl)!!)) {
+            cache[serverUrl] = this
+            return this
+        }
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/db/RCDatabase.kt b/app/src/main/java/chat/rocket/android/db/RCDatabase.kt
index 96084c7ff6..78178a34a6 100644
--- a/app/src/main/java/chat/rocket/android/db/RCDatabase.kt
+++ b/app/src/main/java/chat/rocket/android/db/RCDatabase.kt
@@ -32,7 +32,7 @@ import chat.rocket.android.emoji.internal.db.StringListConverter
         ReactionEntity::class,
         MessagesSync::class
     ],
-    version = 12,
+    version = 13,
     exportSchema = true
 )
 @TypeConverters(StringListConverter::class)
diff --git a/app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt b/app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt
index f3d0aed820..e709003705 100644
--- a/app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt
+++ b/app/src/main/java/chat/rocket/android/db/model/ChatRoomEntity.kt
@@ -26,6 +26,7 @@ import chat.rocket.android.emoji.internal.db.StringListConverter
 data class ChatRoomEntity(
     @PrimaryKey var id: String,
     var subscriptionId: String,
+    var parentId: String?,
     var type: String,
     var name: String,
     var fullname: String? = null,
diff --git a/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryAdapter.kt b/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryAdapter.kt
new file mode 100644
index 0000000000..44e6aacda7
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryAdapter.kt
@@ -0,0 +1,108 @@
+package chat.rocket.android.directory.adapter
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.R
+import chat.rocket.android.directory.uimodel.DirectoryUiModel
+import chat.rocket.android.util.extensions.inflate
+
+private const val VIEW_TYPE_CHANNELS = 0
+private const val VIEW_TYPE_USERS = 1
+private const val VIEW_TYPE_GLOBAL_USERS = 2
+
+class DirectoryAdapter(private val selector: Selector) :
+    RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+    private var isSortByChannels: Boolean = true
+    private var isSearchForGlobalUsers: Boolean = true
+    private var dataSet: List<DirectoryUiModel> = ArrayList()
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder =
+        when (viewType) {
+            VIEW_TYPE_CHANNELS -> DirectoryChannelViewHolder(
+                parent.inflate(R.layout.item_directory_channel)
+            )
+            VIEW_TYPE_USERS -> DirectoryUsersViewHolder(
+                parent.inflate(R.layout.item_directory_user)
+            )
+            VIEW_TYPE_GLOBAL_USERS -> DirectoryGlobalUsersViewHolder(
+                parent.inflate(R.layout.item_directory_user)
+            )
+            else -> throw IllegalStateException("viewType must be either VIEW_TYPE_CHANNELS, VIEW_TYPE_USERS or VIEW_TYPE_GLOBAL_USERS")
+        }
+
+    override fun getItemCount(): Int = dataSet.size
+
+    override fun getItemViewType(position: Int): Int {
+        return if (isSortByChannels) {
+            VIEW_TYPE_CHANNELS
+        } else {
+            if (isSearchForGlobalUsers) {
+                VIEW_TYPE_GLOBAL_USERS
+            } else {
+                VIEW_TYPE_USERS
+            }
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) =
+        when (holder) {
+            is DirectoryChannelViewHolder -> bindDirectoryChannelViewHolder(holder, position)
+            is DirectoryUsersViewHolder -> bindDirectoryUsersViewHolder(holder, position)
+            is DirectoryGlobalUsersViewHolder -> bindDirectoryGlobalUsersViewHolder(
+                holder,
+                position
+            )
+            else -> throw IllegalStateException("Unable to bind ViewHolder. ViewHolder must be either DirectoryChannelViewHolder, DirectoryUsersViewHolder or DirectoryGlobalUsersViewHolder")
+        }
+
+    private fun bindDirectoryChannelViewHolder(holder: DirectoryChannelViewHolder, position: Int) {
+        with(dataSet[position]) {
+            holder.bind(this)
+            holder.itemView.setOnClickListener { selector.onChannelSelected(id, name) }
+        }
+    }
+
+    private fun bindDirectoryUsersViewHolder(holder: DirectoryUsersViewHolder, position: Int) {
+        with(dataSet[position]) {
+            holder.bind(this)
+            holder.itemView.setOnClickListener { selector.onUserSelected(username, name) }
+        }
+    }
+
+    private fun bindDirectoryGlobalUsersViewHolder(
+        holder: DirectoryGlobalUsersViewHolder,
+        position: Int
+    ) {
+        with(dataSet[position]) {
+            holder.bind(this)
+            holder.itemView.setOnClickListener { selector.onGlobalUserSelected(username, name) }
+        }
+    }
+
+    fun clearData() {
+        dataSet = emptyList()
+        notifyDataSetChanged()
+    }
+
+    fun setSorting(isSortByChannels: Boolean, isSearchForGlobalUsers: Boolean) {
+        this.isSortByChannels = isSortByChannels
+        this.isSearchForGlobalUsers = isSearchForGlobalUsers
+    }
+
+    fun prependData(dataSet: List<DirectoryUiModel>) {
+        this.dataSet = dataSet
+        notifyItemRangeInserted(0, dataSet.size)
+    }
+
+    fun appendData(dataSet: List<DirectoryUiModel>) {
+        val previousDataSetSize = this.dataSet.size
+        this.dataSet += dataSet
+        notifyItemRangeInserted(previousDataSetSize, dataSet.size)
+    }
+}
+
+interface Selector {
+    fun onChannelSelected(channelId: String, channelName: String)
+    fun onUserSelected(username: String, name: String)
+    fun onGlobalUserSelected(username: String, name: String)
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryChannelViewHolder.kt b/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryChannelViewHolder.kt
new file mode 100644
index 0000000000..1156008b9e
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryChannelViewHolder.kt
@@ -0,0 +1,17 @@
+package chat.rocket.android.directory.adapter
+
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.directory.uimodel.DirectoryUiModel
+import com.bumptech.glide.Glide
+import kotlinx.android.synthetic.main.item_directory_channel.view.*
+
+class DirectoryChannelViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    fun bind(directoryChannelUiModel: DirectoryUiModel) = with(itemView) {
+        Glide.with(image_avatar).load(directoryChannelUiModel.channelAvatarUri).into(image_avatar)
+        text_channel_name.text = directoryChannelUiModel.name
+        text_channel_description.text = directoryChannelUiModel.description
+        text_channel_total_members.text = directoryChannelUiModel.totalMembers
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryGlobalUsersViewHolder.kt b/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryGlobalUsersViewHolder.kt
new file mode 100644
index 0000000000..57c19fb952
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryGlobalUsersViewHolder.kt
@@ -0,0 +1,21 @@
+package chat.rocket.android.directory.adapter
+
+import android.view.View
+import androidx.core.view.isVisible
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.directory.uimodel.DirectoryUiModel
+import com.bumptech.glide.Glide
+import kotlinx.android.synthetic.main.item_directory_user.view.*
+
+class DirectoryGlobalUsersViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    fun bind(directoryChannelUiModel: DirectoryUiModel) = with(itemView) {
+        Glide.with(image_avatar).load(directoryChannelUiModel.userAvatarUri).into(image_avatar)
+        text_user_name.text = directoryChannelUiModel.name
+        text_user_username.text = directoryChannelUiModel.username
+        with(text_server_url) {
+            text = directoryChannelUiModel.serverUrl
+            isVisible = true
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryUsersViewHolder.kt b/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryUsersViewHolder.kt
new file mode 100644
index 0000000000..e2351a16cb
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/adapter/DirectoryUsersViewHolder.kt
@@ -0,0 +1,18 @@
+package chat.rocket.android.directory.adapter
+
+import android.view.View
+import androidx.core.view.isGone
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.directory.uimodel.DirectoryUiModel
+import com.bumptech.glide.Glide
+import kotlinx.android.synthetic.main.item_directory_user.view.*
+
+class DirectoryUsersViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
+
+    fun bind(directoryChannelUiModel: DirectoryUiModel) = with(itemView) {
+        Glide.with(image_avatar).load(directoryChannelUiModel.userAvatarUri).into(image_avatar)
+        text_user_name.text = directoryChannelUiModel.name
+        text_user_username.text = directoryChannelUiModel.username
+        text_server_url.isGone = true
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/directory/di/DirectoryFragmentModule.kt b/app/src/main/java/chat/rocket/android/directory/di/DirectoryFragmentModule.kt
new file mode 100644
index 0000000000..75e71e55aa
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/di/DirectoryFragmentModule.kt
@@ -0,0 +1,15 @@
+package chat.rocket.android.directory.di
+
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.directory.presentation.DirectoryView
+import chat.rocket.android.directory.ui.DirectoryFragment
+import dagger.Module
+import dagger.Provides
+
+@Module
+class DirectoryFragmentModule {
+
+    @Provides
+    @PerFragment
+    fun directoryView(frag: DirectoryFragment): DirectoryView = frag
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/directory/di/DirectoryFragmentProvider.kt b/app/src/main/java/chat/rocket/android/directory/di/DirectoryFragmentProvider.kt
new file mode 100644
index 0000000000..38ad5bb288
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/di/DirectoryFragmentProvider.kt
@@ -0,0 +1,15 @@
+package chat.rocket.android.directory.di
+
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.directory.ui.DirectoryFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class DirectoryFragmentProvider {
+
+    @ContributesAndroidInjector(modules = [DirectoryFragmentModule::class])
+    @PerFragment
+    abstract fun provideDirectoryFragment(): DirectoryFragment
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/directory/presentation/DirectoryPresenter.kt b/app/src/main/java/chat/rocket/android/directory/presentation/DirectoryPresenter.kt
new file mode 100644
index 0000000000..8063e6c897
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/presentation/DirectoryPresenter.kt
@@ -0,0 +1,189 @@
+package chat.rocket.android.directory.presentation
+
+import chat.rocket.android.chatrooms.domain.FetchChatRoomsInteractor
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.db.DatabaseManager
+import chat.rocket.android.db.model.ChatRoomEntity
+import chat.rocket.android.directory.uimodel.DirectoryUiModelMapper
+import chat.rocket.android.helper.UserHelper
+import chat.rocket.android.main.presentation.MainNavigator
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
+import chat.rocket.android.util.extension.launchUI
+import chat.rocket.common.model.RoomType
+import chat.rocket.common.model.roomTypeOf
+import chat.rocket.common.util.ifNull
+import chat.rocket.core.RocketChatClient
+import chat.rocket.core.internal.rest.DirectoryRequestType
+import chat.rocket.core.internal.rest.DirectoryWorkspaceType
+import chat.rocket.core.internal.rest.createDirectMessage
+import chat.rocket.core.internal.rest.directory
+import chat.rocket.core.internal.rest.getInfo
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Named
+
+class DirectoryPresenter @Inject constructor(
+    private val view: DirectoryView,
+    private val navigator: MainNavigator,
+    private val strategy: CancelStrategy,
+    @Named("currentServer") private val currentServer: String,
+    private val dbManager: DatabaseManager,
+    private val userHelper: UserHelper,
+    val factory: RocketChatClientFactory,
+    private val mapper: DirectoryUiModelMapper
+) {
+    private val client: RocketChatClient = factory.get(currentServer)
+    private var offset: Long = 0
+
+    fun loadAllDirectoryChannels(query: String? = null) {
+        launchUI(strategy) {
+            try {
+                view.showLoading()
+                val directoryResult = client.directory(
+                    text = query,
+                    directoryRequestType = DirectoryRequestType.Channels(),
+                    offset = offset,
+                    count = 60
+                )
+                val directoryUiModels = mapper.mapToUiModelList(directoryResult.result)
+                view.showChannels(directoryUiModels)
+                offset += 1 * 60L
+            } catch (exception: Exception) {
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            } finally {
+                view.hideLoading()
+            }
+        }
+    }
+
+    fun loadAllDirectoryUsers(isSearchForGlobalUsers: Boolean, query: String? = null) {
+        launchUI(strategy) {
+            try {
+                view.showLoading()
+                val directoryResult = client.directory(
+                    text = query,
+                    directoryRequestType = DirectoryRequestType.Users(),
+                    directoryWorkspaceType = if (isSearchForGlobalUsers) {
+                        DirectoryWorkspaceType.All()
+                    } else {
+                        DirectoryWorkspaceType.Local()
+                    },
+                    offset = offset,
+                    count = 60
+                )
+                val directoryUiModels = mapper.mapToUiModelList(directoryResult.result)
+                view.showUsers(directoryUiModels)
+                offset += 1 * 60L
+            } catch (exception: Exception) {
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            } finally {
+                view.hideLoading()
+            }
+        }
+    }
+
+    fun updateSorting(
+        isSortByChannels: Boolean,
+        isSearchForGlobalUsers: Boolean,
+        query: String? = null
+    ) {
+        resetOffset()
+        if (isSortByChannels) {
+            loadAllDirectoryChannels(query)
+        } else {
+            loadAllDirectoryUsers(isSearchForGlobalUsers, query)
+        }
+    }
+
+    fun toChannel(channelId: String, name: String) {
+        launchUI(strategy) {
+            try {
+                view.showLoading()
+                withContext(Dispatchers.Default) {
+                    val chatRoom = client.getInfo(channelId, name, roomTypeOf(RoomType.CHANNEL))
+                    navigator.toChatRoom(
+                        chatRoomId = channelId,
+                        chatRoomName = name,
+                        chatRoomType = RoomType.CHANNEL,
+                        isReadOnly = chatRoom.readonly,
+                        chatRoomLastSeen = -1,
+                        isSubscribed = false,
+                        isCreator = false,
+                        isFavorite = false
+                    )
+
+                }
+            } catch (ex: Exception) {
+                Timber.e(ex)
+                ex.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            } finally {
+                view.hideLoading()
+            }
+        }
+    }
+
+    fun tiDirectMessage(username: String, name: String) {
+        launchUI(strategy) {
+            try {
+                view.showLoading()
+
+                withContext(Dispatchers.Default) {
+                    val directMessage = client.createDirectMessage(username)
+
+                    val chatRoomEntity = ChatRoomEntity(
+                        id = directMessage.id,
+                        parentId = null,
+                        name = username,
+                        description = null,
+                        type = RoomType.DIRECT_MESSAGE,
+                        fullname = name,
+                        subscriptionId = "",
+                        updatedAt = directMessage.updatedAt
+                    )
+
+                    dbManager.insertOrReplaceRoom(chatRoomEntity)
+
+                    FetchChatRoomsInteractor(client, dbManager).refreshChatRooms()
+
+                    navigator.toChatRoom(
+                        chatRoomId = chatRoomEntity.id,
+                        chatRoomName = chatRoomEntity.name,
+                        chatRoomType = chatRoomEntity.type,
+                        isReadOnly = false,
+                        chatRoomLastSeen = -1,
+                        isSubscribed = chatRoomEntity.open,
+                        isCreator = true,
+                        isFavorite = false
+                    )
+                }
+            } catch (ex: Exception) {
+                Timber.e(ex)
+                ex.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            } finally {
+                view.hideLoading()
+            }
+        }
+    }
+
+    private fun resetOffset() {
+        offset = 0
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/directory/presentation/DirectoryView.kt b/app/src/main/java/chat/rocket/android/directory/presentation/DirectoryView.kt
new file mode 100644
index 0000000000..9b7d03ee92
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/presentation/DirectoryView.kt
@@ -0,0 +1,22 @@
+package chat.rocket.android.directory.presentation
+
+import chat.rocket.android.core.behaviours.LoadingView
+import chat.rocket.android.core.behaviours.MessageView
+import chat.rocket.android.directory.uimodel.DirectoryUiModel
+
+interface DirectoryView : MessageView, LoadingView {
+
+    /**
+     * Shows the list of directory channels.
+     *
+     * @param dataSet The data set to show.
+     */
+    fun showChannels(dataSet: List<DirectoryUiModel>)
+
+    /**
+     * Shows the list of directory users.
+     *
+     * @param dataSet The data set to show.
+     */
+    fun showUsers(dataSet: List<DirectoryUiModel>)
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/directory/ui/DirectoryFragment.kt b/app/src/main/java/chat/rocket/android/directory/ui/DirectoryFragment.kt
new file mode 100644
index 0000000000..5df73e7c99
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/ui/DirectoryFragment.kt
@@ -0,0 +1,250 @@
+package chat.rocket.android.directory.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.Menu
+import android.view.MenuInflater
+import android.view.MenuItem
+import android.view.View
+import android.view.ViewGroup
+import androidx.appcompat.app.AppCompatActivity
+import androidx.appcompat.widget.SearchView
+import androidx.core.view.isVisible
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.DividerItemDecoration
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.R
+import chat.rocket.android.analytics.AnalyticsManager
+import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.directory.adapter.DirectoryAdapter
+import chat.rocket.android.directory.adapter.Selector
+import chat.rocket.android.directory.presentation.DirectoryPresenter
+import chat.rocket.android.directory.presentation.DirectoryView
+import chat.rocket.android.directory.uimodel.DirectoryUiModel
+import chat.rocket.android.helper.EndlessRecyclerViewScrollListener
+import chat.rocket.android.util.extension.onQueryTextListener
+import chat.rocket.android.util.extensions.inflate
+import chat.rocket.android.util.extensions.isNotNullNorBlank
+import chat.rocket.android.util.extensions.showToast
+import chat.rocket.android.util.extensions.ui
+import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.app_bar.*
+import kotlinx.android.synthetic.main.fragment_directory.*
+import kotlinx.android.synthetic.main.fragment_settings.view_loading
+import javax.inject.Inject
+
+internal const val TAG_DIRECTORY_FRAGMENT = "DirectoryFragment"
+
+fun newInstance(): Fragment = DirectoryFragment()
+
+class DirectoryFragment : Fragment(), DirectoryView {
+    @Inject lateinit var analyticsManager: AnalyticsManager
+    @Inject lateinit var presenter: DirectoryPresenter
+    private var isSortByChannels: Boolean = true
+    private var isSearchForGlobalUsers: Boolean = false
+    private val linearLayoutManager = LinearLayoutManager(context)
+    private val directoryAdapter = DirectoryAdapter(object : Selector {
+        override fun onChannelSelected(channelId: String, channelName: String) {
+            presenter.toChannel(channelId, channelName)
+        }
+        override fun onUserSelected(username: String, name: String) {
+            presenter.tiDirectMessage(username, name)
+        }
+        override fun onGlobalUserSelected(username: String, name: String) {
+            presenter.tiDirectMessage(username, name)
+        }
+    })
+    private val hashtagDrawable by lazy {
+        DrawableHelper.getDrawableFromId(R.drawable.ic_hashtag_16dp, text_sort_by.context)
+    }
+    private val userDrawable by lazy {
+        DrawableHelper.getDrawableFromId(R.drawable.ic_user_16dp, text_sort_by.context)
+    }
+    private val arrowDownDrawable by lazy {
+        DrawableHelper.getDrawableFromId(R.drawable.ic_arrow_down, text_sort_by.context)
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+        setHasOptionsMenu(true)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? = container?.inflate(R.layout.fragment_directory)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupToolbar()
+        setupRecyclerView()
+        setupListeners()
+        presenter.loadAllDirectoryChannels()
+        analyticsManager.logScreenView(ScreenViewEvent.Directory)
+    }
+
+    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
+        super.onCreateOptionsMenu(menu, inflater)
+        inflater.inflate(R.menu.directory, menu)
+
+        val searchMenuItem = menu.findItem(R.id.action_search)
+        val searchView = searchMenuItem?.actionView as SearchView
+
+        with(searchView) {
+            setIconifiedByDefault(false)
+            maxWidth = Integer.MAX_VALUE
+            onQueryTextListener { updateSorting(isSortByChannels, isSearchForGlobalUsers, it) }
+        }
+
+        searchMenuItem.setOnActionExpandListener(object : MenuItem.OnActionExpandListener {
+            override fun onMenuItemActionCollapse(item: MenuItem): Boolean {
+                updateSorting(isSortByChannels, isSearchForGlobalUsers, reload = true)
+                return true
+            }
+
+            override fun onMenuItemActionExpand(item: MenuItem): Boolean {
+                return true
+            }
+        })
+
+    }
+
+
+    override fun showChannels(dataSet: List<DirectoryUiModel>) {
+        ui {
+            if (directoryAdapter.itemCount == 0) {
+                directoryAdapter.prependData(dataSet)
+                if (dataSet.size >= 60) {
+                    recycler_view.addOnScrollListener(object :
+                        EndlessRecyclerViewScrollListener(linearLayoutManager) {
+                        override fun onLoadMore(
+                            page: Int,
+                            totalItemsCount: Int,
+                            recyclerView: RecyclerView
+                        ) {
+                            presenter.loadAllDirectoryChannels()
+                        }
+                    })
+                }
+            } else {
+                directoryAdapter.appendData(dataSet)
+            }
+        }
+    }
+
+    override fun showUsers(dataSet: List<DirectoryUiModel>) {
+        ui {
+            if (directoryAdapter.itemCount == 0) {
+                directoryAdapter.prependData(dataSet)
+                if (dataSet.size >= 60) {
+                    recycler_view.addOnScrollListener(object :
+                        EndlessRecyclerViewScrollListener(linearLayoutManager) {
+                        override fun onLoadMore(
+                            page: Int,
+                            totalItemsCount: Int,
+                            recyclerView: RecyclerView
+                        ) {
+                            presenter.loadAllDirectoryUsers(isSearchForGlobalUsers)
+                        }
+                    })
+                }
+            } else {
+                directoryAdapter.appendData(dataSet)
+            }
+        }
+    }
+
+    override fun showMessage(resId: Int) {
+        ui { showToast(resId) }
+    }
+
+    override fun showMessage(message: String) {
+        ui { showToast(message) }
+    }
+
+    override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
+
+    override fun showLoading() {
+        view_loading.isVisible = true
+    }
+
+    override fun hideLoading() {
+        view_loading.isVisible = false
+    }
+
+    fun updateSorting(
+        isSortByChannels: Boolean,
+        isSearchForGlobalUsers: Boolean,
+        query: String? = null,
+        reload: Boolean = false
+    ) {
+        if (query.isNotNullNorBlank() || reload) {
+            directoryAdapter.clearData()
+            presenter.updateSorting(isSortByChannels, isSearchForGlobalUsers, query)
+        }
+
+        if (this.isSortByChannels != isSortByChannels ||
+            this.isSearchForGlobalUsers != isSearchForGlobalUsers
+        ) {
+            this.isSortByChannels = isSortByChannels
+            this.isSearchForGlobalUsers = isSearchForGlobalUsers
+            updateSortByTitle()
+            with(directoryAdapter) {
+                clearData()
+                setSorting(isSortByChannels, isSearchForGlobalUsers)
+            }
+            presenter.updateSorting(isSortByChannels, isSearchForGlobalUsers, query)
+        }
+    }
+
+    private fun setupToolbar() {
+        with((activity as AppCompatActivity)) {
+            with(toolbar) {
+                setSupportActionBar(this)
+                title = getString(R.string.msg_directory)
+                setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+                setNavigationOnClickListener { activity?.onBackPressed() }
+            }
+        }
+    }
+
+    private fun setupRecyclerView() {
+        ui {
+            with(recycler_view) {
+                layoutManager = linearLayoutManager
+                addItemDecoration(DividerItemDecoration(it, DividerItemDecoration.HORIZONTAL))
+                adapter = directoryAdapter
+            }
+        }
+    }
+
+    private fun setupListeners() {
+        text_sort_by.setOnClickListener {
+            activity?.supportFragmentManager?.let {
+                showDirectorySortingBottomSheetFragment(isSortByChannels, isSearchForGlobalUsers, it)
+            }
+        }
+    }
+
+
+    private fun updateSortByTitle() {
+        if (isSortByChannels) {
+            text_sort_by.text = getString(R.string.msg_channels)
+            DrawableHelper.compoundStartAndEndDrawable(
+                text_sort_by,
+                hashtagDrawable,
+                arrowDownDrawable
+            )
+        } else {
+            text_sort_by.text = getString(R.string.msg_users)
+            DrawableHelper.compoundStartAndEndDrawable(
+                text_sort_by,
+                userDrawable,
+                arrowDownDrawable
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/directory/ui/DirectorySortingBottomSheetFragment.kt b/app/src/main/java/chat/rocket/android/directory/ui/DirectorySortingBottomSheetFragment.kt
new file mode 100644
index 0000000000..31ca732f3a
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/ui/DirectorySortingBottomSheetFragment.kt
@@ -0,0 +1,123 @@
+package chat.rocket.android.directory.ui
+
+import DrawableHelper
+import android.content.DialogInterface
+import android.graphics.drawable.Drawable
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.fragment.app.FragmentManager
+import chat.rocket.android.R
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import kotlinx.android.synthetic.main.bottom_sheet_fragment_directory_sorting.*
+
+fun showDirectorySortingBottomSheetFragment(
+    isSortByChannels: Boolean,
+    isSearchForGlobalUsers: Boolean,
+    supportFragmentManager: FragmentManager
+) = DirectorySortingBottomSheetFragment().apply {
+    arguments = Bundle(2).apply {
+        putBoolean(BUNDLE_IS_SORT_BY_CHANNELS, isSortByChannels)
+        putBoolean(BUNDLE_IS_SEARCH_FOR_GLOBAL_USERS, isSearchForGlobalUsers)
+    }
+}.show(supportFragmentManager, TAG)
+
+internal const val TAG = "DirectorySortingBottomSheetFragment"
+
+private const val BUNDLE_IS_SORT_BY_CHANNELS = "is_sort_by_channels"
+private const val BUNDLE_IS_SEARCH_FOR_GLOBAL_USERS = "is_search_for_global_users"
+
+class DirectorySortingBottomSheetFragment : BottomSheetDialogFragment() {
+    private var isSortByChannels = true
+    private var isSearchForGlobalUsers = false
+    private val hashtagDrawable by lazy {
+        DrawableHelper.getDrawableFromId(R.drawable.ic_hashtag_16dp, requireContext())
+    }
+    private val userDrawable by lazy {
+        DrawableHelper.getDrawableFromId(R.drawable.ic_user_16dp, requireContext())
+    }
+    private val checkDrawable by lazy {
+        DrawableHelper.getDrawableFromId(R.drawable.ic_check, requireContext())
+    }
+    private val directoryFragment by lazy {
+        activity?.supportFragmentManager?.findFragmentByTag(TAG_DIRECTORY_FRAGMENT) as DirectoryFragment
+    }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        arguments?.run {
+            isSortByChannels = getBoolean(BUNDLE_IS_SORT_BY_CHANNELS)
+            isSearchForGlobalUsers = getBoolean(BUNDLE_IS_SEARCH_FOR_GLOBAL_USERS)
+        }
+            ?: requireNotNull(arguments) { "no arguments supplied when the bottom sheet fragment was instantiated" }
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? =
+        inflater.inflate(R.layout.bottom_sheet_fragment_directory_sorting, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        setupView()
+        setupListeners()
+    }
+
+    override fun onCancel(dialog: DialogInterface?) {
+        super.onCancel(dialog)
+    }
+
+    private fun setupView() {
+        if (isSortByChannels) {
+            checkSelection(text_channels, hashtagDrawable)
+        } else {
+            checkSelection(text_users, userDrawable)
+        }
+
+        switch_global_users.isChecked = isSearchForGlobalUsers
+    }
+
+    private fun setupListeners() {
+        text_channels.setOnClickListener {
+            checkSelection(text_channels, hashtagDrawable)
+            uncheckSelection(text_users, userDrawable)
+            isSortByChannels = true
+            directoryFragment.updateSorting(isSortByChannels, isSearchForGlobalUsers)
+        }
+
+        text_users.setOnClickListener {
+            checkSelection(text_users, userDrawable)
+            uncheckSelection(text_channels, hashtagDrawable)
+            isSortByChannels = false
+            directoryFragment.updateSorting(isSortByChannels, isSearchForGlobalUsers)
+        }
+
+        switch_global_users.setOnCheckedChangeListener { _, isChecked ->
+            isSearchForGlobalUsers = isChecked
+            directoryFragment.updateSorting(isSortByChannels, isSearchForGlobalUsers)
+        }
+    }
+
+    private fun checkSelection(textView: TextView, startDrawable: Drawable) {
+        context?.let {
+            DrawableHelper.compoundStartAndEndDrawable(
+                textView,
+                startDrawable,
+                checkDrawable
+            )
+        }
+    }
+
+    private fun uncheckSelection(textView: TextView, startDrawable: Drawable) {
+        context?.let {
+            DrawableHelper.compoundStartDrawable(
+                textView,
+                startDrawable
+            )
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/directory/uimodel/DirectoryUiModel.kt b/app/src/main/java/chat/rocket/android/directory/uimodel/DirectoryUiModel.kt
new file mode 100644
index 0000000000..df586f9dcd
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/uimodel/DirectoryUiModel.kt
@@ -0,0 +1,35 @@
+package chat.rocket.android.directory.uimodel
+
+import chat.rocket.android.util.extensions.avatarUrl
+import chat.rocket.common.model.Token
+import chat.rocket.core.model.DirectoryResult
+
+class DirectoryUiModel(
+    private val directoryResult: DirectoryResult,
+    private val baseUrl: String?,
+    private val token: Token?
+) {
+    val id: String = directoryResult.id
+    val channelAvatarUri: String?
+    val userAvatarUri: String?
+    val name: String = directoryResult.name
+    val username: String = "@${directoryResult.username}"
+    val serverUrl: String = "" // TODO
+    val description: String = "" // TODO
+    val totalMembers: String = "" // TODO
+
+    init {
+        channelAvatarUri = getChannelAvatar()
+        userAvatarUri = getUserAvatar()
+    }
+
+    private fun getChannelAvatar(): String? {
+        return baseUrl?.avatarUrl(name, token?.userId, token?.authToken, isGroupOrChannel = true)
+    }
+
+    private fun getUserAvatar(): String? {
+        return directoryResult.username?.let {
+            baseUrl?.avatarUrl(it, token?.userId, token?.authToken)
+        }
+    }
+}
diff --git a/app/src/main/java/chat/rocket/android/directory/uimodel/DirectoryUiModelMapper.kt b/app/src/main/java/chat/rocket/android/directory/uimodel/DirectoryUiModelMapper.kt
new file mode 100644
index 0000000000..47564b9120
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/directory/uimodel/DirectoryUiModelMapper.kt
@@ -0,0 +1,23 @@
+package chat.rocket.android.directory.uimodel
+
+import chat.rocket.android.server.domain.GetSettingsInteractor
+import chat.rocket.android.server.domain.TokenRepository
+import chat.rocket.android.server.domain.baseUrl
+import chat.rocket.core.model.DirectoryResult
+import chat.rocket.core.model.Value
+import javax.inject.Inject
+import javax.inject.Named
+
+class DirectoryUiModelMapper @Inject constructor(
+    getSettingsInteractor: GetSettingsInteractor,
+    @Named("currentServer") private val currentServer: String,
+    tokenRepository: TokenRepository
+) {
+    private var settings: Map<String, Value<Any>> = getSettingsInteractor.get(currentServer)
+    private val baseUrl = settings.baseUrl()
+    private val token = tokenRepository.get(currentServer)
+
+    fun mapToUiModelList(directoryList: List<DirectoryResult>): List<DirectoryUiModel> {
+        return directoryList.map { DirectoryUiModel(it, baseUrl, token) }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt b/app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt
index 3d6a655dea..3f13d09d89 100644
--- a/app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/favoritemessages/presentation/FavoriteMessagesPresenter.kt
@@ -3,9 +3,8 @@ package chat.rocket.android.favoritemessages.presentation
 import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
-import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
@@ -23,7 +22,7 @@ class FavoriteMessagesPresenter @Inject constructor(
     private val mapper: UiModelMapper,
     val factory: RocketChatClientFactory
 ) {
-    private val client: RocketChatClient = factory.create(currentServer)
+    private val client: RocketChatClient = factory.get(currentServer)
     private var offset: Int = 0
 
     /**
diff --git a/app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt b/app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt
index 38275e4015..be0bb30f61 100644
--- a/app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/files/presentation/FilesPresenter.kt
@@ -5,9 +5,8 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.files.uimodel.FileUiModel
 import chat.rocket.android.files.uimodel.FileUiModelMapper
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
-import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
@@ -25,7 +24,7 @@ class FilesPresenter @Inject constructor(
     private val mapper: FileUiModelMapper,
     val factory: RocketChatClientFactory
 ) {
-    private val client: RocketChatClient = factory.create(currentServer)
+    private val client: RocketChatClient = factory.get(currentServer)
     private var offset: Int = 0
 
     /**
diff --git a/app/src/main/java/chat/rocket/android/helper/AndroidPermissionsHelper.kt b/app/src/main/java/chat/rocket/android/helper/AndroidPermissionsHelper.kt
index 8effca8c56..8b12ba0908 100644
--- a/app/src/main/java/chat/rocket/android/helper/AndroidPermissionsHelper.kt
+++ b/app/src/main/java/chat/rocket/android/helper/AndroidPermissionsHelper.kt
@@ -1,23 +1,60 @@
 package chat.rocket.android.helper
 
+import android.Manifest
 import android.app.Activity
 import android.content.Context
 import android.content.pm.PackageManager
+import android.view.ContextThemeWrapper
 import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
+import androidx.fragment.app.Fragment
 
 object AndroidPermissionsHelper {
 
     const val WRITE_EXTERNAL_STORAGE_CODE = 1
+    const val CAMERA_CODE = 2
 
-    fun checkPermission(context: Context, permission: String): Boolean {
+    private fun checkPermission(context: Context, permission: String): Boolean {
         return ContextCompat.checkSelfPermission(
             context,
             permission
         ) == PackageManager.PERMISSION_GRANTED
     }
 
-    fun requestPermission(context: Activity, permission: String, requestCode: Int) {
+    private fun requestPermission(context: Activity, permission: String, requestCode: Int) {
         ActivityCompat.requestPermissions(context, arrayOf(permission), requestCode)
     }
+
+    fun hasCameraPermission(context: Context): Boolean {
+        return checkPermission(context, Manifest.permission.CAMERA)
+    }
+
+    fun getCameraPermission(fragment: Fragment) {
+        fragment.requestPermissions(
+            arrayOf(Manifest.permission.CAMERA),
+            CAMERA_CODE
+        )
+    }
+
+    fun hasWriteExternalStoragePermission(context: Context): Boolean {
+        return checkPermission(context, Manifest.permission.WRITE_EXTERNAL_STORAGE)
+    }
+
+    fun getWriteExternalStoragePermission(fragment: Fragment) {
+        fragment.requestPermissions(
+            arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE),
+            WRITE_EXTERNAL_STORAGE_CODE
+        )
+    }
+
+    fun checkWritingPermission(context: Context) {
+        if (context is ContextThemeWrapper) {
+            val activity = if (context.baseContext is Activity) context.baseContext as Activity else context as Activity
+            requestPermission(
+                activity,
+                Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                WRITE_EXTERNAL_STORAGE_CODE
+            )
+        }
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/helper/Constants.kt b/app/src/main/java/chat/rocket/android/helper/Constants.kt
deleted file mode 100644
index 7dbeb08ec2..0000000000
--- a/app/src/main/java/chat/rocket/android/helper/Constants.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package chat.rocket.android.helper
-
-object Constants {
-    const val CHATROOM_SORT_TYPE_KEY: String = "chatroom_sort_type"
-    const val CHATROOM_GROUP_BY_TYPE_KEY: String = "chatroom_group_by_type"
-    const val CHATROOM_GROUP_FAVOURITES_KEY: String = "chatroom_group_favourites"
-
-    //Used to sort chat rooms
-    const val CHATROOM_CHANNEL = 0
-    const val CHATROOM_PRIVATE_GROUP = 1
-    const val CHATROOM_DM = 2
-    const val CHATROOM_LIVE_CHAT = 3
-}
-
-object ChatRoomsSortOrder {
-    const val ALPHABETICAL: Int = 0
-    const val ACTIVITY: Int = 1
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/helper/ImageHelper.kt b/app/src/main/java/chat/rocket/android/helper/ImageHelper.kt
index 0d48ed25d5..5fe5944860 100644
--- a/app/src/main/java/chat/rocket/android/helper/ImageHelper.kt
+++ b/app/src/main/java/chat/rocket/android/helper/ImageHelper.kt
@@ -1,7 +1,5 @@
 package chat.rocket.android.helper
 
-import android.Manifest
-import android.app.Activity
 import android.content.Context
 import android.graphics.Color
 import android.graphics.Typeface
@@ -9,7 +7,6 @@ import android.media.MediaScannerConnection
 import android.os.Environment
 import android.text.TextUtils
 import android.util.TypedValue
-import android.view.ContextThemeWrapper
 import android.view.ViewGroup
 import android.widget.ImageView
 import android.widget.TextView
@@ -18,6 +15,8 @@ import androidx.appcompat.widget.Toolbar
 import androidx.core.net.toUri
 import androidx.core.view.setPadding
 import chat.rocket.android.R
+import chat.rocket.android.helper.AndroidPermissionsHelper.checkWritingPermission
+import chat.rocket.android.helper.AndroidPermissionsHelper.hasWriteExternalStoragePermission
 import com.facebook.binaryresource.FileBinaryResource
 import com.facebook.cache.common.CacheKey
 import com.facebook.imageformat.ImageFormatChecker
@@ -117,7 +116,7 @@ object ImageHelper {
     }
 
     private fun saveImage(context: Context): Boolean {
-        if (!canWriteToExternalStorage(context)) {
+        if (!hasWriteExternalStoragePermission(context)) {
             checkWritingPermission(context)
             return false
         }
@@ -152,22 +151,4 @@ object ImageHelper {
         }
         return true
     }
-
-    fun canWriteToExternalStorage(context: Context): Boolean {
-        return AndroidPermissionsHelper.checkPermission(
-            context,
-            Manifest.permission.WRITE_EXTERNAL_STORAGE
-        )
-    }
-
-    fun checkWritingPermission(context: Context) {
-        if (context is ContextThemeWrapper) {
-            val activity = if (context.baseContext is Activity) context.baseContext as Activity else context as Activity
-            AndroidPermissionsHelper.requestPermission(
-                activity,
-                Manifest.permission.WRITE_EXTERNAL_STORAGE,
-                AndroidPermissionsHelper.WRITE_EXTERNAL_STORAGE_CODE
-            )
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/helper/JitsiHelper.kt b/app/src/main/java/chat/rocket/android/helper/JitsiHelper.kt
index b123cfe547..37a746d471 100644
--- a/app/src/main/java/chat/rocket/android/helper/JitsiHelper.kt
+++ b/app/src/main/java/chat/rocket/android/helper/JitsiHelper.kt
@@ -3,7 +3,7 @@ package chat.rocket.android.helper
 object JitsiHelper {
 
     /**
-     * Returns the for the Jitsi video conferencing URL.
+     * Returns the Jitsi video conferencing URL.
      *
      * @param isSecureProtocol True if using SSL, false otherwise - from the public settings.
      * @param domain The Jitsi domain - from public settings.
diff --git a/app/src/main/java/chat/rocket/android/helper/MessageParser.kt b/app/src/main/java/chat/rocket/android/helper/MessageParser.kt
index bdfad6bcc5..655691eabf 100644
--- a/app/src/main/java/chat/rocket/android/helper/MessageParser.kt
+++ b/app/src/main/java/chat/rocket/android/helper/MessageParser.kt
@@ -94,10 +94,16 @@ class MessageParser @Inject constructor(
     }
 
     private fun getMention(user: SimpleUser): String {
+        user.id?.let {
+            if (SYSTEM_MENTIONS.contains(it)) {
+                return "@$it"
+            }
+        }
+
         return if (settings.useRealName()) {
-            user.name ?: "@${user.username}"
+            user.name ?: user.username.orEmpty()
         } else {
-            "@${user.username}"
+            user.username.orEmpty()
         }
     }
 
@@ -527,5 +533,7 @@ class MessageParser @Inject constructor(
          */
         private val WEB_URL = Pattern.compile(
             "($WEB_URL_WITH_PROTOCOL|$WEB_URL_WITHOUT_PROTOCOL)")
+
+        private val SYSTEM_MENTIONS = arrayOf("all", "here")
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/helper/OauthHelper.kt b/app/src/main/java/chat/rocket/android/helper/OauthHelper.kt
index 241529214e..952dab1454 100644
--- a/app/src/main/java/chat/rocket/android/helper/OauthHelper.kt
+++ b/app/src/main/java/chat/rocket/android/helper/OauthHelper.kt
@@ -15,11 +15,11 @@ object OauthHelper {
                 "\"isCordova\":true}").encodeToBase64()
 
     /**
-     * Returns the Github Oauth URL.
+     * Returns the GitHub Oauth URL.
      *
      * @param clientId The GitHub client ID.
      * @param state An unguessable random string used to protect against forgery attacks.
-     * @return The Github Oauth URL.
+     * @return The GitHub Oauth URL.
      */
     fun getGithubOauthUrl(clientId: String, state: String): String {
         return "https://github.com/login/oauth/authorize" +
@@ -46,12 +46,12 @@ object OauthHelper {
     }
 
     /**
-     * Returns the Linkedin Oauth URL.
+     * Returns the LinkedIn Oauth URL.
      *
-     * @param clientId The Linkedin client ID.
+     * @param clientId The LinkedIn client ID.
      * @param serverUrl The server URL.
      * @param state An unguessable random string used to protect against forgery attacks.
-     * @return The Linkedin Oauth URL.
+     * @return The LinkedIn Oauth URL.
      */
     fun getLinkedinOauthUrl(clientId: String, serverUrl: String, state: String): String {
         return "https://linkedin.com/oauth/v2/authorization" +
@@ -62,13 +62,13 @@ object OauthHelper {
     }
 
     /**
-     * Returns the Gitlab Oauth URL.
+     * Returns the GitLab Oauth URL.
      *
-     * @param host The Gitlab host.
-     * @param clientId The Gitlab client ID.
+     * @param host The GitLab host.
+     * @param clientId The GitLab client ID.
      * @param serverUrl The server URL.
      * @param state An unguessable random string used to protect against forgery attacks.
-     * @return The Gitlab Oauth URL.
+     * @return The GitLab Oauth URL.
      */
     fun getGitlabOauthUrl(
         host: String? = "https://gitlab.com",
diff --git a/app/src/main/java/chat/rocket/android/helper/SharedPreferenceHelper.kt b/app/src/main/java/chat/rocket/android/helper/SharedPreferenceHelper.kt
deleted file mode 100644
index 61e789af81..0000000000
--- a/app/src/main/java/chat/rocket/android/helper/SharedPreferenceHelper.kt
+++ /dev/null
@@ -1,48 +0,0 @@
-package chat.rocket.android.helper
-
-import android.content.SharedPreferences
-import android.preference.PreferenceManager
-import chat.rocket.android.app.RocketChatApplication
-
-object SharedPreferenceHelper {
-    private var sharedPreferences: SharedPreferences = PreferenceManager.getDefaultSharedPreferences(RocketChatApplication.getAppContext())
-    private var editor: SharedPreferences.Editor? = sharedPreferences.edit()
-
-    //Add more methods for other types if needed
-
-    fun putInt(key: String, value: Int) {
-        editor!!.putInt(key, value).apply()
-    }
-
-    fun getInt(key: String, defaultValue: Int): Int {
-        return sharedPreferences.getInt(key, defaultValue)
-    }
-
-    fun putLong(key: String, value: Long) {
-        editor!!.putLong(key, value).apply()
-    }
-
-    fun getLong(key: String, defaultValue: Long): Long {
-        return sharedPreferences.getLong(key, defaultValue)
-    }
-
-    fun putString(key: String, value: String) {
-        editor!!.putString(key, value).apply()
-    }
-
-    fun getString(key: String, defaultValue: String): String? {
-        return sharedPreferences.getString(key, defaultValue)
-    }
-
-    fun putBoolean(key: String, value: Boolean) {
-        editor!!.putBoolean(key, value).apply()
-    }
-
-    fun getBoolean(key: String, defaultValue: Boolean): Boolean {
-        return sharedPreferences.getBoolean(key, defaultValue)
-    }
-
-    fun remove(key: String) {
-        editor!!.remove(key).apply()
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/helper/UserHelper.kt b/app/src/main/java/chat/rocket/android/helper/UserHelper.kt
index 90e9ede0e2..06d5289e73 100644
--- a/app/src/main/java/chat/rocket/android/helper/UserHelper.kt
+++ b/app/src/main/java/chat/rocket/android/helper/UserHelper.kt
@@ -24,6 +24,24 @@ class UserHelper @Inject constructor(
      */
     fun username(): String? = localRepository.get(LocalRepository.CURRENT_USERNAME_KEY, null)
 
+    /**
+     * Return the name for the current logged [User].
+     */
+    fun name(): String? = user()?.name
+
+    /**
+     * Return the display name for the given [user].
+     * If setting 'Use_Real_Name' is true then the real name will be given, otherwise the username
+     * without the '@' is yielded.
+     */
+    fun displayName(user: User) = getCurrentServerInteractor.get()?.let {
+        if (settingsRepository.get(it).useRealName()) {
+            user.name
+        } else {
+            user.username
+        }
+    }
+
     /**
      * Return the display name for the given [user].
      * If setting 'Use_Real_Name' is true then the real name will be given, otherwise the username
diff --git a/app/src/main/java/chat/rocket/android/main/adapter/AccountViewHolder.kt b/app/src/main/java/chat/rocket/android/main/adapter/AccountViewHolder.kt
deleted file mode 100644
index 6c9e79dc4a..0000000000
--- a/app/src/main/java/chat/rocket/android/main/adapter/AccountViewHolder.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package chat.rocket.android.main.adapter
-
-import androidx.recyclerview.widget.RecyclerView
-import android.view.View
-import chat.rocket.android.server.domain.model.Account
-import kotlinx.android.synthetic.main.item_account.view.*
-
-class AccountViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-    fun bind(account: Account) {
-        with(itemView) {
-            server_logo.setImageURI(account.serverLogo)
-            text_server_url.text = account.serverUrl
-            text_username.text = account.userName
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/main/adapter/AccountsAdapter.kt b/app/src/main/java/chat/rocket/android/main/adapter/AccountsAdapter.kt
deleted file mode 100644
index d3b8683263..0000000000
--- a/app/src/main/java/chat/rocket/android/main/adapter/AccountsAdapter.kt
+++ /dev/null
@@ -1,68 +0,0 @@
-package chat.rocket.android.main.adapter
-
-import androidx.recyclerview.widget.RecyclerView
-import android.view.ViewGroup
-import chat.rocket.android.R
-import chat.rocket.android.server.domain.model.Account
-import chat.rocket.android.util.extensions.inflate
-import chat.rocket.common.model.UserStatus
-
-private const val VIEW_TYPE_CHANGE_STATUS = 0
-private const val VIEW_TYPE_ACCOUNT = 1
-private const val VIEW_TYPE_ADD_ACCOUNT = 2
-
-class AccountsAdapter(
-    private val accounts: List<Account>,
-    private val selector: Selector
-) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
-
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
-        return when (viewType) {
-            VIEW_TYPE_CHANGE_STATUS -> StatusViewHolder(parent.inflate(R.layout.item_change_status))
-            VIEW_TYPE_ACCOUNT -> AccountViewHolder(parent.inflate(R.layout.item_account))
-            else -> AddAccountViewHolder(parent.inflate(R.layout.item_add_account))
-        }
-    }
-
-    override fun getItemCount() = accounts.size + 2
-
-    override fun getItemViewType(position: Int): Int {
-        return when {
-            position == 0 -> VIEW_TYPE_CHANGE_STATUS
-            position <= accounts.size -> VIEW_TYPE_ACCOUNT
-            else -> VIEW_TYPE_ADD_ACCOUNT
-        }
-    }
-
-    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
-        when (holder) {
-            is StatusViewHolder -> bindStatusViewHolder(holder)
-            is AccountViewHolder -> bindAccountViewHolder(holder, position)
-            is AddAccountViewHolder -> bindAddAccountViewHolder(holder)
-        }
-    }
-
-    private fun bindStatusViewHolder(holder: StatusViewHolder) {
-        holder.bind { userStatus -> selector.onStatusSelected(userStatus) }
-    }
-
-    private fun bindAccountViewHolder(holder: AccountViewHolder, position: Int) {
-        val account = accounts[position - 1]
-        holder.bind(account)
-        holder.itemView.setOnClickListener {
-            selector.onAccountSelected(account.serverUrl)
-        }
-    }
-
-    private fun bindAddAccountViewHolder(holder: AddAccountViewHolder) {
-        holder.itemView.setOnClickListener {
-            selector.onAddedAccountSelected()
-        }
-    }
-}
-
-interface Selector {
-    fun onStatusSelected(userStatus: UserStatus)
-    fun onAccountSelected(serverUrl: String)
-    fun onAddedAccountSelected()
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/main/adapter/AddAccountViewHolder.kt b/app/src/main/java/chat/rocket/android/main/adapter/AddAccountViewHolder.kt
deleted file mode 100644
index 4660dadb12..0000000000
--- a/app/src/main/java/chat/rocket/android/main/adapter/AddAccountViewHolder.kt
+++ /dev/null
@@ -1,6 +0,0 @@
-package chat.rocket.android.main.adapter
-
-import androidx.recyclerview.widget.RecyclerView
-import android.view.View
-
-class AddAccountViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/main/adapter/StatusViewHolder.kt b/app/src/main/java/chat/rocket/android/main/adapter/StatusViewHolder.kt
deleted file mode 100644
index 86fae29681..0000000000
--- a/app/src/main/java/chat/rocket/android/main/adapter/StatusViewHolder.kt
+++ /dev/null
@@ -1,18 +0,0 @@
-package chat.rocket.android.main.adapter
-
-import androidx.recyclerview.widget.RecyclerView
-import android.view.View
-import chat.rocket.common.model.UserStatus
-import kotlinx.android.synthetic.main.item_change_status.view.*
-
-class StatusViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
-
-    fun bind(listener: (UserStatus) -> Unit) {
-        with(itemView) {
-            text_online.setOnClickListener { listener(UserStatus.Online()) }
-            text_away.setOnClickListener { listener(UserStatus.Away()) }
-            text_busy.setOnClickListener { listener(UserStatus.Busy()) }
-            text_invisible.setOnClickListener { listener(UserStatus.Offline()) }
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/main/di/MainModule.kt b/app/src/main/java/chat/rocket/android/main/di/MainModule.kt
index 91ae6a7ad4..ab8819e171 100644
--- a/app/src/main/java/chat/rocket/android/main/di/MainModule.kt
+++ b/app/src/main/java/chat/rocket/android/main/di/MainModule.kt
@@ -1,10 +1,10 @@
 package chat.rocket.android.main.di
 
 import androidx.lifecycle.LifecycleOwner
+import chat.rocket.android.core.behaviours.AppLanguageView
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerActivity
 import chat.rocket.android.main.presentation.MainNavigator
-import chat.rocket.android.main.presentation.MainView
 import chat.rocket.android.main.ui.MainActivity
 import dagger.Module
 import dagger.Provides
@@ -15,14 +15,17 @@ class MainModule {
 
     @Provides
     @PerActivity
-    fun provideJob() = Job()
+    fun provideMainNavigator(activity: MainActivity) = MainNavigator(activity)
 
     @Provides
     @PerActivity
-    fun provideMainNavigator(activity: MainActivity) = MainNavigator(activity)
+    fun appLanguageView(activity: MainActivity): AppLanguageView {
+        return activity
+    }
 
     @Provides
-    fun provideMainView(activity: MainActivity): MainView = activity
+    @PerActivity
+    fun provideJob() = Job()
 
     @Provides
     fun provideLifecycleOwner(activity: MainActivity): LifecycleOwner = activity
diff --git a/app/src/main/java/chat/rocket/android/main/presentation/MainNavigator.kt b/app/src/main/java/chat/rocket/android/main/presentation/MainNavigator.kt
index c149448922..49b8da299f 100644
--- a/app/src/main/java/chat/rocket/android/main/presentation/MainNavigator.kt
+++ b/app/src/main/java/chat/rocket/android/main/presentation/MainNavigator.kt
@@ -3,51 +3,60 @@ package chat.rocket.android.main.presentation
 import chat.rocket.android.R
 import chat.rocket.android.authentication.ui.newServerIntent
 import chat.rocket.android.chatroom.ui.chatRoomIntent
-import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
 import chat.rocket.android.chatrooms.ui.TAG_CHAT_ROOMS_FRAGMENT
-import chat.rocket.android.createchannel.ui.CreateChannelFragment
 import chat.rocket.android.createchannel.ui.TAG_CREATE_CHANNEL_FRAGMENT
+import chat.rocket.android.directory.ui.TAG_DIRECTORY_FRAGMENT
 import chat.rocket.android.main.ui.MainActivity
-import chat.rocket.android.profile.ui.ProfileFragment
 import chat.rocket.android.profile.ui.TAG_PROFILE_FRAGMENT
 import chat.rocket.android.server.ui.changeServerIntent
-import chat.rocket.android.settings.ui.SettingsFragment
 import chat.rocket.android.settings.ui.TAG_SETTINGS_FRAGMENT
 import chat.rocket.android.util.extensions.addFragment
-import chat.rocket.android.webview.adminpanel.ui.AdminPanelWebViewFragment
+import chat.rocket.android.util.extensions.addFragmentBackStack
+import chat.rocket.android.webview.adminpanel.ui.TAG_ADMIN_PANEL_WEB_VIEW_FRAGMENT
+import chat.rocket.android.webview.ui.webViewIntent
 
 class MainNavigator(internal val activity: MainActivity) {
 
     fun toChatList(chatRoomId: String? = null) {
         activity.addFragment(TAG_CHAT_ROOMS_FRAGMENT, R.id.fragment_container) {
-            ChatRoomsFragment.newInstance(chatRoomId)
+            chat.rocket.android.chatrooms.ui.newInstance(chatRoomId)
         }
     }
 
-    fun toCreateChannel() {
-        activity.addFragment(TAG_CREATE_CHANNEL_FRAGMENT, R.id.fragment_container) {
-            CreateChannelFragment.newInstance()
+    fun toSettings() {
+        activity.addFragmentBackStack(TAG_SETTINGS_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.settings.ui.newInstance()
         }
     }
 
-    fun toUserProfile() {
-        activity.addFragment(TAG_PROFILE_FRAGMENT, R.id.fragment_container) {
-            ProfileFragment.newInstance()
+    fun toDirectory() {
+        activity.addFragmentBackStack(TAG_DIRECTORY_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.directory.ui.newInstance()
         }
     }
 
-    fun toSettings() {
-        activity.addFragment(TAG_SETTINGS_FRAGMENT, R.id.fragment_container) {
-            SettingsFragment.newInstance()
+    fun toCreateChannel() {
+        activity.addFragmentBackStack(TAG_CREATE_CHANNEL_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.createchannel.ui.newInstance()
+        }
+    }
+
+    fun toProfile() {
+        activity.addFragmentBackStack(TAG_PROFILE_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.profile.ui.newInstance()
         }
     }
 
     fun toAdminPanel(webPageUrl: String, userToken: String) {
-        activity.addFragment("AdminPanelWebViewFragment", R.id.fragment_container) {
-            AdminPanelWebViewFragment.newInstance(webPageUrl, userToken)
+        activity.addFragmentBackStack(TAG_ADMIN_PANEL_WEB_VIEW_FRAGMENT, R.id.fragment_container) {
+            chat.rocket.android.webview.adminpanel.ui.newInstance(webPageUrl, userToken)
         }
     }
 
+    fun toLicense(licenseUrl: String, licenseTitle: String) {
+        activity.startActivity(activity.webViewIntent(licenseUrl, licenseTitle))
+    }
+
     fun toChatRoom(
         chatRoomId: String,
         chatRoomName: String,
diff --git a/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt b/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
index d192b466b1..f0732314fd 100644
--- a/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/main/presentation/MainPresenter.kt
@@ -1,244 +1,47 @@
 package chat.rocket.android.main.presentation
 
-import android.content.Context
-import chat.rocket.android.core.lifecycle.CancelStrategy
-import chat.rocket.android.db.DatabaseManagerFactory
-import chat.rocket.android.emoji.Emoji
-import chat.rocket.android.emoji.EmojiRepository
-import chat.rocket.android.emoji.Fitzpatrick
-import chat.rocket.android.emoji.internal.EmojiCategory
-import chat.rocket.android.infrastructure.LocalRepository
-import chat.rocket.android.main.uimodel.NavHeaderUiModel
-import chat.rocket.android.main.uimodel.NavHeaderUiModelMapper
+import chat.rocket.android.core.behaviours.AppLanguageView
 import chat.rocket.android.push.GroupedPush
-import chat.rocket.android.server.domain.GetAccountsInteractor
-import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.domain.GetSettingsInteractor
-import chat.rocket.android.server.domain.PublicSettings
-import chat.rocket.android.server.domain.RefreshSettingsInteractor
+import chat.rocket.android.server.domain.GetCurrentLanguageInteractor
 import chat.rocket.android.server.domain.RefreshPermissionsInteractor
-import chat.rocket.android.server.domain.RemoveAccountInteractor
-import chat.rocket.android.server.domain.SaveAccountInteractor
-import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.domain.favicon
-import chat.rocket.android.server.domain.model.Account
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
-import chat.rocket.android.server.presentation.CheckServerPresenter
-import chat.rocket.android.util.extension.launchUI
-import chat.rocket.android.util.extensions.adminPanelUrl
-import chat.rocket.android.util.extensions.serverLogoUrl
-import chat.rocket.android.util.retryIO
-import chat.rocket.common.RocketChatAuthException
-import chat.rocket.common.RocketChatException
-import chat.rocket.common.model.UserStatus
-import chat.rocket.common.util.ifNull
-import chat.rocket.core.RocketChatClient
-import chat.rocket.core.internal.rest.getCustomEmojis
-import chat.rocket.core.internal.rest.me
-import chat.rocket.core.model.Myself
-import kotlinx.coroutines.channels.Channel
-import timber.log.Timber
+import chat.rocket.android.server.domain.RefreshSettingsInteractor
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import javax.inject.Inject
+import javax.inject.Named
 
 class MainPresenter @Inject constructor(
-    private val view: MainView,
-    private val strategy: CancelStrategy,
-    private val navigator: MainNavigator,
-    private val tokenRepository: TokenRepository,
+    @Named("currentServer") private val currentServerUrl: String,
+    private val mainNavigator: MainNavigator,
+    private val appLanguageView: AppLanguageView,
     private val refreshSettingsInteractor: RefreshSettingsInteractor,
     private val refreshPermissionsInteractor: RefreshPermissionsInteractor,
-    private val navHeaderMapper: NavHeaderUiModelMapper,
-    private val saveAccountInteractor: SaveAccountInteractor,
-    private val getAccountsInteractor: GetAccountsInteractor,
-    private val groupedPush: GroupedPush,
-    serverInteractor: GetCurrentServerInteractor,
-    localRepository: LocalRepository,
-    removeAccountInteractor: RemoveAccountInteractor,
-    factory: RocketChatClientFactory,
-    dbManagerFactory: DatabaseManagerFactory,
-    getSettingsInteractor: GetSettingsInteractor,
-    managerFactory: ConnectionManagerFactory
-) : CheckServerPresenter(
-    strategy = strategy,
-    factory = factory,
-    serverInteractor = serverInteractor,
-    localRepository = localRepository,
-    removeAccountInteractor = removeAccountInteractor,
-    tokenRepository = tokenRepository,
-    managerFactory = managerFactory,
-    dbManagerFactory = dbManagerFactory,
-    tokenView = view,
-    navigator = navigator
+    private val connectionManagerFactory: ConnectionManagerFactory,
+    private var getLanguageInteractor: GetCurrentLanguageInteractor,
+    private val groupedPush: GroupedPush
 ) {
-    private val currentServer = serverInteractor.get()!!
-    private val manager = managerFactory.create(currentServer)
-    private val client: RocketChatClient = factory.create(currentServer)
-    private var settings: PublicSettings = getSettingsInteractor.get(serverInteractor.get()!!)
-    private val userDataChannel = Channel<Myself>()
-
-    fun toChatList(chatRoomId: String? = null) = navigator.toChatList(chatRoomId)
-
-    fun toUserProfile() = navigator.toUserProfile()
-
-    fun toSettings() = navigator.toSettings()
-
-    fun toAdminPanel() = tokenRepository.get(currentServer)?.let {
-        navigator.toAdminPanel(currentServer.adminPanelUrl(), it.authToken)
-    }
-
-    fun toCreateChannel() = navigator.toCreateChannel()
-
-    fun loadServerAccounts() {
-        launchUI(strategy) {
-            try {
-                view.setupServerAccountList(getAccountsInteractor.get())
-            } catch (ex: Exception) {
-                when (ex) {
-                    is RocketChatAuthException -> logout()
-                    else -> {
-                        Timber.d(ex, "Error loading serve accounts")
-                        ex.message?.let {
-                            view.showMessage(it)
-                        }.ifNull {
-                            view.showGenericErrorMessage()
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    fun loadCurrentInfo() {
-        setupConnectionInfo(currentServer)
-        checkServerInfo(currentServer)
-        launchUI(strategy) {
-            try {
-                val me = retryIO("me") { client.me() }
-                val model = navHeaderMapper.mapToUiModel(me)
-                saveAccount(model)
-                view.setupUserAccountInfo(model)
-            } catch (ex: Exception) {
-                when (ex) {
-                    is RocketChatAuthException -> logout()
-                    else -> {
-                        Timber.d(ex, "Error loading my information for navheader")
-                        ex.message?.let {
-                            view.showMessage(it)
-                        }.ifNull {
-                            view.showGenericErrorMessage()
-                        }
-                    }
-                }
-            }
-            subscribeMyselfUpdates()
-        }
-    }
-
-    /**
-     * Load all emojis for the current server. Simple emojis are always the same for every server,
-     * but custom emojis vary according to the its url.
-     */
-    fun loadEmojis() {
-        launchUI(strategy) {
-            EmojiRepository.setCurrentServerUrl(currentServer)
-            val customEmojiList = mutableListOf<Emoji>()
-            try {
-                for (customEmoji in retryIO("getCustomEmojis()") { client.getCustomEmojis() }) {
-                    customEmojiList.add(Emoji(
-                        shortname = ":${customEmoji.name}:",
-                        category = EmojiCategory.CUSTOM.name,
-                        url = "$currentServer/emoji-custom/${customEmoji.name}.${customEmoji.extension}",
-                        count = 0,
-                        fitzpatrick = Fitzpatrick.Default.type,
-                        keywords = customEmoji.aliases,
-                        shortnameAlternates = customEmoji.aliases,
-                        siblings = mutableListOf(),
-                        unicode = "",
-                        isDefault = true
-                    ))
-                }
-
-                EmojiRepository.load(view as Context, customEmojis = customEmojiList)
-            } catch (ex: RocketChatException) {
-                Timber.e(ex)
-                EmojiRepository.load(view as Context)
-            }
-        }
-    }
-
-    fun logout() {
-        setupConnectionInfo(currentServer)
-        super.logout(userDataChannel)
-    }
 
     fun connect() {
-        refreshSettingsInteractor.refreshAsync(currentServer)
-        refreshPermissionsInteractor.refreshAsync(currentServer)
-        manager.connect()
-    }
-
-    fun disconnect() {
-        setupConnectionInfo(currentServer)
-        super.disconnect(userDataChannel)
-    }
-
-    fun changeServer(serverUrl: String) {
-        if (currentServer != serverUrl) {
-            navigator.switchOrAddNewServer(serverUrl)
-        } else {
-            view.closeServerSelection()
-        }
-    }
-
-    fun addNewServer() {
-        navigator.toServerScreen()
+        refreshSettingsInteractor.refreshAsync(currentServerUrl)
+        refreshPermissionsInteractor.refreshAsync(currentServerUrl)
+        connectionManagerFactory.create(currentServerUrl).connect()
     }
 
-    fun changeDefaultStatus(userStatus: UserStatus) {
-        launchUI(strategy) {
-            try {
-                manager.setDefaultStatus(userStatus)
-                view.showUserStatus(userStatus)
-            } catch (ex: RocketChatException) {
-                ex.message?.let {
-                    view.showMessage(it)
-                }.ifNull {
-                    view.showGenericErrorMessage()
-                }
-            }
-        }
-    }
-
-    private fun saveAccount(uiModel: NavHeaderUiModel) {
-        val icon = settings.favicon()?.let {
-            currentServer.serverLogoUrl(it)
-        }
-        val account = Account(
-            currentServer,
-            icon,
-            uiModel.serverLogo,
-            uiModel.userDisplayName!!,
-            uiModel.userAvatar
-        )
-        saveAccountInteractor.save(account)
-    }
+    fun clearNotificationsForChatRoom(chatRoomId: String?) {
+        if (chatRoomId == null) return
 
-    private suspend fun subscribeMyselfUpdates() {
-        manager.addUserDataChannel(userDataChannel)
-        for (myself in userDataChannel) {
-            updateMyself(myself)
+        groupedPush.hostToPushMessageList[currentServerUrl].let { list ->
+            list?.removeAll { it.info.roomId == chatRoomId }
         }
     }
 
-    private fun updateMyself(myself: Myself) =
-        view.setupUserAccountInfo(navHeaderMapper.mapToUiModel(myself))
+    fun showChatList(chatRoomId: String? = null) = mainNavigator.toChatList(chatRoomId)
 
-    fun clearNotificationsForChatroom(chatRoomId: String?) {
-        if (chatRoomId == null) return
 
-        groupedPush.hostToPushMessageList[currentServer]?.let { list ->
-            list.removeAll { it.info.roomId == chatRoomId }
+    fun getAppLanguage() {
+        with(getLanguageInteractor) {
+            getLanguage()?.let { language ->
+                appLanguageView.updateLanguage(language, getCountry())
+            }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/main/presentation/MainView.kt b/app/src/main/java/chat/rocket/android/main/presentation/MainView.kt
deleted file mode 100644
index 2047f21bf8..0000000000
--- a/app/src/main/java/chat/rocket/android/main/presentation/MainView.kt
+++ /dev/null
@@ -1,38 +0,0 @@
-package chat.rocket.android.main.presentation
-
-import chat.rocket.android.authentication.server.presentation.VersionCheckView
-import chat.rocket.android.core.behaviours.MessageView
-import chat.rocket.android.main.uimodel.NavHeaderUiModel
-import chat.rocket.android.server.domain.model.Account
-import chat.rocket.android.server.presentation.TokenView
-import chat.rocket.common.model.UserStatus
-
-interface MainView : MessageView, VersionCheckView, TokenView {
-
-    /**
-     * Shows the current user status.
-     *
-     * @see [UserStatus]
-     */
-    fun showUserStatus(userStatus: UserStatus)
-
-    /**
-     * Setups the user account info (displayed in the nav. header)
-     *
-     * @param uiModel The [NavHeaderUiModel].
-     */
-    fun setupUserAccountInfo(uiModel: NavHeaderUiModel)
-
-    /**
-     * Setups the server account list.
-     *
-     * @param serverAccountList The list of server accounts.
-     */
-    fun setupServerAccountList(serverAccountList: List<Account>)
-
-    fun closeServerSelection()
-
-    fun showProgress()
-
-    fun hideProgress()
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
index b7b9476740..1dde86a3e4 100644
--- a/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+++ b/app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
@@ -1,282 +1,85 @@
 package chat.rocket.android.main.ui
 
-import DrawableHelper
 import android.app.Activity
-import androidx.appcompat.app.AlertDialog
-import android.app.ProgressDialog
+import android.app.NotificationManager
+import android.content.Context
+import android.content.res.Configuration
+import android.os.Build
 import android.os.Bundle
-import androidx.annotation.IdRes
+import android.os.LocaleList
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.GravityCompat
-import androidx.drawerlayout.widget.DrawerLayout
 import androidx.fragment.app.Fragment
-import androidx.recyclerview.widget.LinearLayoutManager
-import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
-import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
-import chat.rocket.android.main.adapter.AccountsAdapter
-import chat.rocket.android.main.adapter.Selector
+import chat.rocket.android.core.behaviours.AppLanguageView
 import chat.rocket.android.main.presentation.MainPresenter
-import chat.rocket.android.main.presentation.MainView
-import chat.rocket.android.main.uimodel.NavHeaderUiModel
 import chat.rocket.android.push.refreshPushToken
-import chat.rocket.android.server.domain.PermissionsInteractor
-import chat.rocket.android.server.domain.model.Account
 import chat.rocket.android.server.ui.INTENT_CHAT_ROOM_ID
-import chat.rocket.android.util.extensions.fadeIn
-import chat.rocket.android.util.extensions.fadeOut
-import chat.rocket.android.util.extensions.rotateBy
-import chat.rocket.android.util.extensions.showToast
-import chat.rocket.android.util.invalidateFirebaseToken
-import chat.rocket.common.model.UserStatus
 import dagger.android.AndroidInjection
 import dagger.android.AndroidInjector
 import dagger.android.DispatchingAndroidInjector
 import dagger.android.HasActivityInjector
 import dagger.android.support.HasSupportFragmentInjector
-import kotlinx.android.synthetic.main.activity_main.*
-import kotlinx.android.synthetic.main.app_bar.*
-import kotlinx.android.synthetic.main.nav_header.view.*
+import java.util.*
 import javax.inject.Inject
-import android.app.NotificationManager
-import android.content.Context
-
 
-private const val CURRENT_STATE = "current_state"
-
-class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
-    HasSupportFragmentInjector {
+class MainActivity : AppCompatActivity(), HasActivityInjector,
+    HasSupportFragmentInjector, AppLanguageView {
     @Inject
     lateinit var activityDispatchingAndroidInjector: DispatchingAndroidInjector<Activity>
     @Inject
     lateinit var fragmentDispatchingAndroidInjector: DispatchingAndroidInjector<Fragment>
     @Inject
     lateinit var presenter: MainPresenter
-    @Inject
-    lateinit var permissions: PermissionsInteractor
-    private var isFragmentAdded: Boolean = false
-    private var expanded = false
-    private val headerLayout by lazy { view_navigation.getHeaderView(0) }
-    private var chatRoomId: String? = null
-    private var progressDialog: ProgressDialog? = null
 
     override fun onCreate(savedInstanceState: Bundle?) {
         AndroidInjection.inject(this)
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-
         refreshPushToken()
-        chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
-        presenter.clearNotificationsForChatroom(chatRoomId)
 
-        presenter.connect()
-        presenter.loadServerAccounts()
-        presenter.loadCurrentInfo()
-        presenter.loadEmojis()
-        setupToolbar()
-        setupNavigationView()
-    }
-
-    override fun onSaveInstanceState(outState: Bundle?) {
-        super.onSaveInstanceState(outState)
-        outState?.putBoolean(CURRENT_STATE, isFragmentAdded)
-    }
-
-    override fun onRestoreInstanceState(savedInstanceState: Bundle?) {
-        super.onRestoreInstanceState(savedInstanceState)
-        isFragmentAdded = savedInstanceState?.getBoolean(CURRENT_STATE) ?: false
+        with(presenter) {
+            connect()
+            getAppLanguage()
+            intent.getStringExtra(INTENT_CHAT_ROOM_ID).let {
+                clearNotificationsForChatRoom(it)
+                showChatList(it)
+            }
+        }
     }
 
     override fun onResume() {
         super.onResume()
-        if (!isFragmentAdded) {
-            presenter.toChatList(chatRoomId)
-            isFragmentAdded = true
-        }
-        val notificationManager = getSystemService(Context.NOTIFICATION_SERVICE)
-                as NotificationManager
-        notificationManager.cancelAll()
-    }
-
-    override fun onDestroy() {
-        super.onDestroy()
-        if (isFinishing) {
-            presenter.disconnect()
-        }
+        clearAppNotifications()
     }
 
-    override fun onBackPressed() {
-        if (drawer_layout.isDrawerOpen(GravityCompat.START)) {
-            closeDrawer()
-        } else {
-            supportFragmentManager.findFragmentById(R.id.fragment_container)?.let {
-                if (it !is ChatRoomsFragment && supportFragmentManager.backStackEntryCount == 0) {
-                    presenter.toChatList(chatRoomId)
-                    setCheckedNavDrawerItem(R.id.menu_action_chats)
-                } else {
-                    super.onBackPressed()
-                }
-            }
-        }
-    }
-
-    override fun activityInjector(): AndroidInjector<Activity> = activityDispatchingAndroidInjector
+    override fun activityInjector(): AndroidInjector<Activity> =
+        activityDispatchingAndroidInjector
 
     override fun supportFragmentInjector(): AndroidInjector<Fragment> =
         fragmentDispatchingAndroidInjector
 
-
-    override fun showUserStatus(userStatus: UserStatus) {
-        headerLayout.apply {
-            image_user_status.setImageDrawable(
-                DrawableHelper.getUserStatusDrawable(userStatus, this.context)
-            )
-        }
-    }
-
-    override fun setupUserAccountInfo(uiModel: NavHeaderUiModel) {
-        with(headerLayout) {
-            with(uiModel) {
-                if (userStatus != null) {
-                    image_user_status.setImageDrawable(
-                        DrawableHelper.getUserStatusDrawable(userStatus, context)
-                    )
-                }
-                if (userDisplayName != null) {
-                    text_user_name.text = userDisplayName
-                }
-                if (userAvatar != null) {
-                    setAvatar(userAvatar)
-                }
-                if (serverLogo != null) {
-                    server_logo.setImageURI(serverLogo)
-                }
-                text_server_url.text = uiModel.serverUrl
-            }
-        }
-    }
-
-    override fun setupServerAccountList(serverAccountList: List<Account>) {
-        accounts_list.layoutManager = LinearLayoutManager(this)
-        accounts_list.adapter = AccountsAdapter(serverAccountList, object : Selector {
-            override fun onStatusSelected(userStatus: UserStatus) {
-                presenter.changeDefaultStatus(userStatus)
-            }
-
-            override fun onAccountSelected(serverUrl: String) {
-                presenter.changeServer(serverUrl)
-            }
-
-            override fun onAddedAccountSelected() {
-                presenter.addNewServer()
-            }
-        })
-
-        headerLayout.account_container.setOnClickListener {
-            it.image_account_expand.rotateBy(180f)
-            if (expanded) {
-                accounts_list.fadeOut()
-            } else {
-                accounts_list.fadeIn()
-            }
-            expanded = !expanded
-        }
-
-        headerLayout.image_avatar.setOnClickListener {
-            view_navigation.menu.findItem(R.id.menu_action_profile).isChecked = true
-            presenter.toUserProfile()
-            drawer_layout.closeDrawer(GravityCompat.START)
+    override fun updateLanguage(language: String, country: String?) {
+        val locale: Locale = if (country != null) {
+            Locale(language, country)
+        } else {
+            Locale(language)
         }
-    }
-
-
-    override fun closeServerSelection() {
-        view_navigation.getHeaderView(0).account_container.performClick()
-    }
-
-    override fun alertNotRecommendedVersion() {
-        AlertDialog.Builder(this)
-            .setMessage(
-                getString(
-                    R.string.msg_ver_not_recommended,
-                    BuildConfig.RECOMMENDED_SERVER_VERSION
-                )
-            )
-            .setPositiveButton(android.R.string.ok, null)
-            .create()
-            .show()
-    }
-
-    override fun blockAndAlertNotRequiredVersion() {
-        AlertDialog.Builder(this)
-            .setMessage(
-                getString(
-                    R.string.msg_ver_not_minimum,
-                    BuildConfig.REQUIRED_SERVER_VERSION
-                )
-            )
-            .setOnDismissListener { presenter.logout() }
-            .setPositiveButton(android.R.string.ok, null)
-            .create()
-            .show()
-    }
-
-    override fun invalidateToken(token: String) = invalidateFirebaseToken(token)
-
-    override fun showMessage(resId: Int) = showToast(resId)
 
-    override fun showMessage(message: String) = showToast(message)
+        Locale.setDefault(locale)
 
-    override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
+        val config = Configuration()
 
-    private fun setupToolbar() {
-        setSupportActionBar(toolbar)
-    }
-
-    fun setupNavigationView() {
-        with (view_navigation.menu) {
-            clear()
-            setupMenu(this)
-        }
-
-        view_navigation.setNavigationItemSelectedListener {
-            it.isChecked = true
-            closeDrawer()
-            onNavDrawerItemSelected(it)
-            true
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            config.locales = LocaleList(locale)
+        } else {
+            config.locale = locale
         }
 
-        toolbar.setNavigationIcon(R.drawable.ic_menu_white_24dp)
-        toolbar.setNavigationOnClickListener { openDrawer() }
-    }
-
-    fun showLogoutDialog() {
-        val builder = AlertDialog.Builder(this)
-        builder.setTitle(R.string.title_are_you_sure)
-            .setPositiveButton(R.string.action_logout) { _, _ -> presenter.logout()}
-            .setNegativeButton(android.R.string.no) { dialog, _ -> dialog.cancel() }
-            .create()
-            .show()
-    }
-
-    fun setAvatar(avatarUrl: String) {
-        headerLayout.image_avatar.setImageURI(avatarUrl)
-    }
-
-    fun getDrawerLayout(): DrawerLayout = drawer_layout
-
-    fun openDrawer() = drawer_layout.openDrawer(GravityCompat.START)
-
-    fun closeDrawer() = drawer_layout.closeDrawer(GravityCompat.START)
-
-    fun setCheckedNavDrawerItem(@IdRes item: Int) = view_navigation.setCheckedItem(item)
-
-    override fun showProgress() {
-        progressDialog = ProgressDialog.show(this, getString(R.string.app_name), getString(R.string.msg_log_out), true, false)
+        // TODO We need to check out a better way to use createConfigurationContext
+        // instead of updateConfiguration here since it is deprecated.
+        resources.updateConfiguration(config, resources.displayMetrics)
     }
 
-    override fun hideProgress() {
-        progressDialog?.dismiss()
-        progressDialog = null
-    }
+    private fun clearAppNotifications() =
+        (getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager).cancelAll()
 }
diff --git a/app/src/main/java/chat/rocket/android/main/ui/Menu.kt b/app/src/main/java/chat/rocket/android/main/ui/Menu.kt
deleted file mode 100644
index d0cdf4ca92..0000000000
--- a/app/src/main/java/chat/rocket/android/main/ui/Menu.kt
+++ /dev/null
@@ -1,69 +0,0 @@
-package chat.rocket.android.main.ui
-
-import android.view.Menu
-import android.view.MenuItem
-import chat.rocket.android.R
-
-internal fun MainActivity.setupMenu(menu: Menu) {
-    with(menu) {
-        add(
-            R.id.menu_section_one,
-            R.id.menu_action_chats,
-            Menu.NONE,
-            R.string.title_chats
-        ).setIcon(R.drawable.ic_chat_bubble_black_24dp)
-            .isChecked = true
-
-        add(
-            R.id.menu_section_one,
-            R.id.menu_action_create_channel,
-            Menu.NONE,
-            R.string.action_create_channel
-        ).setIcon(R.drawable.ic_create_black_24dp)
-
-        add(
-            R.id.menu_section_two,
-            R.id.menu_action_profile,
-            Menu.NONE,
-            R.string.title_profile
-        ).setIcon(R.drawable.ic_person_black_20dp)
-
-        add(
-            R.id.menu_section_two,
-            R.id.menu_action_settings,
-            Menu.NONE,
-            R.string.title_settings
-        ).setIcon(R.drawable.ic_settings_black_24dp)
-
-        if (permissions.canSeeTheAdminPanel()) {
-            add(
-                R.id.menu_section_two,
-                R.id.menu_action_admin_panel,
-                Menu.NONE,
-                R.string.title_admin_panel
-            ).setIcon(R.drawable.ic_settings_black_24dp)
-        }
-
-        add(
-            R.id.menu_section_three,
-            R.id.menu_action_logout,
-            Menu.NONE,
-            R.string.action_logout
-        ).setIcon(R.drawable.ic_logout_black_24dp)
-
-        setGroupCheckable(R.id.menu_section_one, true, true)
-        setGroupCheckable(R.id.menu_section_two, true, true)
-        setGroupCheckable(R.id.menu_section_three, true, true)
-    }
-}
-
-internal fun MainActivity.onNavDrawerItemSelected(menuItem: MenuItem) {
-    when (menuItem.itemId) {
-        R.id.menu_action_chats-> presenter.toChatList()
-        R.id.menu_action_create_channel -> presenter.toCreateChannel()
-        R.id.menu_action_profile -> presenter.toUserProfile()
-        R.id.menu_action_settings -> presenter.toSettings()
-        R.id.menu_action_admin_panel -> presenter.toAdminPanel()
-        R.id.menu_action_logout -> showLogoutDialog()
-    }
-}
diff --git a/app/src/main/java/chat/rocket/android/main/uimodel/NavHeaderUiModel.kt b/app/src/main/java/chat/rocket/android/main/uimodel/NavHeaderUiModel.kt
deleted file mode 100644
index 1b616dfc15..0000000000
--- a/app/src/main/java/chat/rocket/android/main/uimodel/NavHeaderUiModel.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package chat.rocket.android.main.uimodel
-
-import chat.rocket.common.model.UserStatus
-
-data class NavHeaderUiModel(
-    val userDisplayName: String?,
-    val userStatus: UserStatus?,
-    val userAvatar: String?,
-    val serverUrl: String,
-    val serverLogo: String?
-)
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/main/uimodel/NavHeaderUiModelMapper.kt b/app/src/main/java/chat/rocket/android/main/uimodel/NavHeaderUiModelMapper.kt
deleted file mode 100644
index 6a25e76f99..0000000000
--- a/app/src/main/java/chat/rocket/android/main/uimodel/NavHeaderUiModelMapper.kt
+++ /dev/null
@@ -1,32 +0,0 @@
-package chat.rocket.android.main.uimodel
-
-import chat.rocket.android.server.domain.*
-import chat.rocket.android.util.extensions.avatarUrl
-import chat.rocket.android.util.extensions.serverLogoUrl
-import chat.rocket.core.model.Myself
-import javax.inject.Inject
-
-class NavHeaderUiModelMapper @Inject constructor(
-    serverInteractor: GetCurrentServerInteractor,
-    getSettingsInteractor: GetSettingsInteractor
-) {
-    private val currentServer = serverInteractor.get()!!
-    private var settings: PublicSettings = getSettingsInteractor.get(currentServer)
-
-    fun mapToUiModel(me: Myself): NavHeaderUiModel {
-        val displayName = mapDisplayName(me)
-        val status = me.status
-        val avatar = me.username?.let { currentServer.avatarUrl(it) }
-        val image = settings.wideTile() ?: settings.faviconLarge()
-        val logo = image?.let { currentServer.serverLogoUrl(it) }
-
-        return NavHeaderUiModel(displayName, status, avatar, currentServer, logo)
-    }
-
-    private fun mapDisplayName(me: Myself): String? {
-        val username = me.username
-        val realName = me.name
-        val senderName = if (settings.useRealName()) realName else username
-        return senderName ?: username
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt b/app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt
index a8dbdcc8cd..68095d2768 100644
--- a/app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt
+++ b/app/src/main/java/chat/rocket/android/members/adapter/MembersAdapter.kt
@@ -15,10 +15,10 @@ class MembersAdapter(
 ) : RecyclerView.Adapter<MembersAdapter.ViewHolder>() {
     private var dataSet: List<MemberUiModel> = ArrayList()
 
-    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): MembersAdapter.ViewHolder =
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ViewHolder =
         ViewHolder(parent.inflate(R.layout.item_member))
 
-    override fun onBindViewHolder(holder: MembersAdapter.ViewHolder, position: Int) =
+    override fun onBindViewHolder(holder: ViewHolder, position: Int) =
         holder.bind(dataSet[position], listener)
 
     override fun getItemCount(): Int = dataSet.size
diff --git a/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt b/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
index 882648bad2..94e0858f75 100644
--- a/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/members/presentation/MembersPresenter.kt
@@ -6,7 +6,7 @@ import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.members.uimodel.MemberUiModel
 import chat.rocket.android.members.uimodel.MemberUiModelMapper
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
@@ -27,7 +27,7 @@ class MembersPresenter @Inject constructor(
     val factory: RocketChatClientFactory,
     private val userHelper: UserHelper
 ) {
-    private val client: RocketChatClient = factory.create(currentServer)
+    private val client: RocketChatClient = factory.get(currentServer)
     private var offset: Long = 0
 
     /**
diff --git a/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt b/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
index 261f6eab7d..5c57bd98f1 100644
--- a/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
+++ b/app/src/main/java/chat/rocket/android/members/ui/MembersFragment.kt
@@ -102,15 +102,11 @@ class MembersFragment : Fragment(), MembersView {
     }
 
     override fun showMessage(resId: Int) {
-        ui {
-            showToast(resId)
-        }
+        ui { showToast(resId) }
     }
 
     override fun showMessage(message: String) {
-        ui {
-            showToast(message)
-        }
+        ui { showToast(message) }
     }
 
     override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
diff --git a/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModel.kt b/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModel.kt
index 1487578230..16e78b8096 100644
--- a/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModel.kt
+++ b/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModel.kt
@@ -2,6 +2,7 @@ package chat.rocket.android.members.uimodel
 
 import chat.rocket.android.server.domain.useRealName
 import chat.rocket.android.util.extensions.avatarUrl
+import chat.rocket.common.model.Token
 import chat.rocket.common.model.User
 import chat.rocket.common.model.UserStatus
 import chat.rocket.core.model.Value
@@ -9,7 +10,8 @@ import chat.rocket.core.model.Value
 class MemberUiModel(
     private val member: User,
     private val settings: Map<String, Value<Any>>,
-    private val baseUrl: String?
+    private val baseUrl: String?,
+    private val token: Token?
 ) {
     val userId: String = member.id
     val avatarUri: String?
@@ -33,7 +35,7 @@ class MemberUiModel(
     private fun getUserAvatar(): String? {
         val username = member.username ?: "?"
         return baseUrl?.let {
-            baseUrl.avatarUrl(username, format = "png")
+            baseUrl.avatarUrl(username, token?.userId, token?.authToken, format = "png")
         }
     }
 
diff --git a/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModelMapper.kt b/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModelMapper.kt
index 6cf69f12cb..587aa02ca3 100644
--- a/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModelMapper.kt
+++ b/app/src/main/java/chat/rocket/android/members/uimodel/MemberUiModelMapper.kt
@@ -2,19 +2,24 @@ package chat.rocket.android.members.uimodel
 
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.GetSettingsInteractor
+import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.baseUrl
 import chat.rocket.common.model.User
 import chat.rocket.core.model.Value
 import javax.inject.Inject
+import javax.inject.Named
 
 class MemberUiModelMapper @Inject constructor(
     serverInteractor: GetCurrentServerInteractor,
-    getSettingsInteractor: GetSettingsInteractor
+    getSettingsInteractor: GetSettingsInteractor,
+    @Named("currentServer") private val currentServer: String,
+    tokenRepository: TokenRepository
 ) {
     private var settings: Map<String, Value<Any>> = getSettingsInteractor.get(serverInteractor.get()!!)
     private val baseUrl = settings.baseUrl()
+    private val token = tokenRepository.get(currentServer)
 
     fun mapToUiModelList(memberList: List<User>): List<MemberUiModel> {
-        return memberList.map { MemberUiModel(it, settings, baseUrl) }
+        return memberList.map { MemberUiModel(it, settings, baseUrl, token) }
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/mentions/presentention/MentionsPresenter.kt b/app/src/main/java/chat/rocket/android/mentions/presentention/MentionsPresenter.kt
index aa21f438ff..c985522a67 100644
--- a/app/src/main/java/chat/rocket/android/mentions/presentention/MentionsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/mentions/presentention/MentionsPresenter.kt
@@ -2,7 +2,7 @@ package chat.rocket.android.mentions.presentention
 
 import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.util.ifNull
@@ -18,7 +18,7 @@ class MentionsPresenter @Inject constructor(
     private val mapper: UiModelMapper,
     val factory: RocketChatClientFactory
 ) {
-    private val client = factory.create(currentServer)
+    private val client = factory.get(currentServer)
     private var offset: Long = 0
 
     /**
diff --git a/app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt b/app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt
index fa9f4020ee..d5b030f49a 100644
--- a/app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/pinnedmessages/presentation/PinnedMessagesPresenter.kt
@@ -3,9 +3,8 @@ package chat.rocket.android.pinnedmessages.presentation
 import chat.rocket.android.chatroom.uimodel.UiModelMapper
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.db.DatabaseManager
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
-import chat.rocket.android.util.retryDB
 import chat.rocket.common.RocketChatException
 import chat.rocket.common.model.roomTypeOf
 import chat.rocket.common.util.ifNull
@@ -23,7 +22,7 @@ class PinnedMessagesPresenter @Inject constructor(
     private val mapper: UiModelMapper,
     val factory: RocketChatClientFactory
 ) {
-    private val client: RocketChatClient = factory.create(currentServer)
+    private val client: RocketChatClient = factory.get(currentServer)
     private var offset: Int = 0
 
     /**
diff --git a/app/src/main/java/chat/rocket/android/preferences/di/PreferencesFragmentModule.kt b/app/src/main/java/chat/rocket/android/preferences/di/PreferencesFragmentModule.kt
deleted file mode 100644
index 218a2f9a4c..0000000000
--- a/app/src/main/java/chat/rocket/android/preferences/di/PreferencesFragmentModule.kt
+++ /dev/null
@@ -1,17 +0,0 @@
-package chat.rocket.android.preferences.di
-
-import chat.rocket.android.dagger.scope.PerFragment
-import chat.rocket.android.preferences.presentation.PreferencesView
-import chat.rocket.android.preferences.ui.PreferencesFragment
-import dagger.Module
-import dagger.Provides
-
-@Module
-class PreferencesFragmentModule {
-
-    @Provides
-    @PerFragment
-    fun preferencesView(frag: PreferencesFragment): PreferencesView {
-        return frag
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/preferences/di/PreferencesFragmentProvider.kt b/app/src/main/java/chat/rocket/android/preferences/di/PreferencesFragmentProvider.kt
deleted file mode 100644
index 083beb6768..0000000000
--- a/app/src/main/java/chat/rocket/android/preferences/di/PreferencesFragmentProvider.kt
+++ /dev/null
@@ -1,14 +0,0 @@
-package chat.rocket.android.preferences.di
-
-import chat.rocket.android.dagger.scope.PerFragment
-import chat.rocket.android.preferences.ui.PreferencesFragment
-import dagger.Module
-import dagger.android.ContributesAndroidInjector
-
-@Module
-abstract class PreferencesFragmentProvider {
-
-    @ContributesAndroidInjector(modules = [PreferencesFragmentModule::class])
-    @PerFragment
-    abstract fun providePreferencesFragment(): PreferencesFragment
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesPresenter.kt b/app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesPresenter.kt
deleted file mode 100644
index 38eba6e6db..0000000000
--- a/app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesPresenter.kt
+++ /dev/null
@@ -1,22 +0,0 @@
-package chat.rocket.android.preferences.presentation
-
-import chat.rocket.android.server.domain.AnalyticsTrackingInteractor
-import javax.inject.Inject
-
-class PreferencesPresenter @Inject constructor(
-    private val view: PreferencesView,
-    private val analyticsTrackingInteractor: AnalyticsTrackingInteractor
-) {
-
-    fun loadAnalyticsTrackingInformation() {
-        view.setupAnalyticsTrackingView(analyticsTrackingInteractor.get())
-    }
-
-    fun enableAnalyticsTracking() {
-        analyticsTrackingInteractor.save(true)
-    }
-
-    fun disableAnalyticsTracking() {
-        analyticsTrackingInteractor.save(false)
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesView.kt b/app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesView.kt
deleted file mode 100644
index 6c3d4248ec..0000000000
--- a/app/src/main/java/chat/rocket/android/preferences/presentation/PreferencesView.kt
+++ /dev/null
@@ -1,11 +0,0 @@
-package chat.rocket.android.preferences.presentation
-
-interface PreferencesView {
-
-    /**
-     * Setups the analytics tracking view.
-     *
-     * @param isAnalyticsTrackingEnabled Whether the analytics tracking is enabled
-     */
-    fun setupAnalyticsTrackingView(isAnalyticsTrackingEnabled: Boolean)
-}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/preferences/ui/PreferencesFragment.kt b/app/src/main/java/chat/rocket/android/preferences/ui/PreferencesFragment.kt
deleted file mode 100644
index dcf3b136e4..0000000000
--- a/app/src/main/java/chat/rocket/android/preferences/ui/PreferencesFragment.kt
+++ /dev/null
@@ -1,96 +0,0 @@
-package chat.rocket.android.preferences.ui
-
-import android.os.Bundle
-import android.view.LayoutInflater
-import android.view.View
-import android.view.ViewGroup
-import androidx.fragment.app.Fragment
-import chat.rocket.android.BuildConfig
-import chat.rocket.android.R
-import chat.rocket.android.analytics.AnalyticsManager
-import chat.rocket.android.analytics.event.ScreenViewEvent
-import chat.rocket.android.main.ui.MainActivity
-import chat.rocket.android.preferences.presentation.PreferencesPresenter
-import chat.rocket.android.preferences.presentation.PreferencesView
-import dagger.android.support.AndroidSupportInjection
-import kotlinx.android.synthetic.main.app_bar.*
-import kotlinx.android.synthetic.main.fragment_preferences.*
-import javax.inject.Inject
-
-internal const val TAG_PREFERENCES_FRAGMENT = "PreferencesFragment"
-
-class PreferencesFragment : Fragment(), PreferencesView {
-    @Inject
-    lateinit var presenter: PreferencesPresenter
-    @Inject
-    lateinit var analyticsManager: AnalyticsManager
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        AndroidSupportInjection.inject(this)
-    }
-
-    override fun onCreateView(
-        inflater: LayoutInflater,
-        container: ViewGroup?,
-        savedInstanceState: Bundle?
-    ): View? = inflater.inflate(R.layout.fragment_preferences, container, false)
-
-    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
-        super.onViewCreated(view, savedInstanceState)
-        setupListeners()
-        presenter.loadAnalyticsTrackingInformation()
-
-        analyticsManager.logScreenView(ScreenViewEvent.Preferences)
-    }
-
-    override fun onResume() {
-        setupToolbar()
-        super.onResume()
-    }
-
-    override fun setupAnalyticsTrackingView(isAnalyticsTrackingEnabled: Boolean) {
-        if (BuildConfig.FLAVOR == "foss") {
-            switch_analytics_tracking.isChecked = false
-            switch_analytics_tracking.isEnabled = false
-            text_analytics_tracking_description.text =
-                    getString(R.string.msg_not_applicable_since_it_is_a_foss_version)
-            return
-        }
-
-        if (isAnalyticsTrackingEnabled) {
-            text_analytics_tracking_description.text =
-                    getString(R.string.msg_send_analytics_tracking)
-        } else {
-            text_analytics_tracking_description.text =
-                    getString(R.string.msg_do_not_send_analytics_tracking)
-        }
-        switch_analytics_tracking.isChecked = isAnalyticsTrackingEnabled
-    }
-
-    private fun setupToolbar() {
-        with((activity as MainActivity).toolbar) {
-            title = getString(R.string.title_preferences)
-            setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
-            setNavigationOnClickListener { activity?.onBackPressed() }
-        }
-    }
-
-    private fun setupListeners() {
-        switch_analytics_tracking.setOnCheckedChangeListener { _, isChecked ->
-            if (isChecked) {
-                text_analytics_tracking_description.text =
-                        getString(R.string.msg_send_analytics_tracking)
-                presenter.enableAnalyticsTracking()
-            } else {
-                text_analytics_tracking_description.text =
-                        getString(R.string.msg_do_not_send_analytics_tracking)
-                presenter.disableAnalyticsTracking()
-            }
-        }
-    }
-
-    companion object {
-        fun newInstance() = PreferencesFragment()
-    }
-}
diff --git a/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt b/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
index 826dbdaa86..8212c88323 100644
--- a/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
+++ b/app/src/main/java/chat/rocket/android/profile/presentation/ProfilePresenter.kt
@@ -11,24 +11,23 @@ import chat.rocket.android.main.presentation.MainNavigator
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.RemoveAccountInteractor
 import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.server.presentation.CheckServerPresenter
 import chat.rocket.android.util.extension.compressImageAndGetByteArray
-import chat.rocket.android.util.extension.gethash
 import chat.rocket.android.util.extension.launchUI
-import chat.rocket.android.util.extension.toHex
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
+import chat.rocket.common.model.UserStatus
+import chat.rocket.common.model.userStatusOf
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
-import chat.rocket.core.internal.rest.deleteOwnAccount
+import chat.rocket.core.internal.realtime.setDefaultStatus
+import chat.rocket.core.internal.rest.me
 import chat.rocket.core.internal.rest.resetAvatar
 import chat.rocket.core.internal.rest.setAvatar
 import chat.rocket.core.internal.rest.updateProfile
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.withContext
 import java.util.*
 import javax.inject.Inject
 
@@ -56,18 +55,24 @@ class ProfilePresenter @Inject constructor(
     navigator = navigator
 ) {
     private val serverUrl = serverInteractor.get()!!
-    private val client: RocketChatClient = factory.create(serverUrl)
+    private val client: RocketChatClient = factory.get(serverUrl)
     private val user = userHelper.user()
+    private val token = tokenRepository.get(serverUrl)
 
     fun loadUserProfile() {
         launchUI(strategy) {
             view.showLoading()
             try {
+                val me = retryIO(description = "serverInfo", times = 5) {
+                    client.me()
+                }
+
                 view.showProfile(
-                    serverUrl.avatarUrl(user?.username ?: ""),
-                    user?.name ?: "",
-                    user?.username ?: "",
-                    user?.emails?.getOrNull(0)?.address ?: ""
+                    me.status.toString(),
+                    serverUrl.avatarUrl(me.username!!, token?.userId, token?.authToken),
+                    me.name ?: "",
+                    me.username ?: "",
+                    me.emails?.getOrNull(0)?.address ?: ""
                 )
             } catch (exception: RocketChatException) {
                 view.showMessage(exception)
@@ -82,10 +87,18 @@ class ProfilePresenter @Inject constructor(
             view.showLoading()
             try {
                 user?.id?.let { id ->
-                    retryIO { client.updateProfile(userId = id, email = email, name = name, username = username) }
+                    retryIO {
+                        client.updateProfile(
+                            userId = id,
+                            email = email,
+                            name = name,
+                            username = username
+                        )
+                    }
                     view.showProfileUpdateSuccessfullyMessage()
                     view.showProfile(
-                        serverUrl.avatarUrl(user.username ?: ""),
+                        user.status.toString(),
+                        serverUrl.avatarUrl(user.username!!, token?.userId, token?.authToken),
                         name,
                         username,
                         email
@@ -115,7 +128,15 @@ class ProfilePresenter @Inject constructor(
                         uriInteractor.getInputStream(uri)
                     }
                 }
-                user?.username?.let { view.reloadUserAvatar(serverUrl.avatarUrl(it)) }
+                user?.username?.let {
+                    view.reloadUserAvatar(
+                        serverUrl.avatarUrl(
+                            it,
+                            token?.userId,
+                            token?.authToken
+                        )
+                    )
+                }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)
@@ -143,7 +164,15 @@ class ProfilePresenter @Inject constructor(
                     }
                 }
 
-                user?.username?.let { view.reloadUserAvatar(serverUrl.avatarUrl(it)) }
+                user?.username?.let {
+                    view.reloadUserAvatar(
+                        serverUrl.avatarUrl(
+                            it,
+                            token?.userId,
+                            token?.authToken
+                        )
+                    )
+                }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)
@@ -163,7 +192,15 @@ class ProfilePresenter @Inject constructor(
                 user?.id?.let { id ->
                     retryIO { client.resetAvatar(id) }
                 }
-                user?.username?.let { view.reloadUserAvatar(serverUrl.avatarUrl(it)) }
+                user?.username?.let {
+                    view.reloadUserAvatar(
+                        serverUrl.avatarUrl(
+                            it,
+                            token?.userId,
+                            token?.authToken
+                        )
+                    )
+                }
             } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)
@@ -176,26 +213,17 @@ class ProfilePresenter @Inject constructor(
         }
     }
 
-    fun deleteAccount(password: String) {
+    fun updateStatus(status: UserStatus) {
         launchUI(strategy) {
-            view.showLoading()
             try {
-                withContext(Dispatchers.Default) {
-                    // REMARK: Backend API is only working with a lowercase hash.
-                    // https://github.com/RocketChat/Rocket.Chat/issues/12573
-                    retryIO { client.deleteOwnAccount(password.gethash().toHex().toLowerCase()) }
-                    setupConnectionInfo(serverUrl)
-                    logout(null)
-                }
-            } catch (exception: Exception) {
+                client.setDefaultStatus(status)
+            } catch (exception: RocketChatException) {
                 exception.message?.let {
                     view.showMessage(it)
                 }.ifNull {
                     view.showGenericErrorMessage()
                 }
-            } finally {
-                view.hideLoading()
             }
         }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/profile/presentation/ProfileView.kt b/app/src/main/java/chat/rocket/android/profile/presentation/ProfileView.kt
index 86c8f97620..0ac7abffa5 100644
--- a/app/src/main/java/chat/rocket/android/profile/presentation/ProfileView.kt
+++ b/app/src/main/java/chat/rocket/android/profile/presentation/ProfileView.kt
@@ -9,12 +9,19 @@ interface ProfileView : TokenView, LoadingView, MessageView {
     /**
      * Shows the user profile.
      *
+     * @param status The user status.
      * @param avatarUrl The user avatar URL.
      * @param name The user display name.
      * @param username The user username.
      * @param email The user email.
      */
-    fun showProfile(avatarUrl: String, name: String, username: String, email: String?)
+    fun showProfile(
+        status: String,
+        avatarUrl: String,
+        name: String,
+        username: String,
+        email: String?
+    )
 
     /**
      * Reloads the user avatar (after successfully updating it).
diff --git a/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt b/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
index 2eeff8b2c1..a8d337c7d7 100644
--- a/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
+++ b/app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
@@ -2,8 +2,8 @@ package chat.rocket.android.profile.ui
 
 import DrawableHelper
 import android.app.Activity
-import androidx.appcompat.app.AlertDialog
 import android.content.Intent
+import android.content.pm.PackageManager
 import android.graphics.Bitmap
 import android.os.Build
 import android.os.Bundle
@@ -12,8 +12,8 @@ import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
-import android.view.MenuInflater
-import android.widget.EditText
+import android.widget.RadioGroup
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.appcompat.view.ActionMode
 import androidx.core.net.toUri
@@ -22,6 +22,9 @@ import androidx.fragment.app.Fragment
 import chat.rocket.android.R
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.helper.AndroidPermissionsHelper
+import chat.rocket.android.helper.AndroidPermissionsHelper.getCameraPermission
+import chat.rocket.android.helper.AndroidPermissionsHelper.hasCameraPermission
 import chat.rocket.android.main.ui.MainActivity
 import chat.rocket.android.profile.presentation.ProfilePresenter
 import chat.rocket.android.profile.presentation.ProfileView
@@ -33,12 +36,18 @@ import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.textContent
 import chat.rocket.android.util.extensions.ui
 import chat.rocket.android.util.invalidateFirebaseToken
+import chat.rocket.common.model.UserStatus
+import chat.rocket.common.model.userStatusOf
 import com.facebook.drawee.backends.pipeline.Fresco
+import com.google.android.material.snackbar.Snackbar
 import dagger.android.support.AndroidSupportInjection
 import io.reactivex.disposables.CompositeDisposable
 import io.reactivex.rxkotlin.Observables
+import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.avatar_profile.*
 import kotlinx.android.synthetic.main.fragment_profile.*
+import kotlinx.android.synthetic.main.fragment_profile.view_dim
+import kotlinx.android.synthetic.main.fragment_profile.view_loading
 import kotlinx.android.synthetic.main.update_avatar_options.*
 import javax.inject.Inject
 
@@ -47,24 +56,23 @@ internal const val TAG_PROFILE_FRAGMENT = "ProfileFragment"
 private const val REQUEST_CODE_FOR_PERFORM_SAF = 1
 private const val REQUEST_CODE_FOR_PERFORM_CAMERA = 2
 
+fun newInstance() = ProfileFragment()
+
 class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     @Inject
     lateinit var presenter: ProfilePresenter
     @Inject
     lateinit var analyticsManager: AnalyticsManager
+    private var currentStatus = ""
     private var currentName = ""
     private var currentUsername = ""
     private var currentEmail = ""
     private var actionMode: ActionMode? = null
     private val editTextsDisposable = CompositeDisposable()
 
-    companion object {
-        fun newInstance() = ProfileFragment()
-    }
-
     override fun onCreate(savedInstanceState: Bundle?) {
-        AndroidSupportInjection.inject(this)
         super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
         setHasOptionsMenu(true)
     }
 
@@ -78,11 +86,12 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         super.onViewCreated(view, savedInstanceState)
 
         setupToolbar()
-        setupListeners()
         if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.M) {
             tintEditTextDrawableStart()
         }
+
         presenter.loadUserProfile()
+        setupListeners()
         subscribeEditTexts()
 
         analyticsManager.logScreenView(ScreenViewEvent.Profile)
@@ -112,25 +121,21 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         super.onPrepareOptionsMenu(menu)
     }
 
-    override fun onCreateOptionsMenu(menu: Menu, inflater: MenuInflater) {
-        super.onCreateOptionsMenu(menu, inflater)
-        inflater.inflate(R.menu.profile, menu)
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        when (item.itemId) {
-            R.id.action_delete_account -> showDeleteAccountDialog()
-        }
-        return true
-    }
-
-    override fun showProfile(avatarUrl: String, name: String, username: String, email: String?) {
+    override fun showProfile(
+        status: String,
+        avatarUrl: String,
+        name: String,
+        username: String,
+        email: String?
+    ) {
         ui {
+            text_status.text = getString(R.string.status, status.capitalize())
             image_avatar.setImageURI(avatarUrl)
             text_name.textContent = name
             text_username.textContent = username
             text_email.textContent = email ?: ""
 
+            currentStatus = status
             currentName = name
             currentUsername = username
             currentEmail = email ?: ""
@@ -142,11 +147,10 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     override fun reloadUserAvatar(avatarUrl: String) {
         Fresco.getImagePipeline().evictFromCache(avatarUrl.toUri())
         image_avatar.setImageURI(avatarUrl)
-        (activity as MainActivity).setAvatar(avatarUrl)
     }
 
     override fun showProfileUpdateSuccessfullyMessage() {
-        showMessage(getString(R.string.msg_profile_update_successfully))
+        showMessage(getString(R.string.msg_profile_updated_successfully))
     }
 
     override fun invalidateToken(token: String) = invalidateFirebaseToken(token)
@@ -205,10 +209,19 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
     }
 
     private fun setupToolbar() {
-        (activity as AppCompatActivity?)?.supportActionBar?.title = getString(R.string.title_profile)
+        with((activity as AppCompatActivity)) {
+            with(toolbar) {
+                setSupportActionBar(this)
+                title = getString(R.string.title_profile)
+                setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+                setNavigationOnClickListener { activity?.onBackPressed() }
+            }
+        }
     }
 
     private fun setupListeners() {
+        text_status.setOnClickListener { showStatusDialog(currentStatus) }
+
         image_avatar.setOnClickListener { showUpdateAvatarOptions() }
 
         view_dim.setOnClickListener { hideUpdateAvatarOptions() }
@@ -219,7 +232,13 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         }
 
         button_take_a_photo.setOnClickListener {
-            dispatchTakePicture(REQUEST_CODE_FOR_PERFORM_CAMERA)
+            context?.let {
+                if (hasCameraPermission(it)) {
+                    dispatchTakePicture(REQUEST_CODE_FOR_PERFORM_CAMERA)
+                } else {
+                    getCameraPermission(this)
+                }
+            }
             hideUpdateAvatarOptions()
         }
 
@@ -263,8 +282,8 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
             text_email.asObservable()
         ) { text_name, text_username, text_email ->
             return@combineLatest (text_name.toString() != currentName ||
-                    text_username.toString() != currentUsername ||
-                    text_email.toString() != currentEmail)
+                text_username.toString() != currentUsername ||
+                text_email.toString() != currentEmail)
         }.subscribe { isValid ->
             activity?.invalidateOptionsMenu()
             if (isValid) {
@@ -293,15 +312,62 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
         }
     }
 
-    fun showDeleteAccountDialog() {
+    private fun showStatusDialog(currentStatus: String) {
+        val dialogLayout = layoutInflater.inflate(R.layout.dialog_status, null)
+        val radioGroup = dialogLayout.findViewById<RadioGroup>(R.id.radio_group_status)
+
+        radioGroup.check(
+            when (userStatusOf(currentStatus)) {
+                is UserStatus.Online -> R.id.radio_button_online
+                is UserStatus.Away -> R.id.radio_button_away
+                is UserStatus.Busy -> R.id.radio_button_busy
+                else -> R.id.radio_button_invisible
+            }
+        )
+
+        var newStatus: UserStatus = userStatusOf(currentStatus)
+        radioGroup.setOnCheckedChangeListener { _, checkId ->
+            when (checkId) {
+                R.id.radio_button_online -> newStatus = UserStatus.Online()
+                R.id.radio_button_away -> newStatus = UserStatus.Away()
+                R.id.radio_button_busy -> newStatus = UserStatus.Busy()
+                else -> newStatus = UserStatus.Offline()
+            }
+        }
+
         context?.let {
-            val passwordEText = EditText(context);
-            val mDialogView = LayoutInflater.from(it).inflate(R.layout.item_account_delete, null)
-            val mBuilder = AlertDialog.Builder(it)
+            AlertDialog.Builder(it)
+                .setView(dialogLayout)
+                .setPositiveButton(R.string.msg_change_status) { dialog, _ ->
+                    presenter.updateStatus(newStatus)
+                    text_status.text = getString(R.string.status, newStatus.toString().capitalize())
+                    this.currentStatus = newStatus.toString()
+                    dialog.dismiss()
+                }.show()
+        }
+    }
 
-            mBuilder.setView(mDialogView).setPositiveButton(R.string.action_delete_account) { _, _ ->
-                presenter.deleteAccount(passwordEText.text.toString())
-            }.setNegativeButton(android.R.string.no) { dialog, _ -> dialog.cancel() }.create().show()
+    override fun onRequestPermissionsResult(
+        requestCode: Int,
+        permissions: Array<out String>,
+        grantResults: IntArray
+    ) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults)
+        when (requestCode) {
+            AndroidPermissionsHelper.CAMERA_CODE -> {
+                if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    // permission was granted
+                    dispatchTakePicture(REQUEST_CODE_FOR_PERFORM_CAMERA)
+                } else {
+                    // permission denied
+                    Snackbar.make(
+                        relative_layout,
+                        R.string.msg_camera_permission_denied,
+                        Snackbar.LENGTH_SHORT
+                    ).show()
+                }
+                return
+            }
         }
     }
 }
diff --git a/app/src/main/java/chat/rocket/android/push/DirectReplyReceiver.kt b/app/src/main/java/chat/rocket/android/push/DirectReplyReceiver.kt
index 8e2f9754b0..6fa3170c2c 100644
--- a/app/src/main/java/chat/rocket/android/push/DirectReplyReceiver.kt
+++ b/app/src/main/java/chat/rocket/android/push/DirectReplyReceiver.kt
@@ -7,7 +7,7 @@ import android.content.Intent
 import androidx.core.app.RemoteInput
 import android.widget.Toast
 import chat.rocket.android.R
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.common.RocketChatException
 import chat.rocket.core.internal.rest.sendMessage
 import dagger.android.AndroidInjection
diff --git a/app/src/main/java/chat/rocket/android/server/domain/GetCurrentLanguageInteractor.kt b/app/src/main/java/chat/rocket/android/server/domain/GetCurrentLanguageInteractor.kt
new file mode 100644
index 0000000000..e0e475df05
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/server/domain/GetCurrentLanguageInteractor.kt
@@ -0,0 +1,12 @@
+package chat.rocket.android.server.domain
+
+import chat.rocket.android.server.infrastructure.CurrentLanguageRepository
+import javax.inject.Inject
+
+class GetCurrentLanguageInteractor @Inject constructor(
+    private val repository: CurrentLanguageRepository
+) {
+
+    fun getLanguage(): String? = repository.getLanguage()
+    fun getCountry(): String? = repository.getCountry()
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/server/domain/PermissionsInteractor.kt b/app/src/main/java/chat/rocket/android/server/domain/PermissionsInteractor.kt
index c04c0f8124..0b90b6460e 100644
--- a/app/src/main/java/chat/rocket/android/server/domain/PermissionsInteractor.kt
+++ b/app/src/main/java/chat/rocket/android/server/domain/PermissionsInteractor.kt
@@ -69,7 +69,7 @@ class PermissionsInteractor @Inject constructor(
     }
 
 
-    fun canSeeTheAdminPanel(): Boolean {
+    fun isAdministrationEnabled(): Boolean {
         currentServerUrl()?.let { serverUrl ->
             val viewStatistics =
                 permissionsRepository.get(serverUrl, VIEW_STATISTICS)
diff --git a/app/src/main/java/chat/rocket/android/server/domain/RefreshPermissionsInteractor.kt b/app/src/main/java/chat/rocket/android/server/domain/RefreshPermissionsInteractor.kt
index e1f1571923..feaa110ba8 100644
--- a/app/src/main/java/chat/rocket/android/server/domain/RefreshPermissionsInteractor.kt
+++ b/app/src/main/java/chat/rocket/android/server/domain/RefreshPermissionsInteractor.kt
@@ -1,6 +1,6 @@
 package chat.rocket.android.server.domain
 
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.retryIO
 import chat.rocket.core.internal.rest.permissions
 import kotlinx.coroutines.Dispatchers
@@ -20,7 +20,7 @@ class RefreshPermissionsInteractor @Inject constructor(
     fun refreshAsync(server: String) {
         GlobalScope.launch(Dispatchers.IO) {
             try {
-                factory.create(server).let { client ->
+                factory.get(server).let { client ->
                     val permissions = retryIO(
                         description = "permissions",
                         times = 5,
diff --git a/app/src/main/java/chat/rocket/android/server/domain/RefreshSettingsInteractor.kt b/app/src/main/java/chat/rocket/android/server/domain/RefreshSettingsInteractor.kt
index 348fe84120..d50536767a 100644
--- a/app/src/main/java/chat/rocket/android/server/domain/RefreshSettingsInteractor.kt
+++ b/app/src/main/java/chat/rocket/android/server/domain/RefreshSettingsInteractor.kt
@@ -1,6 +1,6 @@
 package chat.rocket.android.server.domain
 
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.retryIO
 import chat.rocket.core.internal.rest.settings
 import kotlinx.coroutines.Dispatchers
@@ -74,7 +74,7 @@ class RefreshSettingsInteractor @Inject constructor(
 
     suspend fun refresh(server: String) {
         withContext(Dispatchers.IO) {
-            factory.create(server).let { client ->
+            factory.get(server).let { client ->
                 val settings = retryIO(
                     description = "settings",
                     times = 5,
diff --git a/app/src/main/java/chat/rocket/android/server/domain/SaveCurrentLanguageInteractor.kt b/app/src/main/java/chat/rocket/android/server/domain/SaveCurrentLanguageInteractor.kt
new file mode 100644
index 0000000000..3bff12f8de
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/server/domain/SaveCurrentLanguageInteractor.kt
@@ -0,0 +1,10 @@
+package chat.rocket.android.server.domain
+
+import chat.rocket.android.server.infrastructure.CurrentLanguageRepository
+import javax.inject.Inject
+
+class SaveCurrentLanguageInteractor @Inject constructor(
+    private val repository: CurrentLanguageRepository
+) {
+    fun save(language: String, country: String?) = repository.save(language, country)
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/server/domain/SortingAndGroupingInteractor.kt b/app/src/main/java/chat/rocket/android/server/domain/SortingAndGroupingInteractor.kt
new file mode 100644
index 0000000000..ada5d45250
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/server/domain/SortingAndGroupingInteractor.kt
@@ -0,0 +1,32 @@
+package chat.rocket.android.server.domain
+
+import javax.inject.Inject
+
+class SortingAndGroupingInteractor @Inject constructor(val repository: SortingAndGroupingRepository) {
+
+    fun save(
+        currentServerUrl: String,
+        isSortByName: Boolean,
+        isUnreadOnTop: Boolean,
+        isGroupByType: Boolean,
+        isGroupByFavorites: Boolean
+    ) = repository.save(
+        currentServerUrl,
+        isSortByName,
+        isUnreadOnTop,
+        isGroupByType,
+        isGroupByFavorites
+    )
+
+    fun getSortByName(currentServerUrl: String): Boolean =
+        repository.getSortByName(currentServerUrl)
+
+    fun getUnreadOnTop(currentServerUrl: String): Boolean =
+        repository.getUnreadOnTop(currentServerUrl)
+
+    fun getGroupByType(currentServerUrl: String): Boolean =
+        repository.getGroupByType(currentServerUrl)
+
+    fun getGroupByFavorites(currentServerUrl: String): Boolean =
+        repository.getGroupByFavorites(currentServerUrl)
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/server/domain/SortingAndGroupingRepository.kt b/app/src/main/java/chat/rocket/android/server/domain/SortingAndGroupingRepository.kt
new file mode 100644
index 0000000000..2977e47758
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/server/domain/SortingAndGroupingRepository.kt
@@ -0,0 +1,20 @@
+package chat.rocket.android.server.domain
+
+interface SortingAndGroupingRepository {
+
+    fun save(
+        currentServerUrl: String,
+        isSortByName: Boolean,
+        isUnreadOnTop: Boolean,
+        isGroupByType: Boolean,
+        isGroupByFavorites: Boolean
+    )
+
+    fun getSortByName(currentServerUrl: String): Boolean
+
+    fun getUnreadOnTop(currentServerUrl: String): Boolean
+
+    fun getGroupByType(currentServerUrl: String): Boolean
+
+    fun getGroupByFavorites(currentServerUrl: String): Boolean
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/server/domain/model/Account.kt b/app/src/main/java/chat/rocket/android/server/domain/model/Account.kt
index 143eaced55..ebb4c0d328 100644
--- a/app/src/main/java/chat/rocket/android/server/domain/model/Account.kt
+++ b/app/src/main/java/chat/rocket/android/server/domain/model/Account.kt
@@ -4,6 +4,7 @@ import se.ansman.kotshi.JsonSerializable
 
 @JsonSerializable
 data class Account(
+    val serverName: String?,
     val serverUrl: String,
     val serverLogo: String?,
     val serverBg: String?,
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/ConnectionManager.kt
similarity index 99%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/ConnectionManager.kt
index 070b270987..e2d7e1b745 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManager.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/ConnectionManager.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import androidx.lifecycle.MutableLiveData
 import chat.rocket.android.db.DatabaseManager
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManagerFactory.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/ConnectionManagerFactory.kt
similarity index 78%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManagerFactory.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/ConnectionManagerFactory.kt
index d1f04094ee..b4d32e63ea 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/ConnectionManagerFactory.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/ConnectionManagerFactory.kt
@@ -1,7 +1,6 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.db.DatabaseManagerFactory
-import chat.rocket.android.infrastructure.LocalRepository
 import timber.log.Timber
 import javax.inject.Inject
 import javax.inject.Singleton
@@ -20,7 +19,7 @@ class ConnectionManagerFactory @Inject constructor(
         }
 
         Timber.d("Returning FRESH Manager for: $url")
-        val manager = ConnectionManager(factory.create(url), dbFactory.create(url))
+        val manager = ConnectionManager(factory.get(url), dbFactory.create(url))
         cache[url] = manager
         return manager
     }
diff --git a/app/src/main/java/chat/rocket/android/server/infrastructure/CurrentLanguageRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/CurrentLanguageRepository.kt
new file mode 100644
index 0000000000..e877579234
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/CurrentLanguageRepository.kt
@@ -0,0 +1,8 @@
+package chat.rocket.android.server.infrastructure
+
+interface CurrentLanguageRepository {
+
+    fun save(language: String, country: String? = null)
+    fun getLanguage(): String?
+    fun getCountry(): String?
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessageMapper.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/DatabaseMessageMapper.kt
similarity index 99%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessageMapper.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/DatabaseMessageMapper.kt
index 75eb8ea8fe..4ba37af7c3 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessageMapper.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/DatabaseMessageMapper.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.db.model.*
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessagesRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/DatabaseMessagesRepository.kt
similarity index 98%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessagesRepository.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/DatabaseMessagesRepository.kt
index 144fe5f8d8..959f2c4aca 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/DatabaseMessagesRepository.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/DatabaseMessagesRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.db.DatabaseManager
 import chat.rocket.android.db.Operation
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/JobSchedulerInteractorImpl.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/JobSchedulerInteractorImpl.kt
similarity index 91%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/JobSchedulerInteractorImpl.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/JobSchedulerInteractorImpl.kt
index 809d1efb2b..f590008473 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/JobSchedulerInteractorImpl.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/JobSchedulerInteractorImpl.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.app.job.JobInfo
 import android.app.job.JobScheduler
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/MemoryChatRoomsRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/MemoryChatRoomsRepository.kt
similarity index 90%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/MemoryChatRoomsRepository.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/MemoryChatRoomsRepository.kt
index 17f30b3e32..b2d92b44f9 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/MemoryChatRoomsRepository.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/MemoryChatRoomsRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.server.domain.ChatRoomsRepository
 import chat.rocket.core.model.ChatRoom
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/MemoryUsersRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/MemoryUsersRepository.kt
similarity index 95%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/MemoryUsersRepository.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/MemoryUsersRepository.kt
index a7287a404f..d8bac8001e 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/MemoryUsersRepository.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/MemoryUsersRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.server.domain.UsersRepository
 import chat.rocket.android.server.domain.UsersRepository.Query
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/RocketChatClientFactory.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/RocketChatClientFactory.kt
similarity index 92%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/RocketChatClientFactory.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/RocketChatClientFactory.kt
index 3f0bb6ce77..0c5ab18cbb 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/RocketChatClientFactory.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/RocketChatClientFactory.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.os.Build
 import chat.rocket.android.BuildConfig
@@ -18,7 +18,7 @@ class RocketChatClientFactory @Inject constructor(
 ) {
     private val cache = HashMap<String, RocketChatClient>()
 
-    fun create(url: String): RocketChatClient {
+    fun get(url: String): RocketChatClient {
         cache[url]?.let {
             Timber.d("Returning CACHED client for: $url")
             return it
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesAccountsRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesAccountsRepository.kt
similarity index 96%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesAccountsRepository.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesAccountsRepository.kt
index 2765210eda..86f84a64b1 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesAccountsRepository.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesAccountsRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesPermissionsRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesPermissionsRepository.kt
similarity index 95%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesPermissionsRepository.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesPermissionsRepository.kt
index 946f9f44fc..3341c2a1e1 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesPermissionsRepository.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesPermissionsRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.PermissionsRepository
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesSettingsRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesSettingsRepository.kt
similarity index 96%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesSettingsRepository.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesSettingsRepository.kt
index 9826b2d3fd..5b7969b61e 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPreferencesSettingsRepository.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPreferencesSettingsRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.infrastructure.LocalRepository.Companion.SETTINGS_KEY
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsAnalyticsTrackingRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsAnalyticsTrackingRepository.kt
similarity index 91%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsAnalyticsTrackingRepository.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsAnalyticsTrackingRepository.kt
index 6856f7ff73..2408de857c 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsAnalyticsTrackingRepository.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsAnalyticsTrackingRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.content.SharedPreferences
 import chat.rocket.android.server.domain.AnalyticsTrackingRepository
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsBasicAuthRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsBasicAuthRepository.kt
similarity index 96%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsBasicAuthRepository.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsBasicAuthRepository.kt
index 6c586200db..fd35c8df50 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsBasicAuthRepository.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsBasicAuthRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.content.SharedPreferences
 import androidx.core.content.edit
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsConnectingServerRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsConnectingServerRepository.kt
similarity index 92%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsConnectingServerRepository.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsConnectingServerRepository.kt
index bf8b3a6ffa..f4e90a4e3a 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsConnectingServerRepository.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsConnectingServerRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.content.SharedPreferences
 import chat.rocket.android.server.domain.CurrentServerRepository
diff --git a/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsCurrentLanguageRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsCurrentLanguageRepository.kt
new file mode 100644
index 0000000000..06224302e7
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsCurrentLanguageRepository.kt
@@ -0,0 +1,26 @@
+package chat.rocket.android.server.infrastructure
+
+import android.content.SharedPreferences
+import java.util.*
+
+private const val CURRENT_LANGUAGE = "current_language"
+private const val CURRENT_LANGUAGE_COUNTRY = "current_language_country"
+
+class SharedPrefsCurrentLanguageRepository(private val preferences: SharedPreferences) :
+    CurrentLanguageRepository {
+
+    override fun save(language: String, country: String?) {
+        with(preferences) {
+            edit().putString(CURRENT_LANGUAGE, language).apply()
+            edit().putString(CURRENT_LANGUAGE_COUNTRY, country).apply()
+        }
+    }
+
+    override fun getLanguage(): String? {
+        return preferences.getString(CURRENT_LANGUAGE, Locale.getDefault().language)
+    }
+
+    override fun getCountry(): String? {
+        return preferences.getString(CURRENT_LANGUAGE_COUNTRY, Locale.getDefault().country)
+    }
+}
diff --git a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsCurrentServerRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsCurrentServerRepository.kt
similarity index 92%
rename from app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsCurrentServerRepository.kt
rename to app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsCurrentServerRepository.kt
index 8967865dcf..449801ce1a 100644
--- a/app/src/main/java/chat/rocket/android/server/infraestructure/SharedPrefsCurrentServerRepository.kt
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsCurrentServerRepository.kt
@@ -1,4 +1,4 @@
-package chat.rocket.android.server.infraestructure
+package chat.rocket.android.server.infrastructure
 
 import android.content.SharedPreferences
 import chat.rocket.android.server.domain.CurrentServerRepository
diff --git a/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsSortingAndGroupingRepository.kt b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsSortingAndGroupingRepository.kt
new file mode 100644
index 0000000000..91aecd17bd
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/server/infrastructure/SharedPrefsSortingAndGroupingRepository.kt
@@ -0,0 +1,39 @@
+package chat.rocket.android.server.infrastructure
+
+import android.content.SharedPreferences
+import chat.rocket.android.server.domain.SortingAndGroupingRepository
+
+private const val SORT_BY_NAME_KEY = "SORT_BY_NAME_KEY"
+private const val UNREAD_ON_TOP_KEY = "UNREAD_ON_TOP_KEY"
+private const val GROUP_BY_TYPE_KEY = "GROUP_BY_TYPE_KEY"
+private const val GROUP_BY_FAVORITES_KEY = "GROUP_BY_FAVORITES_KEY"
+
+class SharedPrefsSortingAndGroupingRepository(private val preferences: SharedPreferences) :
+    SortingAndGroupingRepository {
+
+    override fun save(
+        currentServerUrl: String,
+        isSortByName: Boolean,
+        isUnreadOnTop: Boolean,
+        isGroupByType: Boolean,
+        isGroupByFavorites: Boolean
+    ) {
+        preferences.edit().putBoolean(SORT_BY_NAME_KEY + currentServerUrl, isSortByName).apply()
+        preferences.edit().putBoolean(UNREAD_ON_TOP_KEY + currentServerUrl, isUnreadOnTop).apply()
+        preferences.edit().putBoolean(GROUP_BY_TYPE_KEY + currentServerUrl, isGroupByType).apply()
+        preferences.edit().putBoolean(GROUP_BY_FAVORITES_KEY + currentServerUrl, isGroupByFavorites)
+            .apply()
+    }
+
+    override fun getSortByName(currentServerUrl: String): Boolean =
+        preferences.getBoolean(SORT_BY_NAME_KEY + currentServerUrl, false)
+
+    override fun getUnreadOnTop(currentServerUrl: String): Boolean =
+        preferences.getBoolean(UNREAD_ON_TOP_KEY + currentServerUrl, false)
+
+    override fun getGroupByType(currentServerUrl: String): Boolean =
+        preferences.getBoolean(GROUP_BY_TYPE_KEY + currentServerUrl, false)
+
+    override fun getGroupByFavorites(currentServerUrl: String): Boolean =
+        preferences.getBoolean(GROUP_BY_FAVORITES_KEY + currentServerUrl, false)
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/server/presentation/ChangeServerPresenter.kt b/app/src/main/java/chat/rocket/android/server/presentation/ChangeServerPresenter.kt
index dbfc912a3f..cbe8718e37 100644
--- a/app/src/main/java/chat/rocket/android/server/presentation/ChangeServerPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/server/presentation/ChangeServerPresenter.kt
@@ -9,7 +9,7 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.SaveCurrentServerInteractor
 import chat.rocket.android.server.domain.SettingsRepository
 import chat.rocket.android.server.domain.TokenRepository
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.util.ifNull
 import javax.inject.Inject
diff --git a/app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt b/app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt
index d11c28819c..8b807ab39b 100644
--- a/app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/server/presentation/CheckServerPresenter.kt
@@ -26,9 +26,9 @@ import chat.rocket.android.server.domain.GetCurrentServerInteractor
 import chat.rocket.android.server.domain.RemoveAccountInteractor
 import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.RefreshSettingsInteractor
-import chat.rocket.android.server.infraestructure.ConnectionManager
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.ConnectionManager
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.VersionInfo
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.casUrl
@@ -105,7 +105,7 @@ abstract class CheckServerPresenter constructor(
 
     internal fun setupConnectionInfo(serverUrl: String) {
         currentServer = serverUrl
-        client = factory.create(serverUrl)
+        client = factory.get(serverUrl)
         managerFactory?.create(serverUrl)?.let {
             manager = it
         }
@@ -452,7 +452,7 @@ abstract class CheckServerPresenter constructor(
 
     /**
      * Returns the OAuth client ID of a [serviceMap].
-     * REMARK: This function works for common OAuth providers (Google, Facebook, Github and so on)
+     * REMARK: This function works for common OAuth providers (Google, Facebook, GitHub and so on)
      * as well as custom OAuth.
      *
      * @param serviceMap The service map to get the OAuth client ID.
diff --git a/app/src/main/java/chat/rocket/android/servers/adapter/AddNewServerViewHolder.kt b/app/src/main/java/chat/rocket/android/servers/adapter/AddNewServerViewHolder.kt
new file mode 100644
index 0000000000..ee2c6fec7c
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/servers/adapter/AddNewServerViewHolder.kt
@@ -0,0 +1,6 @@
+package chat.rocket.android.servers.adapter
+
+import android.view.View
+import androidx.recyclerview.widget.RecyclerView
+
+class AddNewServerViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/servers/adapter/ServerViewHolder.kt b/app/src/main/java/chat/rocket/android/servers/adapter/ServerViewHolder.kt
new file mode 100644
index 0000000000..6ea75b314d
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/servers/adapter/ServerViewHolder.kt
@@ -0,0 +1,21 @@
+package chat.rocket.android.servers.adapter
+
+import android.view.View
+import androidx.core.view.isInvisible
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.server.domain.model.Account
+import com.bumptech.glide.Glide
+import kotlinx.android.synthetic.main.item_server.view.*
+
+class ServerViewHolder(itemView: View, private val currentServerUrl: String) :
+    RecyclerView.ViewHolder(itemView) {
+
+    fun bind(account: Account) {
+        with(itemView) {
+            Glide.with(context).load(account.serverLogo).into(image_server)
+            text_server_name.text = account.serverName ?: account.serverUrl
+            text_server_url.text = account.serverUrl
+            image_check.isInvisible = currentServerUrl != account.serverUrl
+        }
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/servers/adapter/ServersAdapter.kt b/app/src/main/java/chat/rocket/android/servers/adapter/ServersAdapter.kt
new file mode 100644
index 0000000000..d71f540313
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/servers/adapter/ServersAdapter.kt
@@ -0,0 +1,57 @@
+package chat.rocket.android.servers.adapter
+
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import chat.rocket.android.R
+import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.util.extensions.inflate
+
+private const val VIEW_TYPE_SERVER = 0
+private const val VIEW_TYPE_ADD_NEW_SERVER = 1
+
+class ServersAdapter(
+    private val servers: List<Account>,
+    private val currentServerUrl: String,
+    private val selector: Selector
+) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
+        return when (viewType) {
+            VIEW_TYPE_SERVER -> ServerViewHolder(
+                parent.inflate(R.layout.item_server), currentServerUrl
+            )
+            else -> AddNewServerViewHolder(parent.inflate(R.layout.item_add_new_server))
+        }
+    }
+
+    override fun getItemCount() = servers.size + 1
+
+    override fun getItemViewType(position: Int): Int {
+        return when {
+            position < servers.size -> VIEW_TYPE_SERVER
+            else -> VIEW_TYPE_ADD_NEW_SERVER
+        }
+    }
+
+    override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
+        when (holder) {
+            is ServerViewHolder -> bindServerViewHolder(holder, position)
+            is AddNewServerViewHolder -> bindAddNewServerViewHolder(holder)
+        }
+    }
+
+    private fun bindServerViewHolder(holder: ServerViewHolder, position: Int) {
+        val account = servers[position]
+        holder.bind(account)
+        holder.itemView.setOnClickListener { selector.onServerSelected(account.serverUrl) }
+    }
+
+    private fun bindAddNewServerViewHolder(holder: AddNewServerViewHolder) {
+        holder.itemView.setOnClickListener { selector.onAddNewServerSelected() }
+    }
+}
+
+interface Selector {
+    fun onServerSelected(serverUrl: String)
+    fun onAddNewServerSelected()
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/servers/di/ServersBottomSheetFragmentModule.kt b/app/src/main/java/chat/rocket/android/servers/di/ServersBottomSheetFragmentModule.kt
new file mode 100644
index 0000000000..64d1c91b36
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/servers/di/ServersBottomSheetFragmentModule.kt
@@ -0,0 +1,15 @@
+package chat.rocket.android.servers.di
+
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.servers.presentation.ServersView
+import chat.rocket.android.servers.ui.ServersBottomSheetFragment
+import dagger.Module
+import dagger.Provides
+
+@Module
+class ServersBottomSheetFragmentModule {
+
+    @Provides
+    @PerFragment
+    fun serversView(frag: ServersBottomSheetFragment): ServersView = frag
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/servers/di/ServersBottomSheetFragmentProvider.kt b/app/src/main/java/chat/rocket/android/servers/di/ServersBottomSheetFragmentProvider.kt
new file mode 100644
index 0000000000..d7c9ca56ff
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/servers/di/ServersBottomSheetFragmentProvider.kt
@@ -0,0 +1,14 @@
+package chat.rocket.android.servers.di
+
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.servers.ui.ServersBottomSheetFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class ServersBottomSheetFragmentProvider {
+
+    @ContributesAndroidInjector(modules = [ServersBottomSheetFragmentModule::class])
+    @PerFragment
+    abstract fun provideServersBottomSheetFragment(): ServersBottomSheetFragment
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/servers/presentation/ServersPresenter.kt b/app/src/main/java/chat/rocket/android/servers/presentation/ServersPresenter.kt
new file mode 100644
index 0000000000..b7768edf37
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/servers/presentation/ServersPresenter.kt
@@ -0,0 +1,47 @@
+package chat.rocket.android.servers.presentation
+
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.main.presentation.MainNavigator
+import chat.rocket.android.server.domain.GetAccountsInteractor
+import chat.rocket.android.util.extension.launchUI
+import chat.rocket.common.util.ifNull
+import timber.log.Timber
+import javax.inject.Inject
+import javax.inject.Named
+
+class ServersPresenter @Inject constructor(
+    private val view: ServersView,
+    private val navigator: MainNavigator,
+    private val strategy: CancelStrategy,
+    private val getAccountsInteractor: GetAccountsInteractor,
+    @Named("currentServer") private val currentServerUrl: String
+) {
+
+    fun getAllServers() {
+        launchUI(strategy) {
+            try {
+                view.showServerList(getAccountsInteractor.get(), currentServerUrl)
+            } catch (exception: Exception) {
+                Timber.e(exception, "Error loading servers")
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            }
+        }
+    }
+
+    fun changeServer(serverUrl: String) {
+        if (currentServerUrl != serverUrl) {
+            navigator.switchOrAddNewServer(serverUrl)
+        } else {
+            view.hideServerView()
+        }
+    }
+
+    fun addNewServer() {
+        view.hideServerView()
+        navigator.toServerScreen()
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/servers/presentation/ServersView.kt b/app/src/main/java/chat/rocket/android/servers/presentation/ServersView.kt
new file mode 100644
index 0000000000..742dca4b11
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/servers/presentation/ServersView.kt
@@ -0,0 +1,20 @@
+package chat.rocket.android.servers.presentation
+
+import chat.rocket.android.core.behaviours.MessageView
+import chat.rocket.android.server.domain.model.Account
+
+interface ServersView : MessageView {
+
+    /**
+     * Shows the server list.
+     *
+     * @param serverList The list of server to show.
+     * @param currentServerUrl The current logged in server url.
+     */
+    fun showServerList(serverList: List<Account>, currentServerUrl: String)
+
+    /**
+     * Hides the servers view.
+     */
+    fun hideServerView()
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/servers/ui/ServersBottomSheetFragment.kt b/app/src/main/java/chat/rocket/android/servers/ui/ServersBottomSheetFragment.kt
new file mode 100644
index 0000000000..717a113e04
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/servers/ui/ServersBottomSheetFragment.kt
@@ -0,0 +1,67 @@
+package chat.rocket.android.servers.ui
+
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import androidx.recyclerview.widget.LinearLayoutManager
+import chat.rocket.android.R
+import chat.rocket.android.server.domain.model.Account
+import chat.rocket.android.servers.adapter.Selector
+import chat.rocket.android.servers.adapter.ServersAdapter
+import chat.rocket.android.servers.presentation.ServersPresenter
+import chat.rocket.android.servers.presentation.ServersView
+import chat.rocket.android.util.extensions.showToast
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.bottom_sheet_fragment_servers.*
+import javax.inject.Inject
+
+const val TAG = "ServersBottomSheetFragment"
+
+class ServersBottomSheetFragment : BottomSheetDialogFragment(), ServersView {
+    @Inject
+    lateinit var presenter: ServersPresenter
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? =
+        inflater.inflate(R.layout.bottom_sheet_fragment_servers, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        presenter.getAllServers()
+    }
+
+    override fun showServerList(serverList: List<Account>, currentServerUrl: String) {
+        recycler_view.layoutManager = LinearLayoutManager(context)
+        recycler_view.adapter = ServersAdapter(serverList, currentServerUrl, object : Selector {
+            override fun onServerSelected(serverUrl: String) {
+                presenter.changeServer(serverUrl)
+            }
+
+            override fun onAddNewServerSelected() {
+                presenter.addNewServer()
+            }
+        })
+    }
+
+    override fun hideServerView() = dismiss()
+
+    override fun showMessage(resId: Int) {
+        showToast(resId)
+    }
+
+    override fun showMessage(message: String) {
+        showToast(message)
+    }
+
+    override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/settings/di/SettingsFragmentModule.kt b/app/src/main/java/chat/rocket/android/settings/di/SettingsFragmentModule.kt
index beb4ba79b4..1928f7b7ef 100644
--- a/app/src/main/java/chat/rocket/android/settings/di/SettingsFragmentModule.kt
+++ b/app/src/main/java/chat/rocket/android/settings/di/SettingsFragmentModule.kt
@@ -1,13 +1,11 @@
 package chat.rocket.android.settings.di
 
 import androidx.lifecycle.LifecycleOwner
-import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.settings.presentation.SettingsView
 import chat.rocket.android.settings.ui.SettingsFragment
 import dagger.Module
 import dagger.Provides
-import kotlinx.coroutines.Job
 
 @Module
 class SettingsFragmentModule {
@@ -20,13 +18,7 @@ class SettingsFragmentModule {
 
     @Provides
     @PerFragment
-    fun settingsLifecycleOwner(frag: SettingsFragment): LifecycleOwner {
-        return frag
-    }
-
-    @Provides
-    @PerFragment
-    fun provideCancelStrategy(owner: LifecycleOwner, jobs: Job): CancelStrategy {
-        return CancelStrategy(owner, jobs)
+    fun settingsLifecycleOwner(fragment: SettingsFragment): LifecycleOwner {
+        return fragment
     }
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/settings/di/SettingsFragmentProvider.kt b/app/src/main/java/chat/rocket/android/settings/di/SettingsFragmentProvider.kt
index 8d5ed61590..cfb74551a2 100644
--- a/app/src/main/java/chat/rocket/android/settings/di/SettingsFragmentProvider.kt
+++ b/app/src/main/java/chat/rocket/android/settings/di/SettingsFragmentProvider.kt
@@ -1,5 +1,6 @@
 package chat.rocket.android.settings.di
 
+import chat.rocket.android.dagger.scope.PerFragment
 import chat.rocket.android.settings.ui.SettingsFragment
 import dagger.Module
 import dagger.android.ContributesAndroidInjector
@@ -8,5 +9,6 @@ import dagger.android.ContributesAndroidInjector
 abstract class SettingsFragmentProvider {
 
     @ContributesAndroidInjector(modules = [SettingsFragmentModule::class])
+    @PerFragment
     abstract fun provideSettingsFragment(): SettingsFragment
 }
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt b/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
index 2731855a45..e6d86c2ed7 100644
--- a/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
@@ -4,11 +4,10 @@ import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.server.domain.GetCurrentServerInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.RocketChatException
-import chat.rocket.common.util.ifNull
 import chat.rocket.core.RocketChatClient
 import chat.rocket.core.internal.rest.updateProfile
 import javax.inject.Inject
@@ -22,7 +21,7 @@ class PasswordPresenter @Inject constructor(
     factory: RocketChatClientFactory
 ) {
     private val serverUrl = serverInteractor.get()!!
-    private val client: RocketChatClient = factory.create(serverUrl)
+    private val client: RocketChatClient = factory.get(serverUrl)
 
     fun updatePassword(password: String) {
         launchUI(strategy) {
diff --git a/app/src/main/java/chat/rocket/android/settings/presentation/SettingsPresenter.kt b/app/src/main/java/chat/rocket/android/settings/presentation/SettingsPresenter.kt
new file mode 100644
index 0000000000..c311b3e5f9
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/settings/presentation/SettingsPresenter.kt
@@ -0,0 +1,151 @@
+package chat.rocket.android.settings.presentation
+
+import android.content.Context
+import android.os.Build
+import chat.rocket.android.core.lifecycle.CancelStrategy
+import chat.rocket.android.db.DatabaseManagerFactory
+import chat.rocket.android.helper.UserHelper
+import chat.rocket.android.main.presentation.MainNavigator
+import chat.rocket.android.server.domain.AnalyticsTrackingInteractor
+import chat.rocket.android.server.domain.GetCurrentServerInteractor
+import chat.rocket.android.server.domain.PermissionsInteractor
+import chat.rocket.android.server.domain.RemoveAccountInteractor
+import chat.rocket.android.server.domain.SaveCurrentLanguageInteractor
+import chat.rocket.android.server.domain.TokenRepository
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
+import chat.rocket.android.server.presentation.CheckServerPresenter
+import chat.rocket.android.util.extension.gethash
+import chat.rocket.android.util.extension.launchUI
+import chat.rocket.android.util.extension.toHex
+import chat.rocket.android.util.extensions.adminPanelUrl
+import chat.rocket.android.util.extensions.avatarUrl
+import chat.rocket.android.util.retryIO
+import chat.rocket.common.util.ifNull
+import chat.rocket.core.internal.rest.deleteOwnAccount
+import chat.rocket.core.internal.rest.me
+import chat.rocket.core.internal.rest.serverInfo
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.withContext
+import timber.log.Timber
+import java.util.*
+import javax.inject.Inject
+import javax.inject.Named
+
+class SettingsPresenter @Inject constructor(
+    private val view: SettingsView,
+    private val strategy: CancelStrategy,
+    private val navigator: MainNavigator,
+    @Named("currentServer") private val currentServer: String,
+    private val userHelper: UserHelper,
+    private val analyticsTrackingInteractor: AnalyticsTrackingInteractor,
+    private val tokenRepository: TokenRepository,
+    private val permissions: PermissionsInteractor,
+    private val rocketChatClientFactory: RocketChatClientFactory,
+    private val saveLanguageInteractor: SaveCurrentLanguageInteractor,
+    getCurrentServerInteractor: GetCurrentServerInteractor,
+    removeAccountInteractor: RemoveAccountInteractor,
+    databaseManagerFactory: DatabaseManagerFactory,
+    connectionManagerFactory: ConnectionManagerFactory
+) : CheckServerPresenter(
+    strategy = strategy,
+    factory = rocketChatClientFactory,
+    serverInteractor = getCurrentServerInteractor,
+    removeAccountInteractor = removeAccountInteractor,
+    tokenRepository = tokenRepository,
+    dbManagerFactory = databaseManagerFactory,
+    managerFactory = connectionManagerFactory,
+    tokenView = view,
+    navigator = navigator
+) {
+    private val token = tokenRepository.get(currentServer)
+
+    fun setupView() {
+        launchUI(strategy) {
+            try {
+                val serverInfo = retryIO(description = "serverInfo", times = 5) {
+                    rocketChatClientFactory.get(currentServer).serverInfo()
+                }
+
+                val me = retryIO(description = "serverInfo", times = 5) {
+                    rocketChatClientFactory.get(currentServer).me()
+                }
+
+                userHelper.user()?.let { user ->
+                    view.setupSettingsView(
+                        currentServer.avatarUrl(me.username!!, token?.userId, token?.authToken),
+                        userHelper.displayName(user) ?: me.username ?: "",
+                        me.status.toString(),
+                        permissions.isAdministrationEnabled(),
+                        analyticsTrackingInteractor.get(),
+                        true,
+                        serverInfo.version
+                    )
+                }
+            } catch (exception: Exception) {
+                Timber.d(exception, "Error getting server info")
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            }
+        }
+    }
+
+    fun enableAnalyticsTracking(isEnabled: Boolean) {
+        analyticsTrackingInteractor.save(isEnabled)
+    }
+
+    fun logout() {
+        setupConnectionInfo(currentServer)
+        super.logout(null) // TODO null?
+    }
+
+    fun deleteAccount(password: String) {
+        launchUI(strategy) {
+            view.showLoading()
+            try {
+                withContext(Dispatchers.Default) {
+                    // REMARK: Backend API is only working with a lowercase hash.
+                    // https://github.com/RocketChat/Rocket.Chat/issues/12573
+                    retryIO {
+                        rocketChatClientFactory.get(currentServer)
+                            .deleteOwnAccount(password.gethash().toHex().toLowerCase())
+                    }
+                    setupConnectionInfo(currentServer)
+                    logout(null)
+                }
+            } catch (exception: Exception) {
+                exception.message?.let {
+                    view.showMessage(it)
+                }.ifNull {
+                    view.showGenericErrorMessage()
+                }
+            } finally {
+                view.hideLoading()
+            }
+        }
+    }
+
+    fun getCurrentLocale(context: Context): Locale {
+        return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+            context.resources.configuration.locales.get(0)
+        } else {
+            context.resources.configuration.locale
+        }
+    }
+
+    fun saveLocale(language: String, country: String? = null) {
+        saveLanguageInteractor.save(language, country)
+    }
+
+    fun toProfile() = navigator.toProfile()
+
+    fun toAdmin() = tokenRepository.get(currentServer)?.let {
+        navigator.toAdminPanel(currentServer.adminPanelUrl(), it.authToken)
+    }
+
+    fun toLicense(licenseUrl: String, licenseTitle: String) =
+        navigator.toLicense(licenseUrl, licenseTitle)
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/settings/presentation/SettingsView.kt b/app/src/main/java/chat/rocket/android/settings/presentation/SettingsView.kt
index a62bb4f884..3fc3b8e413 100644
--- a/app/src/main/java/chat/rocket/android/settings/presentation/SettingsView.kt
+++ b/app/src/main/java/chat/rocket/android/settings/presentation/SettingsView.kt
@@ -1,3 +1,29 @@
 package chat.rocket.android.settings.presentation
 
-interface SettingsView
+import chat.rocket.android.core.behaviours.LoadingView
+import chat.rocket.android.core.behaviours.MessageView
+import chat.rocket.android.server.presentation.TokenView
+
+interface SettingsView : TokenView, LoadingView, MessageView {
+
+    /**
+     * Setups the settings view.
+     *
+     * @param avatar The user avatar.
+     * @param displayName The user display name.
+     * @param status The user status.
+     * @param isAdministrationEnabled True if the administration is enabled, false otherwise.
+     * @param isAnalyticsTrackingEnabled True if the analytics tracking is enabled, false otherwise.
+     * @param isDeleteAccountEnabled True if the delete account is enabled, false otherwise.
+     * @param serverVersion The version of the current logged in server.
+     */
+    fun setupSettingsView(
+        avatar: String,
+        displayName: String,
+        status: String,
+        isAdministrationEnabled: Boolean,
+        isAnalyticsTrackingEnabled: Boolean,
+        isDeleteAccountEnabled: Boolean,
+        serverVersion: String
+    )
+}
diff --git a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
index 9daab340c1..ad66900c9d 100644
--- a/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
@@ -7,35 +7,56 @@ import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.AdapterView
+import android.widget.EditText
+import androidx.appcompat.app.AlertDialog
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.net.toUri
+import androidx.core.view.isVisible
 import androidx.fragment.app.Fragment
+import chat.rocket.android.BuildConfig
 import chat.rocket.android.R
-import chat.rocket.android.about.ui.AboutFragment
-import chat.rocket.android.about.ui.TAG_ABOUT_FRAGMENT
 import chat.rocket.android.analytics.AnalyticsManager
 import chat.rocket.android.analytics.event.ScreenViewEvent
+import chat.rocket.android.core.behaviours.AppLanguageView
 import chat.rocket.android.helper.TextHelper.getDeviceAndAppInformation
-import chat.rocket.android.main.ui.MainActivity
-import chat.rocket.android.preferences.ui.PreferencesFragment
-import chat.rocket.android.preferences.ui.TAG_PREFERENCES_FRAGMENT
-import chat.rocket.android.settings.password.ui.PasswordActivity
+import chat.rocket.android.settings.presentation.SettingsPresenter
 import chat.rocket.android.settings.presentation.SettingsView
-import chat.rocket.android.util.extensions.addFragmentBackStack
 import chat.rocket.android.util.extensions.inflate
 import chat.rocket.android.util.extensions.showToast
-import chat.rocket.android.webview.ui.webViewIntent
+import chat.rocket.android.util.invalidateFirebaseToken
 import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.app_bar.*
 import kotlinx.android.synthetic.main.fragment_settings.*
 import timber.log.Timber
 import javax.inject.Inject
 
 internal const val TAG_SETTINGS_FRAGMENT = "SettingsFragment"
 
-class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListener {
+fun newInstance(): Fragment = SettingsFragment()
+
+class SettingsFragment : Fragment(), SettingsView, AppLanguageView {
     @Inject
     lateinit var analyticsManager: AnalyticsManager
+    @Inject
+    lateinit var presenter: SettingsPresenter
+    private val locales = arrayListOf(
+        "en",
+        "ar",
+        "de",
+        "es",
+        "fa",
+        "fr",
+        "hi,IN",
+        "it",
+        "ja",
+        "pt,BR",
+        "pt,PT",
+        "ru,RU",
+        "tr",
+        "uk",
+        "zh,CN",
+        "zh,TW"
+    )
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -51,86 +72,104 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
         setupToolbar()
-        setupListView()
+        presenter.setupView()
         analyticsManager.logScreenView(ScreenViewEvent.Settings)
     }
 
-    override fun onResume() {
-        // FIXME - gambiarra ahead. will fix when moving to new androidx Navigation
-        (activity as? MainActivity)?.setupNavigationView()
-        super.onResume()
-    }
+    override fun setupSettingsView(
+        avatar: String,
+        displayName: String,
+        status: String,
+        isAdministrationEnabled: Boolean,
+        isAnalyticsTrackingEnabled: Boolean,
+        isDeleteAccountEnabled: Boolean,
+        serverVersion: String
+    ) {
+        image_avatar.setImageURI(avatar)
 
-    override fun onItemClick(parent: AdapterView<*>?, view: View?, position: Int, id: Long) {
-        when (parent?.getItemAtPosition(position).toString()) {
-            resources.getStringArray(R.array.settings_actions)[0] -> {
-                (activity as AppCompatActivity).addFragmentBackStack(
-                    TAG_PREFERENCES_FRAGMENT,
-                    R.id.fragment_container
-                ) {
-                    PreferencesFragment.newInstance()
-                }
-            }
+        text_display_name.text = displayName
 
-            resources.getStringArray(R.array.settings_actions)[1] ->
-                activity?.startActivity(Intent(activity, PasswordActivity::class.java))
+        text_status.text = status
 
-            // TODO (https://github.com/RocketChat/Rocket.Chat.Android/pull/1918)
-            resources.getStringArray(R.array.settings_actions)[2] -> showToast("Coming soon")
+        profile_container.setOnClickListener { presenter.toProfile() }
 
-            resources.getStringArray(R.array.settings_actions)[3] -> shareApp()
+        text_contact_us.setOnClickListener { contactSupport() }
 
-            resources.getStringArray(R.array.settings_actions)[4] -> showAppOnStore()
+        text_language.setOnClickListener { changeLanguage() }
 
-            resources.getStringArray(R.array.settings_actions)[5] -> contactSupport()
+        text_review_this_app.setOnClickListener { showAppOnStore() }
 
-            resources.getStringArray(R.array.settings_actions)[6] -> activity?.startActivity(
-                context?.webViewIntent(
-                    getString(R.string.license_url),
-                    getString(R.string.title_licence)
-                )
-            )
+        text_share_this_app.setOnClickListener { shareApp() }
 
-            resources.getStringArray(R.array.settings_actions)[7] -> {
-                (activity as AppCompatActivity).addFragmentBackStack(
-                    TAG_ABOUT_FRAGMENT,
-                    R.id.fragment_container
-                ) {
-                    AboutFragment.newInstance()
-                }
+        text_license.setOnClickListener {
+            presenter.toLicense(getString(R.string.license_url), getString(R.string.title_license))
+        }
+
+        text_app_version.text = getString(R.string.msg_app_version, BuildConfig.VERSION_NAME, BuildConfig.VERSION_CODE)
+
+        text_server_version.text = getString(R.string.msg_server_version, serverVersion)
+
+        text_logout.setOnClickListener { showLogoutDialog() }
+
+        with(text_administration) {
+            isVisible = isAdministrationEnabled
+            setOnClickListener { presenter.toAdmin() }
+        }
+
+        with(switch_crash_report) {
+            isChecked = isAnalyticsTrackingEnabled
+            isEnabled = BuildConfig.FLAVOR == "play"
+            setOnCheckedChangeListener { _, isChecked ->
+                presenter.enableAnalyticsTracking(isChecked)
             }
         }
-    }
 
-    private fun showAppOnStore() {
-        try {
-            startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.market_link).toUri()))
-        } catch (error: ActivityNotFoundException) {
-            startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.play_store_link).toUri()))
+        with(text_delete_account) {
+            isVisible = isDeleteAccountEnabled
+            setOnClickListener { showDeleteAccountDialog() }
         }
     }
 
-    private fun setupListView() {
-        settings_list.onItemClickListener = this
+    override fun updateLanguage(language: String, country: String?) {
+        presenter.saveLocale(language, country)
+        activity?.recreate()
     }
 
-    private fun setupToolbar() {
-        (activity as AppCompatActivity?)?.supportActionBar?.title = getString(R.string.title_settings)
+    override fun invalidateToken(token: String) = invalidateFirebaseToken(token)
+
+    override fun showLoading() {
+        view_loading.isVisible = true
     }
 
-    private fun shareApp() {
-        with(Intent(Intent.ACTION_SEND)) {
-            type = "text/plain"
-            putExtra(Intent.EXTRA_SUBJECT, getString(R.string.msg_check_this_out))
-            putExtra(Intent.EXTRA_TEXT, getString(R.string.play_store_link))
-            startActivity(Intent.createChooser(this, getString(R.string.msg_share_using)))
+    override fun hideLoading() {
+        view_loading.isVisible = false
+    }
+
+    override fun showMessage(resId: Int) {
+        showToast(resId)
+    }
+
+    override fun showMessage(message: String) {
+        showToast(message)
+    }
+
+    override fun showGenericErrorMessage() = showMessage(getString(R.string.msg_generic_error))
+
+    private fun setupToolbar() {
+        with((activity as AppCompatActivity)) {
+            with(toolbar) {
+                setSupportActionBar(this)
+                title = getString(R.string.title_settings)
+                setNavigationIcon(R.drawable.ic_arrow_back_white_24dp)
+                setNavigationOnClickListener { activity?.onBackPressed() }
+            }
         }
     }
 
     private fun contactSupport() {
         val uriText = "mailto:${"support@rocket.chat"}" +
-                "?subject=" + Uri.encode(getString(R.string.msg_android_app_support)) +
-                "&body=" + Uri.encode(getDeviceAndAppInformation())
+            "?subject=" + Uri.encode(getString(R.string.msg_android_app_support)) +
+            "&body=" + Uri.encode(getDeviceAndAppInformation())
 
         with(Intent(Intent.ACTION_SENDTO)) {
             data = uriText.toUri()
@@ -142,7 +181,79 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
         }
     }
 
-    companion object {
-        fun newInstance() = SettingsFragment()
+    private fun changeLanguage() {
+        context?.let {
+            val selectedLocale = presenter.getCurrentLocale(it)
+            var localeIndex = -1
+            locales.forEachIndexed { index, locale ->
+                val array = locale.split(",")
+                val language = array[0]
+                val country = if (array.size > 1) array[1] else ""
+                // If language and country are specified, return the respective locale, else return
+                // the first locale found if the language is as specified regardless of the country.
+                if (language == selectedLocale.language) {
+                    if (country == selectedLocale.country) {
+                        localeIndex = index
+                        return@forEachIndexed
+                    } else if (localeIndex == -1) {
+                        localeIndex = index
+                    }
+                }
+            }
+            AlertDialog.Builder(it)
+                .setTitle(R.string.title_choose_language)
+                .setSingleChoiceItems(
+                    resources.getStringArray(R.array.languages), localeIndex
+                ) { dialog, option ->
+                    val array = locales[option].split(",")
+                    if (array.size > 1) {
+                        updateLanguage(array[0], array[1])
+                    } else {
+                        updateLanguage(array[0])
+                    }
+                    dialog.dismiss()
+                }
+                .create()
+                .show()
+        }
+    }
+
+    private fun showAppOnStore() {
+        try {
+            startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.market_link).toUri()))
+        } catch (error: ActivityNotFoundException) {
+            startActivity(Intent(Intent.ACTION_VIEW, getString(R.string.play_store_link).toUri()))
+        }
+    }
+
+    private fun shareApp() {
+        with(Intent(Intent.ACTION_SEND)) {
+            type = "text/plain"
+            putExtra(Intent.EXTRA_SUBJECT, getString(R.string.msg_check_this_out))
+            putExtra(Intent.EXTRA_TEXT, getString(R.string.play_store_link))
+            startActivity(Intent.createChooser(this, getString(R.string.msg_share_using)))
+        }
+    }
+
+    private fun showLogoutDialog() {
+        context?.let {
+            val builder = AlertDialog.Builder(it)
+            builder.setTitle(R.string.title_are_you_sure)
+                .setPositiveButton(R.string.action_logout) { _, _ -> presenter.logout() }
+                .setNegativeButton(android.R.string.no) { dialog, _ -> dialog.cancel() }
+                .create()
+                .show()
+        }
+    }
+
+    private fun showDeleteAccountDialog() {
+        context?.let {
+            AlertDialog.Builder(it)
+                .setView(LayoutInflater.from(it).inflate(R.layout.dialog_delete_account, null))
+                .setPositiveButton(R.string.msg_delete_account) { _, _ ->
+                    presenter.deleteAccount(EditText(context).text.toString())
+                }.setNegativeButton(android.R.string.no) { dialog, _ -> dialog.cancel() }.create()
+                .show()
+        }
     }
-}
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/sortingandgrouping/di/SortingAndGroupingBottomSheetFragmentModule.kt b/app/src/main/java/chat/rocket/android/sortingandgrouping/di/SortingAndGroupingBottomSheetFragmentModule.kt
new file mode 100644
index 0000000000..fced1df63e
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/sortingandgrouping/di/SortingAndGroupingBottomSheetFragmentModule.kt
@@ -0,0 +1,16 @@
+package chat.rocket.android.sortingandgrouping.di
+
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.sortingandgrouping.presentation.SortingAndGroupingView
+import chat.rocket.android.sortingandgrouping.ui.SortingAndGroupingBottomSheetFragment
+import dagger.Module
+import dagger.Provides
+
+@Module
+class SortingAndGroupingBottomSheetFragmentModule {
+
+    @Provides
+    @PerFragment
+    fun sortingAndGroupingView(frag: SortingAndGroupingBottomSheetFragment): SortingAndGroupingView =
+        frag
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/sortingandgrouping/di/SortingAndGroupingBottomSheetFragmentProvider.kt b/app/src/main/java/chat/rocket/android/sortingandgrouping/di/SortingAndGroupingBottomSheetFragmentProvider.kt
new file mode 100644
index 0000000000..783812cef3
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/sortingandgrouping/di/SortingAndGroupingBottomSheetFragmentProvider.kt
@@ -0,0 +1,15 @@
+package chat.rocket.android.sortingandgrouping.di
+
+import chat.rocket.android.dagger.scope.PerFragment
+import chat.rocket.android.sortingandgrouping.ui.SortingAndGroupingBottomSheetFragment
+import dagger.Module
+import dagger.android.ContributesAndroidInjector
+
+@Module
+abstract class SortingAndGroupingBottomSheetFragmentProvider {
+
+    @ContributesAndroidInjector(modules = [SortingAndGroupingBottomSheetFragmentModule::class])
+    @PerFragment
+    abstract fun provideSortingAndGroupingBottomSheetFragment(): SortingAndGroupingBottomSheetFragment
+
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/sortingandgrouping/presentation/SortingAndGroupingPresenter.kt b/app/src/main/java/chat/rocket/android/sortingandgrouping/presentation/SortingAndGroupingPresenter.kt
new file mode 100644
index 0000000000..1dadf303b8
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/sortingandgrouping/presentation/SortingAndGroupingPresenter.kt
@@ -0,0 +1,38 @@
+package chat.rocket.android.sortingandgrouping.presentation
+
+import chat.rocket.android.server.domain.SortingAndGroupingInteractor
+import javax.inject.Inject
+import javax.inject.Named
+
+class SortingAndGroupingPresenter @Inject constructor(
+    private val view: SortingAndGroupingView,
+    private val sortingAndGroupingInteractor: SortingAndGroupingInteractor,
+    @Named("currentServer") private val currentServerUrl: String
+) {
+
+    fun getSortingAndGroupingPreferences() {
+        with(sortingAndGroupingInteractor) {
+            view.showSortingAndGroupingPreferences(
+                getSortByName(currentServerUrl),
+                getUnreadOnTop(currentServerUrl),
+                getGroupByType(currentServerUrl),
+                getGroupByFavorites(currentServerUrl)
+            )
+        }
+    }
+
+    fun saveSortingAndGroupingPreferences(
+        isSortByName: Boolean,
+        isUnreadOnTop: Boolean,
+        isGroupByType: Boolean,
+        isGroupByFavorites: Boolean
+    ) {
+        sortingAndGroupingInteractor.save(
+            currentServerUrl,
+            isSortByName,
+            isUnreadOnTop,
+            isGroupByType,
+            isGroupByFavorites
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/sortingandgrouping/presentation/SortingAndGroupingView.kt b/app/src/main/java/chat/rocket/android/sortingandgrouping/presentation/SortingAndGroupingView.kt
new file mode 100644
index 0000000000..c8627e22e7
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/sortingandgrouping/presentation/SortingAndGroupingView.kt
@@ -0,0 +1,19 @@
+package chat.rocket.android.sortingandgrouping.presentation
+
+interface SortingAndGroupingView {
+
+    /**
+     * Shows the sorting and grouping preferences for the current logged in server.
+     *
+     * @param isSortByName True if sorting by name, false otherwise.
+     * @param isUnreadOnTop True if grouping by unread on top, false otherwise.
+     * @param isGroupByType True if grouping by type , false otherwise.
+     * @param isGroupByFavorites True if grouping by favorites, false otherwise.
+     */
+    fun showSortingAndGroupingPreferences(
+        isSortByName: Boolean,
+        isUnreadOnTop: Boolean,
+        isGroupByType: Boolean,
+        isGroupByFavorites: Boolean
+    )
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/sortingandgrouping/ui/SortingAndGroupingBottomSheetFragment.kt b/app/src/main/java/chat/rocket/android/sortingandgrouping/ui/SortingAndGroupingBottomSheetFragment.kt
new file mode 100644
index 0000000000..4ab319310f
--- /dev/null
+++ b/app/src/main/java/chat/rocket/android/sortingandgrouping/ui/SortingAndGroupingBottomSheetFragment.kt
@@ -0,0 +1,173 @@
+package chat.rocket.android.sortingandgrouping.ui
+
+import DrawableHelper
+import android.content.DialogInterface
+import android.os.Bundle
+import android.view.LayoutInflater
+import android.view.View
+import android.view.ViewGroup
+import android.widget.TextView
+import androidx.annotation.DrawableRes
+import chat.rocket.android.R
+import chat.rocket.android.chatrooms.ui.ChatRoomsFragment
+import chat.rocket.android.chatrooms.ui.TAG_CHAT_ROOMS_FRAGMENT
+import chat.rocket.android.sortingandgrouping.presentation.SortingAndGroupingPresenter
+import chat.rocket.android.sortingandgrouping.presentation.SortingAndGroupingView
+import com.google.android.material.bottomsheet.BottomSheetDialogFragment
+import dagger.android.support.AndroidSupportInjection
+import kotlinx.android.synthetic.main.bottom_sheet_fragment_sort_by.*
+import javax.inject.Inject
+
+const val TAG = "SortingAndGroupingBottomSheetFragment"
+
+class SortingAndGroupingBottomSheetFragment : BottomSheetDialogFragment(), SortingAndGroupingView {
+    @Inject
+    lateinit var presenter: SortingAndGroupingPresenter
+    private var isSortByName = false
+    private var isUnreadOnTop = false
+    private var isGroupByType = false
+    private var isGroupByFavorites = false
+    private val chatRoomFragment by lazy {
+        activity?.supportFragmentManager?.findFragmentByTag(TAG_CHAT_ROOMS_FRAGMENT) as ChatRoomsFragment
+    }
+    private val filterDrawable by lazy { R.drawable.ic_filter_20dp }
+    private val activityDrawable by lazy { R.drawable.ic_activity_20dp }
+    private val unreadOnTopDrawable by lazy { R.drawable.ic_unread_20dp }
+    private val groupByTypeDrawable by lazy { R.drawable.ic_group_by_type_20dp }
+    private val groupByFavoritesDrawable by lazy { R.drawable.ic_favorites_20dp }
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        AndroidSupportInjection.inject(this)
+    }
+
+    override fun onCreateView(
+        inflater: LayoutInflater,
+        container: ViewGroup?,
+        savedInstanceState: Bundle?
+    ): View? =
+        inflater.inflate(R.layout.bottom_sheet_fragment_sort_by, container, false)
+
+    override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
+        super.onViewCreated(view, savedInstanceState)
+        presenter.getSortingAndGroupingPreferences()
+        setupListeners()
+    }
+
+    override fun onCancel(dialog: DialogInterface?) {
+        super.onCancel(dialog)
+        presenter.saveSortingAndGroupingPreferences(
+            isSortByName,
+            isUnreadOnTop,
+            isGroupByType,
+            isGroupByFavorites
+        )
+    }
+
+    override fun showSortingAndGroupingPreferences(
+        isSortByName: Boolean,
+        isUnreadOnTop: Boolean,
+        isGroupByType: Boolean,
+        isGroupByFavorites: Boolean
+    ) {
+        this.isSortByName = isSortByName
+        this.isUnreadOnTop = isUnreadOnTop
+        this.isGroupByType = isGroupByType
+        this.isGroupByFavorites = isGroupByFavorites
+
+        if (isSortByName) {
+            changeSortByTitle(getString(R.string.msg_sort_by_name))
+            checkSelection(text_name, filterDrawable)
+        } else {
+            changeSortByTitle(getString(R.string.msg_sort_by_activity))
+            checkSelection(text_activity, activityDrawable)
+        }
+
+        if (isUnreadOnTop) checkSelection(text_unread_on_top, unreadOnTopDrawable)
+        if (isGroupByType) checkSelection(text_group_by_type, groupByTypeDrawable)
+        if (isGroupByFavorites) checkSelection(text_group_by_favorites, groupByFavoritesDrawable)
+    }
+
+    private fun setupListeners() {
+        text_name.setOnClickListener {
+            changeSortByTitle(getString(R.string.msg_sort_by_name))
+            checkSelection(text_name, filterDrawable)
+            uncheckSelection(text_activity, activityDrawable)
+            isSortByName = true
+            sortChatRoomsList()
+        }
+
+        text_activity.setOnClickListener {
+            changeSortByTitle(getString(R.string.msg_sort_by_activity))
+            checkSelection(text_activity, activityDrawable)
+            uncheckSelection(text_name, filterDrawable)
+            isSortByName = false
+            sortChatRoomsList()
+        }
+
+        text_unread_on_top.setOnClickListener {
+            isUnreadOnTop = if (isUnreadOnTop) {
+                uncheckSelection(text_unread_on_top, unreadOnTopDrawable)
+                false
+            } else {
+                checkSelection(text_unread_on_top, unreadOnTopDrawable)
+                true
+            }
+            sortChatRoomsList()
+        }
+
+        text_group_by_type.setOnClickListener {
+            isGroupByType = if (isGroupByType) {
+                uncheckSelection(text_group_by_type, groupByTypeDrawable)
+                false
+            } else {
+                checkSelection(text_group_by_type, groupByTypeDrawable)
+                true
+            }
+            sortChatRoomsList()
+        }
+
+        text_group_by_favorites.setOnClickListener {
+            isGroupByFavorites = if (isGroupByFavorites) {
+                uncheckSelection(text_group_by_favorites, groupByFavoritesDrawable)
+                false
+            } else {
+                checkSelection(text_group_by_favorites, groupByFavoritesDrawable)
+                true
+            }
+            sortChatRoomsList()
+        }
+    }
+
+    private fun changeSortByTitle(text: String) {
+        text_sort_by.text = getString(R.string.msg_sort_by_placeholder, text.toLowerCase())
+    }
+
+    private fun checkSelection(textView: TextView, @DrawableRes startDrawable: Int) {
+        context?.let {
+            DrawableHelper.compoundStartAndEndDrawable(
+                textView,
+                DrawableHelper.getDrawableFromId(startDrawable, it),
+                DrawableHelper.getDrawableFromId(R.drawable.ic_check, it)
+            )
+        }
+    }
+
+    private fun uncheckSelection(textView: TextView, @DrawableRes startDrawable: Int) {
+        context?.let {
+            DrawableHelper.compoundStartDrawable(
+                textView,
+                DrawableHelper.getDrawableFromId(startDrawable, it)
+            )
+        }
+    }
+
+    private fun sortChatRoomsList() {
+        chatRoomFragment.sortChatRoomsList(
+            isSortByName,
+            isUnreadOnTop,
+            isGroupByType,
+            isGroupByFavorites
+        )
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
index c6aa059b4b..48d2776739 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
@@ -8,12 +8,14 @@ import chat.rocket.android.db.model.ChatRoomEntity
 import chat.rocket.android.db.model.UserEntity
 import chat.rocket.android.server.domain.CurrentServerRepository
 import chat.rocket.android.server.domain.GetSettingsInteractor
+import chat.rocket.android.server.domain.TokenRepository
 import chat.rocket.android.server.domain.isJitsiEnabled
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.android.util.extensions.avatarUrl
 import chat.rocket.android.util.retryIO
 import chat.rocket.common.model.RoomType
+import chat.rocket.common.model.Token
 import chat.rocket.common.util.ifNull
 import chat.rocket.core.internal.rest.createDirectMessage
 import kotlinx.coroutines.Dispatchers
@@ -26,6 +28,7 @@ class UserDetailsPresenter @Inject constructor(
     private val dbManager: DatabaseManager,
     private val strategy: CancelStrategy,
     private val navigator: ChatRoomNavigator,
+    tokenRepository: TokenRepository,
     settingsInteractor: GetSettingsInteractor,
     serverInteractor: CurrentServerRepository,
     factory: ConnectionManagerFactory
@@ -35,6 +38,7 @@ class UserDetailsPresenter @Inject constructor(
     private val client = manager.client
     private val interactor = FetchChatRoomsInteractor(client, dbManager)
     private val settings = settingsInteractor.get(currentServer)
+    private val token = tokenRepository.get(currentServer)
     private lateinit var userEntity: UserEntity
 
     fun loadUserDetails(userId: String) {
@@ -43,25 +47,21 @@ class UserDetailsPresenter @Inject constructor(
                 view.showLoading()
                 dbManager.getUser(userId)?.let {
                     userEntity = it
-                    val avatarUrl =
-                        userEntity.username?.let { username -> currentServer.avatarUrl(avatar = username) }
+                    val avatarUrl = userEntity.username?.let { username ->
+                        currentServer.avatarUrl(username, token?.userId, token?.authToken)
+                    }
                     val username = userEntity.username
                     val name = userEntity.name
-                    val utcOffset =
-                        userEntity.utcOffset // TODO Convert UTC and display like the mockup
+                    val utcOffset = userEntity.utcOffset // FIXME Convert UTC
 
-                    if (avatarUrl != null && username != null && name != null && utcOffset != null) {
-                        view.showUserDetailsAndActions(
-                            avatarUrl = avatarUrl,
-                            name = name,
-                            username = username,
-                            status = userEntity.status,
-                            utcOffset = utcOffset.toString(),
-                            isVideoCallAllowed = settings.isJitsiEnabled()
-                        )
-                    } else {
-                        throw Exception()
-                    }
+                    view.showUserDetailsAndActions(
+                        avatarUrl = avatarUrl,
+                        name = name,
+                        username = username,
+                        status = userEntity.status,
+                        utcOffset = utcOffset.toString(),
+                        isVideoCallAllowed = settings.isJitsiEnabled()
+                    )
                 }
             } catch (ex: Exception) {
                 Timber.e(ex)
@@ -89,6 +89,7 @@ class UserDetailsPresenter @Inject constructor(
                     val chatRoomEntity = ChatRoomEntity(
                         id = directMessage.id,
                         name = userEntity.username ?: userEntity.name.orEmpty(),
+                        parentId = null,
                         description = null,
                         type = RoomType.DIRECT_MESSAGE,
                         fullname = userEntity.name,
diff --git a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
index a1cb70b6b7..aa8187abec 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
@@ -16,11 +16,11 @@ interface UserDetailsView : LoadingView, MessageView {
      * @param isVideoCallAllowed True if the video call is allowed, false otherwise.
      */
     fun showUserDetailsAndActions(
-        avatarUrl: String,
-        name: String,
-        username: String,
-        status: String,
-        utcOffset: String,
+        avatarUrl: String?,
+        name: String?,
+        username: String?,
+        status: String?,
+        utcOffset: String?,
         isVideoCallAllowed: Boolean
     )
 }
diff --git a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
index 7ec9463449..bfd829b88a 100644
--- a/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
+++ b/app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
@@ -20,6 +20,7 @@ import chat.rocket.android.util.extensions.showToast
 import chat.rocket.android.util.extensions.ui
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.MultiTransformation
+import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.bitmap.CenterCrop
 import com.bumptech.glide.load.resource.bitmap.RoundedCorners
 import com.bumptech.glide.request.RequestOptions
@@ -78,14 +79,17 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
     }
 
     override fun showUserDetailsAndActions(
-        avatarUrl: String,
-        name: String,
-        username: String,
-        status: String,
-        utcOffset: String,
+        avatarUrl: String?,
+        name: String?,
+        username: String?,
+        status: String?,
+        utcOffset: String?,
         isVideoCallAllowed: Boolean
     ) {
-        val requestBuilder = Glide.with(this).load(avatarUrl)
+        val requestBuilder = Glide.with(this)
+            .load(avatarUrl)
+            .apply(RequestOptions.skipMemoryCacheOf(true))
+            .apply(RequestOptions.diskCacheStrategyOf(DiskCacheStrategy.NONE))
 
         requestBuilder.apply(
             RequestOptions.bitmapTransform(MultiTransformation(BlurTransformation(), CenterCrop()))
@@ -94,19 +98,21 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
         requestBuilder.apply(RequestOptions.bitmapTransform(RoundedCorners(14)))
             .into(image_avatar)
 
-        text_name.text = name
-        text_username.text = username
-        text_description_status.text = status.substring(0, 1).toUpperCase() + status.substring(1)
-        text_description_timezone.text = utcOffset
+        text_name.text = name ?: getString(R.string.msg_unknown)
+        text_username.text = username ?: getString(R.string.msg_unknown)
 
-        // We should also setup the user details listeners.
-        text_message.setOnClickListener { presenter.createDirectMessage(username) }
+        text_description_status.text = status?.capitalize() ?: getString(R.string.msg_unknown)
+
+        text_description_timezone.text = utcOffset ?: getString(R.string.msg_unknown)
+
+        text_video_call.isVisible = isVideoCallAllowed
 
-        if (isVideoCallAllowed) {
-            text_video_call.isVisible = true
-            text_video_call.setOnClickListener { presenter.toVideoConference(username) }
-        } else {
-            text_video_call.isVisible = false
+        // We should also setup the user details listeners.
+        username?.run {
+            text_message.setOnClickListener { presenter.createDirectMessage(this) }
+            if (isVideoCallAllowed) {
+                text_video_call.setOnClickListener { presenter.toVideoConference(this) }
+            }
         }
     }
 
@@ -147,4 +153,4 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
     private fun setupListeners() {
         image_arrow_back.setOnClickListener { activity?.onBackPressed() }
     }
-}
\ No newline at end of file
+}
diff --git a/app/src/main/java/chat/rocket/android/util/extensions/RocketChatClient.kt b/app/src/main/java/chat/rocket/android/util/extensions/RocketChatClient.kt
index 41ba306134..69654be5e8 100644
--- a/app/src/main/java/chat/rocket/android/util/extensions/RocketChatClient.kt
+++ b/app/src/main/java/chat/rocket/android/util/extensions/RocketChatClient.kt
@@ -2,7 +2,7 @@ package chat.rocket.android.util.extensions
 
 import chat.rocket.android.db.model.MessageEntity
 import chat.rocket.android.server.domain.model.Account
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.retryIO
 import chat.rocket.core.internal.rest.registerPushToken
 import chat.rocket.core.model.Message
@@ -19,7 +19,7 @@ suspend fun RocketChatClientFactory.registerPushToken(
         accounts.forEach { account ->
             try {
                 retryIO(description = "register push token: ${account.serverUrl}") {
-                    create(account.serverUrl).registerPushToken(token)
+                    get(account.serverUrl).registerPushToken(token)
                 }
             } catch (ex: Exception) {
                 Timber.d(ex, "Error registering Push token for ${account.serverUrl}")
diff --git a/app/src/main/java/chat/rocket/android/util/extensions/String.kt b/app/src/main/java/chat/rocket/android/util/extensions/String.kt
index 9c950da7f8..78b2d9c846 100644
--- a/app/src/main/java/chat/rocket/android/util/extensions/String.kt
+++ b/app/src/main/java/chat/rocket/android/util/extensions/String.kt
@@ -21,13 +21,15 @@ fun String.sanitize(): String {
 
 fun String.avatarUrl(
     avatar: String,
+    userId: String?,
+    token: String?,
     isGroupOrChannel: Boolean = false,
     format: String = "jpeg"
 ): String {
     return if (isGroupOrChannel) {
-        "${removeTrailingSlash()}/avatar/%23${avatar.removeTrailingSlash()}?format=$format"
+        "${removeTrailingSlash()}/avatar/%23${avatar.removeTrailingSlash()}?format=$format&rc_uid=$userId&rc_token=$token"
     } else {
-        "${removeTrailingSlash()}/avatar/${avatar.removeTrailingSlash()}?format=$format"
+        "${removeTrailingSlash()}/avatar/${avatar.removeTrailingSlash()}?format=$format&rc_uid=$userId&rc_token=$token"
     }
 }
 
@@ -75,6 +77,8 @@ fun String.lowercaseUrl(): String? = HttpUrl.parse(this)?.run {
 
 fun String?.isNotNullNorEmpty(): Boolean = this != null && this.isNotEmpty()
 
+fun String?.isNotNullNorBlank(): Boolean = this != null && this.isNotBlank()
+
 inline fun String?.ifNotNullNotEmpty(block: (String) -> Unit) {
     if (this != null && this.isNotEmpty()) {
         block(this)
diff --git a/app/src/main/java/chat/rocket/android/videoconference/presenter/VideoConferencePresenter.kt b/app/src/main/java/chat/rocket/android/videoconference/presenter/VideoConferencePresenter.kt
index ce9233f651..b9d8aecfb5 100644
--- a/app/src/main/java/chat/rocket/android/videoconference/presenter/VideoConferencePresenter.kt
+++ b/app/src/main/java/chat/rocket/android/videoconference/presenter/VideoConferencePresenter.kt
@@ -6,7 +6,7 @@ import chat.rocket.android.core.lifecycle.CancelStrategy
 import chat.rocket.android.helper.JitsiHelper
 import chat.rocket.android.helper.UserHelper
 import chat.rocket.android.server.domain.*
-import chat.rocket.android.server.infraestructure.ConnectionManagerFactory
+import chat.rocket.android.server.infrastructure.ConnectionManagerFactory
 import chat.rocket.android.util.extension.launchUI
 import chat.rocket.common.model.RoomType
 import chat.rocket.common.model.roomTypeOf
diff --git a/app/src/main/java/chat/rocket/android/videoconference/ui/VideoConferenceActivity.kt b/app/src/main/java/chat/rocket/android/videoconference/ui/VideoConferenceActivity.kt
index 6fed291e94..94e9a5704b 100644
--- a/app/src/main/java/chat/rocket/android/videoconference/ui/VideoConferenceActivity.kt
+++ b/app/src/main/java/chat/rocket/android/videoconference/ui/VideoConferenceActivity.kt
@@ -3,14 +3,15 @@ package chat.rocket.android.videoconference.ui
 import android.content.Context
 import android.content.Intent
 import android.os.Bundle
-import androidx.core.os.bundleOf
 import chat.rocket.android.videoconference.presenter.JitsiVideoConferenceView
 import chat.rocket.android.videoconference.presenter.VideoConferencePresenter
 import dagger.android.AndroidInjection
 import org.jitsi.meet.sdk.JitsiMeetActivity
+import org.jitsi.meet.sdk.JitsiMeetConferenceOptions
 import org.jitsi.meet.sdk.JitsiMeetView
 import org.jitsi.meet.sdk.JitsiMeetViewListener
 import timber.log.Timber
+import java.net.URL
 import javax.inject.Inject
 
 fun Context.videoConferenceIntent(chatRoomId: String, chatRoomType: String): Intent =
@@ -23,8 +24,7 @@ private const val INTENT_CHAT_ROOM_TYPE = "chat_room_type"
 
 class VideoConferenceActivity : JitsiMeetActivity(), JitsiVideoConferenceView,
     JitsiMeetViewListener {
-    @Inject
-    lateinit var presenter: VideoConferencePresenter
+    @Inject lateinit var presenter: VideoConferencePresenter
     private lateinit var chatRoomId: String
     private lateinit var chatRoomType: String
     private var view: JitsiMeetView? = null
@@ -34,9 +34,7 @@ class VideoConferenceActivity : JitsiMeetActivity(), JitsiVideoConferenceView,
         super.onCreate(savedInstanceState)
 
         chatRoomId = intent.getStringExtra(INTENT_CHAT_ROOM_ID)
-        requireNotNull(chatRoomId) { "no chat_room_id provided in Intent extras" }
         chatRoomType = intent.getStringExtra(INTENT_CHAT_ROOM_TYPE)
-        requireNotNull(chatRoomType) { "no chat_room_type provided in Intent extras" }
 
         view = JitsiMeetView(this)
         view?.listener = this
@@ -52,34 +50,24 @@ class VideoConferenceActivity : JitsiMeetActivity(), JitsiVideoConferenceView,
     override fun onConferenceJoined(map: MutableMap<String, Any>?) =
         logJitsiMeetViewState("Joined video conferencing", map)
 
-    override fun onConferenceWillLeave(map: MutableMap<String, Any>?) =
-        logJitsiMeetViewState("Leaving video conferencing", map)
-
-    override fun onConferenceLeft(map: MutableMap<String, Any>?) {
-        logJitsiMeetViewState("Left video conferencing", map)
+    override fun onConferenceTerminated(map: MutableMap<String, Any>?) {
+        map?.let {
+            if (it.containsKey("error")) {
+                logJitsiMeetViewState("Terminated video conferencing with error", map)
+            } else {
+                logJitsiMeetViewState("Terminated video conferencing", map)
+            }
+        }
         finishJitsiVideoConference()
     }
 
-    override fun onLoadConfigError(map: MutableMap<String, Any>?) =
-        logJitsiMeetViewState("Error loading video conference config", map)
-
-    override fun onConferenceFailed(map: MutableMap<String, Any>?) =
-        logJitsiMeetViewState("Video conference failed", map)
-
     override fun startJitsiVideoConference(url: String, name: String?) {
-        view?.loadURLObject(
-            bundleOf(
-                "config" to bundleOf(
-                    "startWithAudioMuted" to true,
-                    "startWithVideoMuted" to true
-                ),
-                "context" to bundleOf(
-                    "user" to bundleOf("name" to name),
-                    "iss" to "rocketchat-android"
-                ),
-                "url" to url
-            )
-        )
+        JitsiMeetConferenceOptions.Builder()
+            .setAudioMuted(true)
+            .setVideoMuted(true)
+            .setServerURL(URL(url))
+            .setAudioOnly(false)
+            .build().let { view?.join(it) }
     }
 
     override fun finishJitsiVideoConference() {
diff --git a/app/src/main/java/chat/rocket/android/webview/adminpanel/ui/AdminPanelWebViewFragment.kt b/app/src/main/java/chat/rocket/android/webview/adminpanel/ui/AdminPanelWebViewFragment.kt
index 268182fd7f..a94408177b 100644
--- a/app/src/main/java/chat/rocket/android/webview/adminpanel/ui/AdminPanelWebViewFragment.kt
+++ b/app/src/main/java/chat/rocket/android/webview/adminpanel/ui/AdminPanelWebViewFragment.kt
@@ -16,9 +16,17 @@ import dagger.android.support.DaggerFragment
 import kotlinx.android.synthetic.main.fragment_admin_panel_web_view.*
 import javax.inject.Inject
 
+internal const val TAG_ADMIN_PANEL_WEB_VIEW_FRAGMENT = "AdminPanelWebViewFragment"
 private const val BUNDLE_WEB_PAGE_URL = "web_page_url"
 private const val BUNDLE_USER_TOKEN = "user_token"
 
+fun newInstance(webPageUrl: String, userToken: String) = AdminPanelWebViewFragment().apply {
+    arguments = Bundle(2).apply {
+        putString(BUNDLE_WEB_PAGE_URL, webPageUrl)
+        putString(BUNDLE_USER_TOKEN, userToken)
+    }
+}
+
 class AdminPanelWebViewFragment : DaggerFragment() {
     private lateinit var webPageUrl: String
     private lateinit var userToken: String
@@ -30,7 +38,8 @@ class AdminPanelWebViewFragment : DaggerFragment() {
         arguments?.run {
             webPageUrl = getString(BUNDLE_WEB_PAGE_URL, "")
             userToken = getString(BUNDLE_USER_TOKEN, "")
-        } ?: requireNotNull(arguments) { "no arguments supplied when the fragment was instantiated" }
+        }
+            ?: requireNotNull(arguments) { "no arguments supplied when the fragment was instantiated" }
     }
 
     override fun onCreateView(
@@ -49,7 +58,7 @@ class AdminPanelWebViewFragment : DaggerFragment() {
 
     private fun setupToolbar() {
         (activity as AppCompatActivity?)?.supportActionBar?.title =
-                getString(R.string.title_admin_panel)
+            getString(R.string.title_admin_panel)
     }
 
     @SuppressLint("SetJavaScriptEnabled")
@@ -70,13 +79,4 @@ class AdminPanelWebViewFragment : DaggerFragment() {
         }
         web_view.loadUrl(webPageUrl)
     }
-
-    companion object {
-        fun newInstance(webPageUrl: String, userToken: String) = AdminPanelWebViewFragment().apply {
-            arguments = Bundle(2).apply {
-                putString(BUNDLE_WEB_PAGE_URL, webPageUrl)
-                putString(BUNDLE_USER_TOKEN, userToken)
-            }
-        }
-    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable/bg_empty_user_avatar.xml b/app/src/main/res/drawable/bg_empty_user_avatar.xml
index 280bebb878..722144a73c 100644
--- a/app/src/main/res/drawable/bg_empty_user_avatar.xml
+++ b/app/src/main/res/drawable/bg_empty_user_avatar.xml
@@ -1,6 +1,15 @@
-<vector android:height="24dp" android:viewportHeight="100"
-    android:viewportWidth="100" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#ededed" android:pathData="M50,100q-24.66,0 -49.32,0c-0.57,0 -0.68,-0.11 -0.68,-0.68Q0,50 0,0.68C0,0.11 0.11,0 0.68,0Q50,0 99.32,0c0.57,0 0.68,0.11 0.68,0.68q0,49.32 0,98.64c0,0.57 -0.11,0.68 -0.68,0.68Q74.66,100 50,100Z"/>
-    <path android:fillColor="#afafae" android:pathData="M49.42,90C41.72,90 34,90 26.34,90a13.82,13.82 0,0 1,-8.55 -2.75A11.18,11.18 0,0 1,13.22 79a46.76,46.76 0,0 1,3 -21.44,17.06 17.06,0 0,1 6.56,-8.48 15.67,15.67 0,0 1,7.3 -2.28,4.52 4.52,0 0,1 2.84,1c1.62,1 3.18,2.14 4.86,3.05a23.24,23.24 0,0 0,20.34 1.5A25.39,25.39 0,0 0,65 48.51c2.81,-2.26 5.65,-1.76 8.61,-0.71 3.73,1.32 6.24,4 8.11,7.39A35.18,35.18 0,0 1,85.31 67,54.2 54.2,0 0,1 86,77.31a12.47,12.47 0,0 1,-4 9.28,12.65 12.65,0 0,1 -7.33,3.22c-3.9,0.4 -7.82,0.13 -11.73,0.17C58.41,90 53.92,90 49.42,90Z"/>
-    <path android:fillColor="#afafae" android:pathData="M69.35,30.28c0.4,10.36 -8.74,20 -19.89,19.93s-19.92,-9.58 -19.89,-20 8.81,-19.93 20,-19.88C60.64,10.35 69.77,19.87 69.35,30.28Z"/>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="100"
+    android:viewportHeight="100">
+    <path
+        android:fillColor="#ededed"
+        android:pathData="M50,100q-24.66,0 -49.32,0c-0.57,0 -0.68,-0.11 -0.68,-0.68Q0,50 0,0.68C0,0.11 0.11,0 0.68,0Q50,0 99.32,0c0.57,0 0.68,0.11 0.68,0.68q0,49.32 0,98.64c0,0.57 -0.11,0.68 -0.68,0.68Q74.66,100 50,100Z" />
+    <path
+        android:fillColor="#afafae"
+        android:pathData="M49.42,90C41.72,90 34,90 26.34,90a13.82,13.82 0,0 1,-8.55 -2.75A11.18,11.18 0,0 1,13.22 79a46.76,46.76 0,0 1,3 -21.44,17.06 17.06,0 0,1 6.56,-8.48 15.67,15.67 0,0 1,7.3 -2.28,4.52 4.52,0 0,1 2.84,1c1.62,1 3.18,2.14 4.86,3.05a23.24,23.24 0,0 0,20.34 1.5A25.39,25.39 0,0 0,65 48.51c2.81,-2.26 5.65,-1.76 8.61,-0.71 3.73,1.32 6.24,4 8.11,7.39A35.18,35.18 0,0 1,85.31 67,54.2 54.2,0 0,1 86,77.31a12.47,12.47 0,0 1,-4 9.28,12.65 12.65,0 0,1 -7.33,3.22c-3.9,0.4 -7.82,0.13 -11.73,0.17C58.41,90 53.92,90 49.42,90Z" />
+    <path
+        android:fillColor="#afafae"
+        android:pathData="M69.35,30.28c0.4,10.36 -8.74,20 -19.89,19.93s-19.92,-9.58 -19.89,-20 8.81,-19.93 20,-19.88C60.64,10.35 69.77,19.87 69.35,30.28Z" />
 </vector>
diff --git a/app/src/main/res/drawable/black_gradient.xml b/app/src/main/res/drawable/black_gradient.xml
deleted file mode 100644
index 98a5ebacf1..0000000000
--- a/app/src/main/res/drawable/black_gradient.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <gradient
-        android:angle="90"
-        android:centerColor="#30000000"
-        android:endColor="#00000000"
-        android:startColor="#C0000000"
-        android:type="linear" />
-</shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_action_message_info_outline_24dp.xml b/app/src/main/res/drawable/ic_action_message_info_outline_24dp.xml
index 45176fb957..91752eab05 100644
--- a/app/src/main/res/drawable/ic_action_message_info_outline_24dp.xml
+++ b/app/src/main/res/drawable/ic_action_message_info_outline_24dp.xml
@@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="@color/actionMenuColor"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_activity_20dp.xml b/app/src/main/res/drawable/ic_activity_20dp.xml
new file mode 100644
index 0000000000..7dd8e07c32
--- /dev/null
+++ b/app/src/main/res/drawable/ic_activity_20dp.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M10,10m-9.25,0a9.25,9.25 0,1 1,18.5 0a9.25,9.25 0,1 1,-18.5 0"
+        android:strokeWidth="1.5"
+        android:strokeColor="#9EA2A8" />
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M10,4.004V10l4,4"
+        android:strokeWidth="1.5"
+        android:strokeColor="#9EA2A8" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_add_new_server_48dp.xml b/app/src/main/res/drawable/ic_add_new_server_48dp.xml
new file mode 100644
index 0000000000..8bf08b2bcb
--- /dev/null
+++ b/app/src/main/res/drawable/ic_add_new_server_48dp.xml
@@ -0,0 +1,20 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M4.5,0.5L43.5,0.5A4,4 0,0 1,47.5 4.5L47.5,43.5A4,4 0,0 1,43.5 47.5L4.5,47.5A4,4 0,0 1,0.5 43.5L0.5,4.5A4,4 0,0 1,4.5 0.5z"
+        android:strokeWidth="1"
+        android:strokeColor="#CBCED1" />
+
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M33.0625,23.5625L24.4375,23.5625L24.4375,14.9375C24.4375,14.6959 24.2416,14.5 24,14.5C23.7584,14.5 23.5625,14.6959 23.5625,14.9375L23.5625,23.5625L14.9375,23.5625C14.6959,23.5625 14.5,23.7584 14.5,24C14.5,24.2416 14.6959,24.4375 14.9375,24.4375L23.5625,24.4375L23.5625,33.0625C23.5625,33.3041 23.7584,33.5 24,33.5C24.2416,33.5 24.4375,33.3041 24.4375,33.0625L24.4375,24.4375L33.0625,24.4375C33.3041,24.4375 33.5,24.2416 33.5,24C33.5,23.7584 33.3041,23.5625 33.0625,23.5625Z"
+        android:strokeWidth="1"
+        android:strokeColor="#9EA2A8" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_app_name.xml b/app/src/main/res/drawable/ic_app_name.xml
index 803fc4452f..8fb8062f8c 100644
--- a/app/src/main/res/drawable/ic_app_name.xml
+++ b/app/src/main/res/drawable/ic_app_name.xml
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="832.000000dp"
-    android:height="220.000000dp"
-    android:viewportWidth="832.000000"
-    android:viewportHeight="220.000000">
+    android:width="832.0dp"
+    android:height="220.0dp"
+    android:viewportWidth="832.0"
+    android:viewportHeight="220.0">
 
     <group
-        android:translateY="220.000000"
-        android:scaleX="0.100000"
-        android:scaleY="-0.100000">
+        android:translateY="220"
+        android:scaleX="0.1"
+        android:scaleY="-0.1">
         <path
             android:fillColor="#04436A"
             android:strokeWidth="1"
diff --git a/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml b/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml
index 25f5e5e60c..ad821f2989 100644
--- a/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml
+++ b/app/src/main/res/drawable/ic_arrow_back_white_24dp.xml
@@ -1,11 +1,11 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#FFFFFF"
+    android:autoMirrored="true"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
 
     <path
-        android:fillColor="#FF000000"
+        android:fillColor="#FFFFFFFF"
         android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_arrow_down.xml b/app/src/main/res/drawable/ic_arrow_down.xml
new file mode 100644
index 0000000000..c55b3be976
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_down.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="12dp"
+    android:height="7dp"
+    android:viewportWidth="12"
+    android:viewportHeight="7">
+
+    <path
+        android:fillColor="#EFEFEF"
+        android:fillType="nonZero"
+        android:pathData="M6,4.9512L10.4571,0.5122C10.7415,0.229 11.2013,0.229 11.4857,0.5122L11.4857,0.5122C11.7686,0.7939 11.7695,1.2516 11.4878,1.5345C11.4871,1.5352 11.4864,1.5359 11.4857,1.5366L6.7057,6.2972C6.3155,6.6858 5.6845,6.6858 5.2943,6.2972L0.5143,1.5366C0.2314,1.2549 0.2305,0.7972 0.5122,0.5143C0.5129,0.5136 0.5136,0.5129 0.5143,0.5122L0.5143,0.5122C0.7987,0.229 1.2585,0.229 1.5429,0.5122L3.5143,2.4756L6,4.9512Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_arrow_expand_20dp.xml b/app/src/main/res/drawable/ic_arrow_expand_20dp.xml
new file mode 100644
index 0000000000..b2a9234093
--- /dev/null
+++ b/app/src/main/res/drawable/ic_arrow_expand_20dp.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="8dp"
+    android:height="4dp"
+    android:viewportWidth="8"
+    android:viewportHeight="4">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M1.20711,0L6.79289,0C7.06904,0 7.29289,0.22386 7.29289,0.5C7.29289,0.63261 7.24021,0.75979 7.14645,0.85355L4.35355,3.64645C4.15829,3.84171 3.84171,3.84171 3.64645,3.64645L0.85355,0.85355C0.65829,0.65829 0.65829,0.34171 0.85355,0.14645C0.94732,0.05268 1.0745,0 1.20711,0Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_camera.xml b/app/src/main/res/drawable/ic_camera.xml
deleted file mode 100644
index a37ceaf6ce..0000000000
--- a/app/src/main/res/drawable/ic_camera.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="20dp"
-    android:height="18dp"
-    android:viewportWidth="20"
-    android:viewportHeight="18">
-
-    <path
-        android:fillColor="#1D74F5"
-        android:fillType="nonZero"
-        android:pathData="M10,10m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-    <path
-        android:fillColor="#1D74F5"
-        android:fillType="nonZero"
-        android:pathData="M7,0L5.17,2L2,2C0.9,2 0,2.9 0,4L0,16C0,17.1 0.9,18 2,18L18,18C19.1,18 20,17.1 20,16L20,4C20,2.9 19.1,2 18,2L14.83,2L13,0L7,0ZM10,15C7.24,15 5,12.76 5,10C5,7.24 7.24,5 10,5C12.76,5 15,7.24 15,10C15,12.76 12.76,15 10,15Z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
-</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_camera_24dp.xml b/app/src/main/res/drawable/ic_camera_24dp.xml
new file mode 100644
index 0000000000..9f80789f6c
--- /dev/null
+++ b/app/src/main/res/drawable/ic_camera_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF1D74F5"
+        android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0" />
+    <path
+        android:fillColor="#FF1D74F5"
+        android:pathData="M9,2L7.17,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2L9,2zM12,17c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_chat_bubble_black_24dp.xml b/app/src/main/res/drawable/ic_chat_bubble_black_24dp.xml
deleted file mode 100644
index 3eeab8286d..0000000000
--- a/app/src/main/res/drawable/ic_chat_bubble_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,2H4c-1.1,0 -2,0.9 -2,2v18l4,-4h14c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_check.xml b/app/src/main/res/drawable/ic_check.xml
new file mode 100644
index 0000000000..6046365a41
--- /dev/null
+++ b/app/src/main/res/drawable/ic_check.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="17dp"
+    android:height="12dp"
+    android:viewportWidth="17"
+    android:viewportHeight="12">
+
+    <path
+        android:fillColor="#1D74F5"
+        android:fillType="nonZero"
+        android:pathData="M5.5875,9.7331L14.7078,0.6128C15.0463,0.2744 15.595,0.2744 15.9335,0.6128L15.9335,0.6128C16.2719,0.9513 16.2719,1.5 15.9335,1.8385L6.2225,11.5494C5.832,11.9399 5.1989,11.9399 4.8083,11.5494L0.6489,7.39C0.2905,7.0316 0.2905,6.4506 0.6489,6.0922L0.6489,6.0922C1.0072,5.7338 1.5883,5.7338 1.9466,6.0922L5.5875,9.7331Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_check_read_24dp.xml b/app/src/main/res/drawable/ic_check_read_24dp.xml
index 9855900a9b..76cd1135df 100644
--- a/app/src/main/res/drawable/ic_check_read_24dp.xml
+++ b/app/src/main/res/drawable/ic_check_read_24dp.xml
@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#1D74F5"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
     <path
         android:fillColor="#FF1D74F5"
         android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z" />
diff --git a/app/src/main/res/drawable/ic_check_unread_24dp.xml b/app/src/main/res/drawable/ic_check_unread_24dp.xml
index ccafe1c835..31bb59746c 100644
--- a/app/src/main/res/drawable/ic_check_unread_24dp.xml
+++ b/app/src/main/res/drawable/ic_check_unread_24dp.xml
@@ -1,7 +1,6 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
-    android:tint="#999999"
     android:viewportHeight="24.0"
     android:viewportWidth="24.0">
     <path
diff --git a/app/src/main/res/drawable/ic_create_black_24dp.xml b/app/src/main/res/drawable/ic_create_black_24dp.xml
deleted file mode 100644
index 2ab2fb7533..0000000000
--- a/app/src/main/res/drawable/ic_create_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_directory_48dp.xml b/app/src/main/res/drawable/ic_directory_48dp.xml
new file mode 100644
index 0000000000..07649a1dfa
--- /dev/null
+++ b/app/src/main/res/drawable/ic_directory_48dp.xml
@@ -0,0 +1,19 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="48dp"
+    android:height="48dp"
+    android:viewportWidth="48"
+    android:viewportHeight="48">
+
+    <path
+        android:fillColor="#E8F2FF"
+        android:fillType="evenOdd"
+        android:pathData="M4,0L44,0A4,4 0,0 1,48 4L48,44A4,4 0,0 1,44 48L4,48A4,4 0,0 1,0 44L0,4A4,4 0,0 1,4 0z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#1D74F5"
+        android:fillType="nonZero"
+        android:pathData="M20.4021,27.5L18.3698,27.5C19.0883,28.6535 20.1515,29.57 21.4153,30.1057C20.9935,29.3908 20.6468,28.5043 20.4021,27.5ZM20.126,26C20.0438,25.3608 20,24.6906 20,24C20,23.4873 20.0241,22.9859 20.0702,22.5L17.5419,22.5C17.4304,22.982 17.3714,23.4841 17.3714,24C17.3714,24.697 17.479,25.3689 17.6785,26L20.126,26ZM20.2908,21C20.5358,19.7892 20.9248,18.7257 21.4153,17.8943C19.9739,18.5052 18.7934,19.6117 18.0876,21L20.2908,21ZM27.7092,21L29.9124,21C29.2066,19.6117 28.0261,18.5052 26.5847,17.8943C27.0752,18.7257 27.4642,19.7892 27.7092,21ZM27.9298,22.5C27.9759,22.9859 28,23.4873 28,24C28,24.6906 27.9562,25.3608 27.874,26L30.3215,26C30.521,25.3689 30.6286,24.697 30.6286,24C30.6286,23.4841 30.5696,22.982 30.4581,22.5L27.9298,22.5ZM27.5979,27.5C27.3532,28.5043 27.0065,29.3908 26.5847,30.1057C27.8485,29.57 28.9117,28.6535 29.6302,27.5L27.5979,27.5ZM21.8745,27.5C22.3155,29.3609 23.1025,30.6 24,30.6C24.8975,30.6 25.6845,29.3609 26.1255,27.5L21.8745,27.5ZM21.6127,26L26.3873,26C26.4606,25.3841 26.5,24.7291 26.5,24.05C26.5,23.516 26.4756,22.9969 26.4296,22.5L21.5704,22.5C21.5244,22.9969 21.5,23.516 21.5,24.05C21.5,24.7291 21.5394,25.3841 21.6127,26ZM21.787,21L26.213,21C25.7943,18.9188 24.9604,17.5 24,17.5C23.0396,17.5 22.2057,18.9188 21.787,21ZM24,32C19.5822,32 16,28.4178 16,24C16,19.5813 19.5822,16 24,16C28.4187,16 32,19.5813 32,24C32,28.4178 28.4187,32 24,32Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_discussion_20dp.xml b/app/src/main/res/drawable/ic_discussion_20dp.xml
new file mode 100644
index 0000000000..2e41ab6867
--- /dev/null
+++ b/app/src/main/res/drawable/ic_discussion_20dp.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+
+    <path
+        android:fillColor="#9EA2A8"
+        android:fillType="nonZero"
+        android:pathData="M17.0178,9.0088C17.4002,8.2308 17.479,7.9789 17.479,7.6459C17.479,4.8323 15.0667,2.5397 12.1027,2.5397C9.1391,2.5397 6.7273,4.832 6.7273,7.6459C6.7273,10.6045 9.2399,12.7514 12.8986,12.7514L13.0419,12.7522L13.2199,12.7522C15.7971,12.7522 17.3253,12.49 17.9955,12.099C17.4393,11.8181 17.312,11.7402 17.0644,11.4817C16.7269,11.1295 16.5447,10.6642 16.5903,10.1635C16.6148,9.8935 16.6686,9.7447 16.7751,9.5219C16.8362,9.3843 16.8928,9.2651 17.0178,9.0088ZM18.3011,10.1607C18.1916,10.3871 18.2091,10.4113 18.8615,10.7397C19.8228,11.2213 20.24,11.6696 19.8612,12.4352C19.1566,13.8599 16.8659,14.3395 13.2199,14.3395L13.0419,14.3395L12.8892,14.3387C8.3595,14.3387 5.0607,11.5237 5.0607,7.6459C5.0607,3.9545 8.2195,0.9524 12.1027,0.9524C15.9862,0.9524 19.1457,3.9547 19.1457,7.6459C19.1457,8.2881 18.979,8.7628 18.5273,9.6817C18.4105,9.9212 18.3589,10.0296 18.3011,10.1607ZM13.5847,16.3438C13.4018,16.575 13.2033,16.7931 12.9903,16.9977C12.7079,16.9977 12.4278,16.9894 12.1501,16.973L12.251,15.4273C12.2578,15.4187 12.2646,15.4102 12.2714,15.4016L13.5847,16.3438ZM12.2535,15.3888L12.2714,15.4016C12.2744,15.3979 12.2774,15.3941 12.2804,15.3903C12.5148,15.4037 12.7523,15.4104 12.9928,15.4104L13.1738,15.4114L13.3848,15.4114C13.6721,15.4114 13.9523,15.4089 14.2253,15.4036C13.9139,15.9928 13.5075,16.528 13.0195,16.9979L12.9928,16.9977C12.9919,16.9977 12.9911,16.9977 12.9903,16.9977C11.5566,18.3752 9.469,19.1391 7.111,19.1391L6.9581,19.1399L6.7801,19.1399C4.1004,19.1399 2.2612,18.8789 1.204,18.2903L0.9763,18.1635C0.5978,17.9163 0.3174,17.6159 0.1388,17.2549C-0.1741,16.6227 0.056,16.2068 0.6871,15.8098L1.263,15.5183C1.6568,15.319 1.6328,15.3349 1.7194,15.2446C1.7599,15.2023 1.7736,15.1649 1.7694,15.1185C1.7642,15.0606 1.772,15.0866 1.7081,14.9517C1.6576,14.8377 1.6095,14.736 1.491,14.4933C1.0219,13.5389 0.8746,13.0988 0.8746,12.4656C0.8746,11.0845 1.3214,9.7648 2.1303,8.6606C2.129,8.6512 2.1278,8.6417 2.1265,8.6322C2.5652,8.0375 3.1029,7.5134 3.7168,7.0817C3.713,7.1803 3.7112,7.2792 3.7112,7.3786C3.7112,7.962 3.7726,8.5253 3.8907,9.0644C3.8873,9.068 3.8839,9.0717 3.8805,9.0753L3.896,9.0884L3.8618,9.0953C3.0102,10.0132 2.521,11.2015 2.521,12.4656C2.521,12.7985 2.5998,13.0505 2.9842,13.8326C3.1146,14.0999 3.1702,14.2175 3.2126,14.3161C3.3274,14.5534 3.3842,14.703 3.4097,14.9832C3.4553,15.4839 3.2731,15.9492 2.9356,16.3014C2.6884,16.5596 2.561,16.6376 2.0044,16.9188C2.6743,17.3097 4.2025,17.5719 6.7801,17.5719L6.9487,17.5719L7.1108,17.5711C9.3389,17.5711 11.1786,16.7606 12.251,15.4273L12.2535,15.3888ZM1.9145,16.9641C1.6344,17.1044 1.5191,17.1878 1.5466,17.1462C1.6888,16.9311 1.6902,16.6667 1.6467,16.5786C1.7065,16.6996 1.8245,16.8138 2.0044,16.9188C1.9756,16.9333 1.9457,16.9484 1.9145,16.9641ZM2.2655,9.4174C2.2101,9.1681 2.165,8.9157 2.1303,8.6606C2.2904,8.4422 2.4646,8.2321 2.6523,8.0317L3.8805,9.0753C3.8743,9.0819 3.868,9.0886 3.8618,9.0953L2.2655,9.4174ZM2.8863,15.5497L2.0452,16.92L2.8273,18.3216C3.5014,17.9804 3.7692,17.8068 4.1368,17.4308C4.8511,17.5089 5.7278,17.5526 6.7801,17.5526L6.9581,17.5526L7.1013,17.5518C9.3708,17.5518 11.1972,16.724 12.2535,15.3888C12.4966,15.4031 12.7431,15.4104 12.9928,15.4104L13.1738,15.4114L13.3848,15.4114C13.6721,15.4114 13.9523,15.4089 14.2253,15.4036C13.0193,17.6858 10.387,19.1584 7.1108,19.1584L6.9581,19.1592L6.7801,19.1592C3.1341,19.1592 0.8434,18.6796 0.1388,17.2549C-0.24,16.4893 0.1772,16.041 1.1385,15.5594C1.7909,15.231 1.8084,15.2068 1.6989,14.9803C1.6411,14.8493 1.5895,14.7409 1.4727,14.5014C1.021,13.5824 0.8543,13.1078 0.8543,12.4656C0.8543,10.2609 1.9815,8.302 3.7168,7.0817C3.713,7.1803 3.7112,7.2792 3.7112,7.3786C3.7112,7.9706 3.7745,8.542 3.896,9.0884C3.0537,9.9876 2.5412,11.1713 2.5412,12.4656C2.5412,12.7951 2.6193,13.0447 3.0005,13.8203C3.1256,14.0767 3.1822,14.1961 3.2434,14.3338C3.3508,14.5585 3.405,14.7087 3.4299,14.9815C3.4528,15.2336 3.4186,15.4768 3.3365,15.7014C3.1322,15.6538 2.9811,15.6024 2.8863,15.5497Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_favorites_20dp.xml b/app/src/main/res/drawable/ic_favorites_20dp.xml
new file mode 100644
index 0000000000..94c6c62039
--- /dev/null
+++ b/app/src/main/res/drawable/ic_favorites_20dp.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="19">
+
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M14.882,16.72l-0.933,-5.437 3.95,-3.85 -5.458,-0.793L10,1.695 7.56,6.64 2.1,7.434l3.95,3.85 -0.933,5.435L10,14.153l4.882,2.566z"
+        android:strokeWidth="1.5"
+        android:strokeColor="#9EA2A8" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_filter_20dp.xml b/app/src/main/res/drawable/ic_filter_20dp.xml
new file mode 100644
index 0000000000..f92bb571b1
--- /dev/null
+++ b/app/src/main/res/drawable/ic_filter_20dp.xml
@@ -0,0 +1,40 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M5,4L5,18"
+        android:strokeWidth="1.5"
+        android:strokeColor="#9EA2A8"
+        android:strokeLineCap="round" />
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M2,16L5,19"
+        android:strokeWidth="1.5"
+        android:strokeColor="#9EA2A8"
+        android:strokeLineCap="round" />
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M8,16L5,19"
+        android:strokeWidth="1.5"
+        android:strokeColor="#9EA2A8"
+        android:strokeLineCap="round" />
+    <path
+        android:fillColor="#9EA2A8"
+        android:fillType="evenOdd"
+        android:pathData="M17.4434,7.0605L16.3545,3.8916L15.1973,7.0605L17.4434,7.0605ZM15.8467,2.8271L16.9453,2.8271L19.5479,10L18.4834,10L17.7559,7.8516L14.9189,7.8516L14.1426,10L13.1465,10L15.8467,2.8271Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+    <path
+        android:fillColor="#9EA2A8"
+        android:fillType="evenOdd"
+        android:pathData="M13.2295,19.1943l4.3994,-5.5127l-4.0771,0l0,-0.8545l5.3271,0l0,0.835l-4.4238,5.4834l4.4238,0l0,0.8545l-5.6494,0z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_group_by_type_20dp.xml b/app/src/main/res/drawable/ic_group_by_type_20dp.xml
new file mode 100644
index 0000000000..5cc3e55cbd
--- /dev/null
+++ b/app/src/main/res/drawable/ic_group_by_type_20dp.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:pathData="M5,4v14M12,5h10.88M12,10h8.88M12,15h5.88M2,16l3,3M8,16l-3,3"
+        android:strokeWidth="1.5"
+        android:strokeColor="#9EA2A8"
+        android:strokeLineCap="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_hashtag_16dp.xml b/app/src/main/res/drawable/ic_hashtag_16dp.xml
new file mode 100644
index 0000000000..db18661f34
--- /dev/null
+++ b/app/src/main/res/drawable/ic_hashtag_16dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <path
+        android:pathData="M3.7143,10.5714L3.7143,5.4286L0.8571,5.4286C0.3838,5.4286 0,5.0448 0,4.5714L0,4.5714C0,4.098 0.3838,3.7143 0.8571,3.7143L3.7143,3.7143L3.7143,0.8571C3.7143,0.3838 4.098,0 4.5714,0L4.5714,0C5.0448,0 5.4286,0.3838 5.4286,0.8571L5.4286,3.7143L10.5714,3.7143L10.5714,0.8571C10.5714,0.3838 10.9552,0 11.4286,0L11.4286,0C11.902,0 12.2857,0.3838 12.2857,0.8571L12.2857,3.7143L15.1429,3.7143C15.6162,3.7143 16,4.098 16,4.5714L16,4.5714C16,5.0448 15.6162,5.4286 15.1429,5.4286L12.2857,5.4286L12.2857,10.5714L15.1429,10.5714C15.6162,10.5714 16,10.9552 16,11.4286L16,11.4286C16,11.902 15.6162,12.2857 15.1429,12.2857L12.2857,12.2857L12.2857,15.1429C12.2857,15.6162 11.902,16 11.4286,16L11.4286,16C10.9552,16 10.5714,15.6162 10.5714,15.1429L10.5714,12.2857L5.4286,12.2857L5.4286,15.1429C5.4286,15.6162 5.0448,16 4.5714,16L4.5714,16C4.098,16 3.7143,15.6162 3.7143,15.1429L3.7143,12.2857L0.8571,12.2857C0.3838,12.2857 0,11.902 0,11.4286L0,11.4286C0,10.9552 0.3838,10.5714 0.8571,10.5714L3.7143,10.5714ZM5.4286,10.5714L10.5714,10.5714L10.5714,5.4286L5.4286,5.4286L5.4286,10.5714Z"
+        android:strokeWidth="1"
+        android:fillColor="#CBCBCC"
+        android:fillType="nonZero"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_lock_12_dp.xml b/app/src/main/res/drawable/ic_lock_12_dp.xml
index 277c4c2206..ddebe566d4 100644
--- a/app/src/main/res/drawable/ic_lock_12_dp.xml
+++ b/app/src/main/res/drawable/ic_lock_12_dp.xml
@@ -3,14 +3,14 @@
     android:height="12dp"
     android:viewportWidth="12"
     android:viewportHeight="12">
-  <path
-      android:pathData="M1.5,5.5h9v6h-9z"
-      android:strokeWidth="1"
-      android:strokeColor="#787878"
-      android:fillType="evenOdd"/>
-  <path
-      android:pathData="M2.5,5.5L9.5,5.5L9.5,4C9.5,2.067 7.933,0.5 6,0.5C4.067,0.5 2.5,2.067 2.5,4L2.5,5.5Z"
-      android:strokeWidth="1"
-      android:strokeColor="#787878"
-      android:fillType="evenOdd"/>
+    <path
+        android:pathData="M1.5,5.5h9v6h-9z"
+        android:strokeWidth="1"
+        android:strokeColor="#787878"
+        android:fillType="evenOdd" />
+    <path
+        android:pathData="M2.5,5.5L9.5,5.5L9.5,4C9.5,2.067 7.933,0.5 6,0.5C4.067,0.5 2.5,2.067 2.5,4L2.5,5.5Z"
+        android:strokeWidth="1"
+        android:strokeColor="#787878"
+        android:fillType="evenOdd" />
 </vector>
diff --git a/app/src/main/res/drawable/ic_logout_black_24dp.xml b/app/src/main/res/drawable/ic_logout_black_24dp.xml
deleted file mode 100644
index 30b1d97fa2..0000000000
--- a/app/src/main/res/drawable/ic_logout_black_24dp.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0">
-
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M10.09,15.59L11.5,17l5,-5 -5,-5 -1.41,1.41L12.67,11H3v2h9.67l-2.58,2.59zM19,3H5c-1.11,0 -2,0.9 -2,2v4h2V5h14v14H5v-4H3v4c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z" />
-
-</vector>
diff --git a/app/src/main/res/drawable/ic_menu_white_24dp.xml b/app/src/main/res/drawable/ic_menu_white_24dp.xml
deleted file mode 100644
index cf37e2a393..0000000000
--- a/app/src/main/res/drawable/ic_menu_white_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M3,18h18v-2L3,16v2zM3,13h18v-2L3,11v2zM3,6v2h18L21,6L3,6z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_navigation_24dp.xml b/app/src/main/res/drawable/ic_navigation_24dp.xml
new file mode 100644
index 0000000000..d8a8df3ac0
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigation_24dp.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="nonZero"
+        android:pathData="M12.0455,10.4052C12.5308,8.6894 14.1082,7.4323 15.9794,7.4323C17.8505,7.4323 19.428,8.6894 19.9132,10.4052L22.04,10.4052C22.5923,10.4052 23.04,10.8529 23.04,11.4052L23.04,11.6348C23.04,12.1871 22.5923,12.6348 22.04,12.6348L19.9132,12.6348C19.428,14.3506 17.8505,15.6077 15.9794,15.6077C14.1082,15.6077 12.5308,14.3506 12.0455,12.6348L1,12.6348C0.4477,12.6348 0,12.1871 0,11.6348L0,11.4052C0,10.8529 0.4477,10.4052 1,10.4052L12.0455,10.4052ZM15.9794,13.3781C17.0055,13.3781 17.8374,12.5462 17.8374,11.52C17.8374,10.4938 17.0055,9.6619 15.9794,9.6619C14.9532,9.6619 14.1213,10.4938 14.1213,11.52C14.1213,12.5462 14.9532,13.3781 15.9794,13.3781ZM8.5471,14.8645C10.4182,14.8645 11.9957,16.1217 12.481,17.8374L22.04,17.8374C22.5923,17.8374 23.04,18.2851 23.04,18.8374L23.04,19.0671C23.04,19.6194 22.5923,20.0671 22.04,20.0671L12.481,20.0671C11.9957,21.7828 10.4182,23.04 8.5471,23.04C6.676,23.04 5.0985,21.7828 4.6132,20.0671L1,20.0671C0.4477,20.0671 0,19.6194 0,19.0671L0,18.8374C-0,18.2851 0.4477,17.8374 1,17.8374L4.6132,17.8374C5.0985,16.1217 6.676,14.8645 8.5471,14.8645ZM8.5471,20.8103C9.5733,20.8103 10.4052,19.9784 10.4052,18.9523C10.4052,17.9261 9.5733,17.0942 8.5471,17.0942C7.5209,17.0942 6.689,17.9261 6.689,18.9523C6.689,19.9784 7.5209,20.8103 8.5471,20.8103ZM7.0606,0C8.9318,0 10.5092,1.2572 10.9945,2.9729L22.04,2.9729C22.5923,2.9729 23.04,3.4206 23.04,3.9729L23.04,4.2026C23.04,4.7549 22.5923,5.2026 22.04,5.2026L10.9945,5.2026C10.5092,6.9183 8.9318,8.1755 7.0606,8.1755C5.1895,8.1755 3.612,6.9183 3.1268,5.2026L1,5.2026C0.4477,5.2026 0,4.7549 0,4.2026L0,3.9729C-0,3.4206 0.4477,2.9729 1,2.9729L3.1268,2.9729C3.612,1.2572 5.1895,0 7.0606,0ZM7.0606,5.9458C8.0868,5.9458 8.9187,5.1139 8.9187,4.0877C8.9187,3.0616 8.0868,2.2297 7.0606,2.2297C6.0345,2.2297 5.2026,3.0616 5.2026,4.0877C5.2026,5.1139 6.0345,5.9458 7.0606,5.9458Z"
+        android:strokeWidth="1"
+        android:strokeColor="#00000000" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_new_channel_24dp.xml b/app/src/main/res/drawable/ic_new_channel_24dp.xml
new file mode 100644
index 0000000000..cecbac4add
--- /dev/null
+++ b/app/src/main/res/drawable/ic_new_channel_24dp.xml
@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+
+    <path
+        android:fillColor="#FFFFFF"
+        android:fillType="evenOdd"
+        android:pathData="M16.523,11.0833C16.907,11.0833 17.218,11.3942 17.218,11.7782L17.218,16.6582C17.218,17.9513 16.169,19.0002 14.876,19.0002L3.343,19.0002C2.049,19.0002 1,17.9513 1,16.6582L1,5.1263C1,3.8333 2.049,2.7843 3.343,2.7843L8.149,2.7843C8.533,2.7843 8.845,3.0953 8.845,3.4792C8.845,3.8623 8.533,4.1743 8.149,4.1743L3.343,4.1743C2.816,4.1743 2.39,4.6003 2.39,5.1263L2.39,16.6582C2.39,17.1842 2.816,17.6103 3.343,17.6103L14.876,17.6103C15.401,17.6103 15.828,17.1842 15.828,16.6582L15.828,11.7782C15.828,11.3942 16.139,11.0833 16.523,11.0833ZM18.256,2.1318C19.25,3.1248 19.247,4.7428 18.256,5.7337L9.501,14.4877L5.5647,15.6828C5.0363,15.8432 4.4778,15.5449 4.3173,15.0164C4.2598,14.8269 4.2598,14.6246 4.3174,14.4352L5.513,10.5007L14.268,1.7468C15.263,0.7518 16.876,0.7508 17.87,1.7458L18.256,2.1318ZM17.273,4.7508C17.722,4.3028 17.723,3.5638 17.273,3.1147L16.887,2.7288C16.436,2.2768 15.703,2.2768 15.251,2.7298L14.599,3.3808L16.656,5.3678L17.273,4.7508ZM8.764,13.2587L15.673,6.3507L13.616,4.3637L6.742,11.2367L5.86,14.1407L8.764,13.2587Z"
+        android:strokeWidth="0.1"
+        android:strokeColor="#FFFFFF" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_send_24dp.xml b/app/src/main/res/drawable/ic_send_24dp.xml
index c8f25312b3..ab820d67a6 100644
--- a/app/src/main/res/drawable/ic_send_24dp.xml
+++ b/app/src/main/res/drawable/ic_send_24dp.xml
@@ -1,12 +1,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:autoMirrored="true"
     android:viewportHeight="20.0"
     android:viewportWidth="22.0">
 
     <path
         android:fillColor="#FF1D74F5"
-        android:fillType="nonZero"
         android:pathData="M0.869,1.32C0.731,0.987 0.79,0.565 1.045,0.276C1.281,0.01 1.634,-0.079 1.967,0.076L20.645,9.134C20.939,9.29 21.136,9.645 21.136,10C21.155,10.377 20.939,10.71 20.645,10.866L1.967,19.924C1.634,20.079 1.281,19.99 1.045,19.724C0.79,19.435 0.712,19.036 0.869,18.68L4.263,10L0.869,1.32ZM18.193,10L3.262,2.741L5.832,9.29L9.953,9.334C10.404,9.312 10.777,9.734 10.777,10.266C10.796,10.777 10.423,11.199 9.953,11.199L5.636,11.199L3.262,17.259L18.193,10Z" />
 
 </vector>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_settings_black_24dp.xml b/app/src/main/res/drawable/ic_settings_black_24dp.xml
deleted file mode 100644
index ace746c40e..0000000000
--- a/app/src/main/res/drawable/ic_settings_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
-</vector>
diff --git a/app/src/main/res/drawable/ic_sort.xml b/app/src/main/res/drawable/ic_sort.xml
deleted file mode 100644
index 8f4129ed2a..0000000000
--- a/app/src/main/res/drawable/ic_sort.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportHeight="24.0"
-    android:viewportWidth="24.0">
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M3,18h6v-2L3,16v2zM3,6v2h18L21,6L3,6zM3,13h12v-2L3,11v2z" />
-</vector>
diff --git a/app/src/main/res/drawable/ic_unread_20dp.xml b/app/src/main/res/drawable/ic_unread_20dp.xml
new file mode 100644
index 0000000000..0bd793ec9d
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unread_20dp.xml
@@ -0,0 +1,25 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="20dp"
+    android:height="20dp"
+    android:viewportWidth="20"
+    android:viewportHeight="20">
+    <path
+        android:pathData="M18.976,9.783C15.808,6.408 12.812,4.75 10,4.75c-2.812,0 -5.808,1.658 -8.976,5.033C4.28,13.166 7.278,14.829 10,14.829c2.722,0 5.72,-1.663 8.976,-5.046z"
+        android:strokeWidth="1.5"
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:strokeColor="#9EA2A8" />
+    <path
+        android:pathData="M7.965,11.783a2.75,2.75 0,0 0,3.915 -3.661l-3.915,3.66z"
+        android:strokeWidth="1.5"
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:strokeColor="#9EA2A8" />
+    <path
+        android:pathData="M3.025,15.047L16.105,3.14"
+        android:strokeWidth="1.5"
+        android:fillColor="#00000000"
+        android:fillType="evenOdd"
+        android:strokeColor="#9EA2A8"
+        android:strokeLineCap="round" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_user_16dp.xml b/app/src/main/res/drawable/ic_user_16dp.xml
new file mode 100644
index 0000000000..e5be22cc64
--- /dev/null
+++ b/app/src/main/res/drawable/ic_user_16dp.xml
@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="16dp"
+    android:height="16dp"
+    android:viewportWidth="16"
+    android:viewportHeight="16">
+    <group android:translateX="1">
+        <path
+            android:fillColor="#CBCBCC"
+            android:fillType="nonZero"
+            android:pathData="M1.5248,13.3289C1.7124,13.3993 1.9453,13.471 2.2276,13.5407C3.3824,13.8259 5.0297,14 7.25,14C9.4703,14 11.1176,13.8259 12.2724,13.5407C12.5547,13.471 12.7876,13.3993 12.9752,13.3289C12.8483,12.2275 12.2304,11.6229 11.0233,11.1185C10.8562,11.0486 10.6821,10.9818 10.4514,10.8975C10.5051,10.9171 10.0041,10.7357 9.8749,10.6871C8.6886,10.2409 8.125,9.817 8.1271,8.9552C8.1257,8.9352 8.1257,8.9352 8.1232,8.8835C8.1089,8.5412 8.1341,8.1482 8.2352,7.7544C8.3357,7.3629 8.5018,7.0212 8.7796,6.7313C9.4429,6.0859 9.75,5.4186 9.75,4.4169C9.75,2.7871 8.6092,1.5 7.25,1.5C5.8908,1.5 4.75,2.7871 4.75,4.4169C4.75,5.4177 5.0499,6.0675 5.7166,6.7436C5.9791,7.0111 6.1513,7.3472 6.2566,7.7298C6.3671,8.1314 6.3941,8.5324 6.3773,8.8838C6.3741,8.9408 6.3741,8.9408 6.375,8.8986C6.375,9.817 5.8114,10.2409 4.6251,10.6871C4.4959,10.7357 3.9949,10.9171 4.0486,10.8975C3.8179,10.9818 3.6438,11.0486 3.4767,11.1185C2.2696,11.6229 1.6517,12.2275 1.5248,13.3289ZM0,13.7878C0,11.6909 1.029,10.5156 2.8983,9.7344C3.0901,9.6543 3.2836,9.58 3.5339,9.4886C3.4888,9.505 3.978,9.3279 4.0971,9.2831C4.7164,9.0502 4.875,8.9309 4.8778,8.834C4.8775,8.8383 4.8775,8.8383 4.879,8.8121C4.8889,8.6053 4.8718,8.351 4.8104,8.1279C4.7676,7.9725 4.7093,7.8588 4.6472,7.7955C3.7195,6.8547 3.25,5.8375 3.25,4.4169C3.25,1.9963 5.0194,0 7.25,0C9.4806,0 11.25,1.9963 11.25,4.4169C11.25,5.8419 10.7679,6.8896 9.8447,7.7872C9.7867,7.8479 9.7298,7.9649 9.6881,8.1274C9.6297,8.3548 9.6132,8.6125 9.6219,8.8209C9.6231,8.8456 9.6231,8.8456 9.625,8.8986C9.625,8.9309 9.7836,9.0502 10.4029,9.2831C10.522,9.3279 11.0112,9.505 10.9661,9.4886C11.2164,9.58 11.4099,9.6543 11.6017,9.7344C13.471,10.5156 14.5,11.6909 14.5,13.7878L14.5,14.1647L14.1975,14.3896C13.9508,14.573 13.4546,14.7939 12.6319,14.997C11.351,15.3133 9.5847,15.5 7.25,15.5C4.9153,15.5 3.149,15.3133 1.8681,14.997C1.0454,14.7939 0.5492,14.573 0.3025,14.3896L0,14.1647L0,13.7878Z"
+            android:strokeWidth="1"
+            android:strokeColor="#00000000" />
+    </group>
+</vector>
diff --git a/app/src/main/res/drawable/image_dummy.xml b/app/src/main/res/drawable/image_dummy.xml
index 6eba190b78..ec0767e390 100644
--- a/app/src/main/res/drawable/image_dummy.xml
+++ b/app/src/main/res/drawable/image_dummy.xml
@@ -1,16 +1,16 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="80dp"
-        android:height="45dp"
-        android:viewportWidth="80.0"
-        android:viewportHeight="45.0">
+    android:width="80dp"
+    android:height="45dp"
+    android:viewportWidth="80.0"
+    android:viewportHeight="45.0">
     <path
-            android:pathData="M0,0h80v45h-80z"
-            android:strokeColor="#00000000"
-            android:fillColor="#C3D1DA"
-            android:strokeWidth="1"/>
+        android:pathData="M0,0h80v45h-80z"
+        android:strokeColor="#00000000"
+        android:fillColor="#C3D1DA"
+        android:strokeWidth="1" />
     <path
-            android:pathData="M43.99,16.75C44.34,16.75 44.64,16.87 44.88,17.12C45.13,17.36 45.25,17.66 45.25,18.01L45.25,26.74C45.25,27.09 45.13,27.39 44.88,27.63C44.64,27.88 44.34,28 43.99,28L35.26,28C34.91,28 34.61,27.88 34.37,27.63C34.12,27.39 34,27.09 34,26.74L34,18.01C34,17.66 34.12,17.36 34.37,17.12C34.61,16.87 34.91,16.75 35.26,16.75L43.99,16.75ZM43.99,26.74L43.99,18.01L35.26,18.01L35.26,26.74L43.99,26.74ZM40.86,22.55L43.05,25.51L36.2,25.51L37.9,23.28L39.13,24.78L40.86,22.55Z"
-            android:strokeColor="#00000000"
-            android:fillColor="#5D8298"
-            android:strokeWidth="1"/>
+        android:pathData="M43.99,16.75C44.34,16.75 44.64,16.87 44.88,17.12C45.13,17.36 45.25,17.66 45.25,18.01L45.25,26.74C45.25,27.09 45.13,27.39 44.88,27.63C44.64,27.88 44.34,28 43.99,28L35.26,28C34.91,28 34.61,27.88 34.37,27.63C34.12,27.39 34,27.09 34,26.74L34,18.01C34,17.66 34.12,17.36 34.37,17.12C34.61,16.87 34.91,16.75 35.26,16.75L43.99,16.75ZM43.99,26.74L43.99,18.01L35.26,18.01L35.26,26.74L43.99,26.74ZM40.86,22.55L43.05,25.51L36.2,25.51L37.9,23.28L39.13,24.78L40.86,22.55Z"
+        android:strokeColor="#00000000"
+        android:fillColor="#5D8298"
+        android:strokeWidth="1" />
 </vector>
diff --git a/app/src/main/res/drawable/message_reply_button_bg.xml b/app/src/main/res/drawable/message_reply_button_bg.xml
index eda4b8f2bc..85a9bdb663 100644
--- a/app/src/main/res/drawable/message_reply_button_bg.xml
+++ b/app/src/main/res/drawable/message_reply_button_bg.xml
@@ -6,5 +6,7 @@
 
     <corners android:radius="4dp" />
 
-    <stroke android:color="#1D74F5" android:width="2dp" />
+    <stroke
+        android:width="2dp"
+        android:color="#1D74F5" />
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/drawable/round_textview.xml b/app/src/main/res/drawable/round_textview.xml
index 2d5ad4a47c..f5f6c954de 100644
--- a/app/src/main/res/drawable/round_textview.xml
+++ b/app/src/main/res/drawable/round_textview.xml
@@ -1,10 +1,10 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="oval">
 
-  <solid android:color="@color/colorAccent" />
+    <solid android:color="@color/colorAccent" />
 
-  <size
-      android:width="24dp"
-      android:height="24dp" />
+    <size
+        android:width="24dp"
+        android:height="24dp" />
 
 </shape>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_add_members.xml b/app/src/main/res/layout/activity_add_members.xml
deleted file mode 100644
index 8cbeb10293..0000000000
--- a/app/src/main/res/layout/activity_add_members.xml
+++ /dev/null
@@ -1,82 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <include
-        android:id="@+id/toolbar_layout"
-        layout="@layout/layout_toolbar"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/layout_container"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/toolbar_layout">
-
-        <com.google.android.material.chip.ChipGroup
-            android:id="@+id/members_chips"
-            style="@style/Widget.MaterialComponents.Chip.Entry"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_margin="8dp"
-            android:visibility="gone"
-            app:chipSpacing="3dp"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent">
-
-        </com.google.android.material.chip.ChipGroup>
-
-        <com.wang.avi.AVLoadingIndicatorView
-            android:id="@+id/view_loading"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:visibility="gone"
-            app:indicatorColor="@color/colorPrimary"
-            app:indicatorName="BallPulseIndicator"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <EditText
-            android:id="@+id/text_search_member"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:backgroundTint="@android:color/transparent"
-            android:hint="@string/msg_search"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:paddingBottom="8dp"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/members_chips" />
-
-        <View
-            android:id="@+id/separator_1"
-            android:layout_width="match_parent"
-            android:layout_height="0.2dp"
-            android:background="@color/colorDividerMessageComposer"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/text_search_member" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/recycler_view"
-            android:layout_width="match_parent"
-            android:layout_height="0dp"
-            android:scrollbars="vertical"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/separator_1" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index c4dcd5eb30..d308f2af2f 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,48 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/drawer_layout"
+    android:id="@+id/fragment_container"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    tools:context=".main.ui.MainActivity">
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:orientation="vertical">
-
-        <include
-            android:id="@+id/layout_app_bar"
-            layout="@layout/app_bar" />
-
-        <FrameLayout
-            android:id="@+id/fragment_container"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </LinearLayout>
-
-    <FrameLayout
-        android:id="@+id/navigation_container"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start">
-
-        <com.google.android.material.navigation.NavigationView
-            android:id="@+id/view_navigation"
-            android:layout_width="wrap_content"
-            android:layout_height="match_parent"
-            app:headerLayout="@layout/nav_header" />
-
-        <androidx.recyclerview.widget.RecyclerView
-            android:id="@+id/accounts_list"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:layout_marginTop="@dimen/nav_header_height"
-            android:alpha="0"
-            android:background="@color/colorWhite"
-            android:elevation="20dp"
-            android:visibility="gone" />
-    </FrameLayout>
-
-</androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
+    tools:context=".main.ui.MainActivity" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar.xml b/app/src/main/res/layout/app_bar.xml
index e0fff9af70..87845b60de 100644
--- a/app/src/main/res/layout/app_bar.xml
+++ b/app/src/main/res/layout/app_bar.xml
@@ -3,13 +3,13 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/colorPrimary">
+    android:background="@color/colorPrimary"
+    android:theme="@style/Theme.AppCompat.Light.NoActionBar">
 
     <androidx.appcompat.widget.Toolbar
         android:id="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="?attr/actionBarSize"
-        app:layout_scrollFlags="scroll|enterAlways"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
 
diff --git a/app/src/main/res/layout/app_bar_chat_rooms.xml b/app/src/main/res/layout/app_bar_chat_rooms.xml
new file mode 100644
index 0000000000..cc1317b32e
--- /dev/null
+++ b/app/src/main/res/layout/app_bar_chat_rooms.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<com.google.android.material.appbar.AppBarLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/colorPrimary"
+    android:theme="@style/Theme.AppCompat.Light.NoActionBar">
+
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbar"
+        android:layout_width="match_parent"
+        android:layout_height="?attr/actionBarSize"
+        app:navigationIcon="@drawable/ic_navigation_24dp"
+        app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
+        app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar">
+
+        <TextView
+            android:id="@+id/text_server_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:drawableEnd="@drawable/ic_arrow_expand_20dp"
+            android:drawablePadding="10dp"
+            android:fontFamily="sans-serif-medium"
+            android:maxLines="1"
+            android:textColor="#FFFFFF"
+            android:textSize="20sp"
+            android:textStyle="normal"
+            tools:text="Server Name" />
+    </androidx.appcompat.widget.Toolbar>
+</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/app_bar_password.xml b/app/src/main/res/layout/app_bar_password.xml
index 79b4de1cdf..8db44bba59 100644
--- a/app/src/main/res/layout/app_bar_password.xml
+++ b/app/src/main/res/layout/app_bar_password.xml
@@ -15,9 +15,11 @@
         app:navigationIcon="?android:attr/homeAsUpIndicator"
         app:popupTheme="@style/ThemeOverlay.AppCompat.Light"
         app:theme="@style/ActionModeStyle">
+
         <RelativeLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
+
             <TextView
                 android:id="@+id/text_change_password"
                 android:layout_width="wrap_content"
diff --git a/app/src/main/res/layout/avatar_profile.xml b/app/src/main/res/layout/avatar_profile.xml
index 28d48cedd5..02c71781b8 100644
--- a/app/src/main/res/layout/avatar_profile.xml
+++ b/app/src/main/res/layout/avatar_profile.xml
@@ -15,6 +15,6 @@
         app:layout_constraintLeft_toLeftOf="parent"
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundedCornerRadius="2dp" />
+        app:roundedCornerRadius="4dp" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_fragment_directory_sorting.xml b/app/src/main/res/layout/bottom_sheet_fragment_directory_sorting.xml
new file mode 100644
index 0000000000..215b7cd1b3
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet_fragment_directory_sorting.xml
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".directory.ui.DirectorySortingBottomSheetFragment">
+
+    <TextView
+        android:id="@+id/text_sort_by"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="@string/msg_sort_by"
+        android:textColor="#9EA2A8"
+        android:textSize="17sp"
+        android:textStyle="normal"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/view_divider_one"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="16dp"
+        android:background="#1F000000"
+        app:layout_constraintTop_toBottomOf="@+id/text_sort_by" />
+
+    <TextView
+        android:id="@+id/text_channels"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_hashtag_16dp"
+        android:drawablePadding="16dp"
+        android:paddingStart="16dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="16dp"
+        android:text="@string/msg_channels"
+        android:textColor="#2F343D"
+        android:textSize="16sp"
+        android:textStyle="normal"
+        app:layout_constraintTop_toBottomOf="@+id/view_divider_one" />
+
+    <TextView
+        android:id="@+id/text_users"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_user_16dp"
+        android:drawablePadding="16dp"
+        android:paddingStart="16dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="16dp"
+        android:text="@string/msg_users"
+        android:textColor="#2F343D"
+        android:textSize="16sp"
+        android:textStyle="normal"
+        app:layout_constraintTop_toBottomOf="@+id/text_channels" />
+
+    <View
+        android:id="@+id/view_divider_two"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="#1F000000"
+        app:layout_constraintTop_toBottomOf="@+id/text_users" />
+
+    <TextView
+        android:id="@+id/text_search_for_global_users"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="16dp"
+        android:text="@string/msg_search_for_global_users"
+        android:textColor="#2F343D"
+        android:textSize="16sp"
+        android:textStyle="normal"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/view_divider_two" />
+
+    <Switch
+        android:id="@+id/switch_global_users"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:checked="false"
+        app:layout_constraintBottom_toBottomOf="@+id/text_search_for_global_users"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/text_search_for_global_users" />
+
+    <TextView
+        android:id="@+id/text_search_for_global_users_description"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingStart="16dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="16dp"
+        android:text="@string/msg_search_for_global_users_description"
+        android:textColor="#9EA2A8"
+        android:textSize="14sp"
+        android:textStyle="normal"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_search_for_global_users" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_fragment_servers.xml b/app/src/main/res/layout/bottom_sheet_fragment_servers.xml
new file mode 100644
index 0000000000..e8ecff5af5
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet_fragment_servers.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    tools:context=".servers.ui.ServersBottomSheetFragment">
+
+    <TextView
+        android:id="@+id/text_server"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="@string/msg_server"
+        android:textColor="#9EA2A8"
+        android:textSize="17sp"
+        android:textStyle="normal"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <View
+        android:id="@+id/view_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="16dp"
+        android:background="#1F000000"
+        app:layout_constraintTop_toBottomOf="@+id/text_server" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:layout_marginTop="16dp"
+        app:layout_constraintTop_toBottomOf="@+id/view_divider" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/bottom_sheet_fragment_sort_by.xml b/app/src/main/res/layout/bottom_sheet_fragment_sort_by.xml
new file mode 100644
index 0000000000..409ab42ae1
--- /dev/null
+++ b/app/src/main/res/layout/bottom_sheet_fragment_sort_by.xml
@@ -0,0 +1,109 @@
+<?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="wrap_content"
+    android:orientation="vertical"
+    tools:context=".sortingandgrouping.ui.SortingAndGroupingBottomSheetFragment">
+
+    <TextView
+        android:id="@+id/text_sort_by"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:text="@string/msg_sort_by_placeholder"
+        android:textColor="#9EA2A8"
+        android:textSize="17sp"
+        android:textStyle="normal" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="16dp"
+        android:background="#1F000000" />
+
+    <TextView
+        android:id="@+id/text_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_filter_20dp"
+        android:drawablePadding="16dp"
+        android:paddingStart="16dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="16dp"
+        android:text="@string/msg_sort_by_name"
+        android:textColor="#2F343D"
+        android:textSize="16sp"
+        android:textStyle="normal" />
+
+    <TextView
+        android:id="@+id/text_activity"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_activity_20dp"
+        android:drawablePadding="16dp"
+        android:paddingStart="16dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="16dp"
+        android:text="@string/msg_sort_by_activity"
+        android:textColor="#2F343D"
+        android:textSize="16sp"
+        android:textStyle="normal" />
+
+    <View
+        android:id="@+id/view_divider"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
+        android:background="#1F000000" />
+
+    <TextView
+        android:id="@+id/text_unread_on_top"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_unread_20dp"
+        android:drawablePadding="16dp"
+        android:paddingStart="16dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="16dp"
+        android:text="@string/msg_group_by_unread_on_top"
+        android:textColor="#2F343D"
+        android:textSize="16sp"
+        android:textStyle="normal" />
+
+    <TextView
+        android:id="@+id/text_group_by_type"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_group_by_type_20dp"
+        android:drawablePadding="16dp"
+        android:paddingStart="16dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="16dp"
+        android:text="@string/msg_group_by_type"
+        android:textColor="#2F343D"
+        android:textSize="16sp"
+        android:textStyle="normal" />
+
+    <TextView
+        android:id="@+id/text_group_by_favorites"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_favorites_20dp"
+        android:drawablePadding="16dp"
+        android:paddingStart="16dp"
+        android:paddingTop="16dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="16dp"
+        android:text="@string/msg_group_by_favorites"
+        android:textColor="#2F343D"
+        android:textSize="16sp"
+        android:textStyle="normal" />
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/chatroom_sort_dialog.xml b/app/src/main/res/layout/chatroom_sort_dialog.xml
deleted file mode 100644
index fc85aa8b79..0000000000
--- a/app/src/main/res/layout/chatroom_sort_dialog.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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:padding="24dp">
-
-    <RadioGroup
-        android:id="@+id/radio_group_sort"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <RadioButton
-            android:id="@+id/radio_sort_alphabetical"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:text="@string/dialog_sort_by_alphabet"
-            android:textSize="18sp" />
-
-        <RadioButton
-            android:id="@+id/radio_sort_activity"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:padding="8dp"
-            android:text="@string/dialog_sort_by_activity"
-            android:textSize="18sp" />
-    </RadioGroup>
-
-    <CheckBox
-        android:id="@+id/checkbox_group_by_type"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dp"
-        android:padding="8dp"
-        android:text="@string/dialog_group_by_type"
-        android:textSize="18sp" />
-
-    <!--TODO Add checkbox for "Group favourites after sdk support"-->
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_account_delete.xml b/app/src/main/res/layout/dialog_delete_account.xml
similarity index 95%
rename from app/src/main/res/layout/item_account_delete.xml
rename to app/src/main/res/layout/dialog_delete_account.xml
index 9dafc0d9e8..2c60f9a6fc 100644
--- a/app/src/main/res/layout/item_account_delete.xml
+++ b/app/src/main/res/layout/dialog_delete_account.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:padding="@dimen/screen_edge_left_and_right_margins">
diff --git a/app/src/main/res/layout/dialog_report.xml b/app/src/main/res/layout/dialog_report.xml
deleted file mode 100644
index c0ce689a98..0000000000
--- a/app/src/main/res/layout/dialog_report.xml
+++ /dev/null
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"-->
-    <!--xmlns:app="http://schemas.android.com/apk/res-auto"-->
-    <!--xmlns:tools="http://schemas.android.com/tools"-->
-    <!--android:layout_width="match_parent"-->
-    <!--android:layout_height="wrap_content"-->
-    <!--android:fillViewport="true">-->
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        xmlns:app="http://schemas.android.com/apk/res-auto"
-        xmlns:tools="http://schemas.android.com/tools"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="16dp">
-
-        <!--<com.google.android.material.appbar.AppBarLayout-->
-        <!--android:id="@+id/appBarLayout"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:background="@color/colorPrimary"-->
-        <!--android:theme="@style/Theme.AppCompat.Light.NoActionBar">-->
-
-        <!--<androidx.appcompat.widget.Toolbar-->
-        <!--android:id="@+id/toolbar"-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="?attr/actionBarSize"-->
-        <!--app:layout_scrollFlags="scroll|enterAlways"-->
-        <!--app:navigationIcon="?android:attr/homeAsUpIndicator"-->
-        <!--app:popupTheme="@style/ThemeOverlay.AppCompat.Light"-->
-        <!--app:theme="@style/ActionModeStyle">-->
-
-        <!--<RelativeLayout-->
-        <!--android:layout_width="match_parent"-->
-        <!--android:layout_height="wrap_content">-->
-
-        <!--<TextView-->
-        <!--android:id="@+id/text_change_password"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_alignParentStart="true"-->
-        <!--android:ellipsize="end"-->
-        <!--android:maxLines="1"-->
-        <!--android:text="@string/action_msg_report"-->
-        <!--android:textColor="@color/colorWhite"-->
-        <!--android:textSize="18sp"-->
-        <!--android:textStyle="bold" />-->
-        <!--</RelativeLayout>-->
-        <!--</androidx.appcompat.widget.Toolbar>-->
-
-        <!--</com.google.android.material.appbar.AppBarLayout>-->
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline_start"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_begin="24dp" />
-
-        <androidx.constraintlayout.widget.Guideline
-            android:id="@+id/guideline_end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:orientation="vertical"
-            app:layout_constraintGuide_end="24dp" />
-
-        <!--<TextView-->
-        <!--android:id="@+id/text_view_report_label"-->
-        <!--android:layout_width="wrap_content"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:text="Description"-->
-        <!--android:textColor="@color/darkGray"-->
-        <!--app:layout_constraintStart_toStartOf="@+id/guideline_start"-->
-        <!--app:layout_constraintTop_toTopOf="parent" />-->
-
-        <!--<TextView-->
-        <!--android:id="@+id/text_view_required"-->
-        <!--android:layout_width="0dp"-->
-        <!--android:layout_height="wrap_content"-->
-        <!--android:layout_marginStart="8dp"-->
-        <!--android:text="(required)"-->
-        <!--android:textColor="@color/darkGray"-->
-        <!--android:textSize="14sp"-->
-        <!--app:layout_constraintEnd_toEndOf="@+id/guideline_end"-->
-        <!--app:layout_constraintStart_toEndOf="@id/text_view_report_label"-->
-        <!--app:layout_constraintTop_toTopOf="parent" />-->
-
-        <EditText
-            android:id="@+id/edit_text_description"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:inputType="textCapSentences|textMultiLine"
-            android:maxLines="4"
-            android:overScrollMode="always"
-            android:scrollbarStyle="insideInset"
-            android:scrollbars="vertical"
-            android:textSize="16sp"
-            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
-            app:layout_constraintStart_toStartOf="@+id/guideline_start"
-            app:layout_constraintTop_toTopOf="parent"
-            tools:text="Jot something untoward..." />
-
-        <TextView
-            android:id="@+id/text_view_error"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/required"
-            android:textColor="@color/colorRed"
-            android:visibility="gone"
-            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
-            app:layout_constraintStart_toStartOf="@+id/guideline_start"
-            app:layout_constraintTop_toBottomOf="@+id/edit_text_description"
-            tools:visibility="visible" />
-
-        <android.widget.Button
-            android:id="@+id/button_send_report"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="8dp"
-            android:background="@drawable/rounded_color_accent"
-            android:fontFamily="sans-serif-medium"
-            android:text="@string/submit"
-            android:textColor="@android:color/white"
-            app:layout_constraintEnd_toEndOf="@+id/guideline_end"
-            app:layout_constraintStart_toStartOf="@+id/guideline_start"
-            app:layout_constraintTop_toBottomOf="@id/text_view_error" />1
-    </androidx.constraintlayout.widget.ConstraintLayout>
-<!--</androidx.core.widget.NestedScrollView>-->
diff --git a/app/src/main/res/layout/dialog_status.xml b/app/src/main/res/layout/dialog_status.xml
new file mode 100644
index 0000000000..03405d7f28
--- /dev/null
+++ b/app/src/main/res/layout/dialog_status.xml
@@ -0,0 +1,45 @@
+<?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:padding="24dp">
+
+    <RadioGroup
+        android:id="@+id/radio_group_status"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <RadioButton
+            android:id="@+id/radio_button_online"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:text="@string/msg_online"
+            android:textSize="18sp" />
+
+        <RadioButton
+            android:id="@+id/radio_button_away"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:text="@string/msg_away"
+            android:textSize="18sp" />
+
+        <RadioButton
+            android:id="@+id/radio_button_busy"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:text="@string/msg_busy"
+            android:textSize="18sp" />
+
+        <RadioButton
+            android:id="@+id/radio_button_invisible"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:padding="8dp"
+            android:text="@string/msg_invisible"
+            android:textSize="18sp" />
+    </RadioGroup>
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/emoji_image_row_item.xml b/app/src/main/res/layout/emoji_image_row_item.xml
index 5aca146ac1..2fffc659a0 100644
--- a/app/src/main/res/layout/emoji_image_row_item.xml
+++ b/app/src/main/res/layout/emoji_image_row_item.xml
@@ -1,14 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/emoji_image_view"
     android:layout_width="48dp"
     android:layout_height="48dp"
-    android:layout_gravity="center">
-
-    <ImageView
-        android:id="@+id/emoji_image_view"
-        android:layout_width="32dp"
-        android:layout_height="32dp"
-        android:layout_gravity="center"
-        tools:src="@tools:sample/avatars" />
-</FrameLayout>
+    android:layout_gravity="center"
+    android:padding="8dp"
+    tools:src="@tools:sample/avatars" />
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
deleted file mode 100644
index 701020f089..0000000000
--- a/app/src/main/res/layout/fragment_about.xml
+++ /dev/null
@@ -1,62 +0,0 @@
-<ScrollView
-    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"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    tools:context="chat.rocket.android.about.ui.AboutFragment">
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingTop="50dp"
-        android:layout_gravity="center">
-
-        <ImageView
-            android:id="@+id/image_app_name"
-            android:layout_width="wrap_content"
-            android:layout_height="60dp"
-            android:src="@drawable/ic_app_name"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
-
-        <ImageView
-            android:layout_width="160dp"
-            android:layout_height="160dp"
-            android:adjustViewBounds="true"
-            android:scaleX="1.5"
-            android:scaleY="1.5"
-            android:src="@drawable/ic_launcher_foreground"
-            app:layout_constraintBottom_toTopOf="@id/image_app_name"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/text_version_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="Version alpha2.0.1"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/image_app_name"
-            android:layout_marginTop="16dp"
-            android:textColor="@color/colorSecondaryText"
-            android:textAppearance="@style/TextAppearance.AppCompat.Medium"/>
-
-        <TextView
-            android:id="@+id/text_build_number"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            tools:text="Build # 2000"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/text_version_name"
-            android:layout_marginTop="8dp"
-            android:textColor="@color/colorSecondaryText" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</ScrollView>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_authentication_log_in.xml b/app/src/main/res/layout/fragment_authentication_log_in.xml
index beb090c3ce..1af5755e61 100644
--- a/app/src/main/res/layout/fragment_authentication_log_in.xml
+++ b/app/src/main/res/layout/fragment_authentication_log_in.xml
@@ -54,7 +54,7 @@
         android:id="@+id/button_forgot_your_password"
         style="@style/Authentication.Button.Borderless"
         android:layout_marginTop="10dp"
-        android:text="@string/msg_forgot__your_password"
+        android:text="@string/msg_forgot_your_password"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_authentication_on_boarding.xml b/app/src/main/res/layout/fragment_authentication_on_boarding.xml
index 5f609450ca..4cf9ab4697 100644
--- a/app/src/main/res/layout/fragment_authentication_on_boarding.xml
+++ b/app/src/main/res/layout/fragment_authentication_on_boarding.xml
@@ -25,6 +25,7 @@
             android:id="@+id/text_on_boarding_title"
             style="@style/Authentication.TextView.Headline"
             android:layout_marginTop="32dp"
+            android:gravity="center"
             android:text="@string/msg_welcome_to_rocket_chat"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -33,6 +34,7 @@
         <TextView
             android:id="@+id/text_on_boarding_description"
             style="@style/Authentication.TextView.Description"
+            android:gravity="center"
             android:text="@string/msg_team_communication"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -41,7 +43,7 @@
         <RelativeLayout
             android:id="@+id/connect_with_a_server_container"
             android:layout_width="0dp"
-            android:layout_height="60dp"
+            android:layout_height="60sp"
             android:layout_marginTop="32dp"
             android:background="@drawable/rounded_border"
             android:foreground="?selectableItemBackground"
@@ -84,7 +86,7 @@
         <RelativeLayout
             android:id="@+id/join_community_container"
             android:layout_width="0dp"
-            android:layout_height="60dp"
+            android:layout_height="60sp"
             android:layout_marginTop="10dp"
             android:background="@drawable/rounded_border"
             android:foreground="?selectableItemBackground"
@@ -136,7 +138,7 @@
         <RelativeLayout
             android:id="@+id/create_server_container"
             android:layout_width="0dp"
-            android:layout_height="60dp"
+            android:layout_height="60sp"
             android:layout_marginTop="10dp"
             android:background="@drawable/rounded_color_accent"
             android:foreground="?selectableItemBackground"
diff --git a/app/src/main/res/layout/fragment_authentication_server.xml b/app/src/main/res/layout/fragment_authentication_server.xml
index ba32e82b50..bf398e766c 100644
--- a/app/src/main/res/layout/fragment_authentication_server.xml
+++ b/app/src/main/res/layout/fragment_authentication_server.xml
@@ -26,6 +26,7 @@
             android:id="@+id/text_sign_in_to_your_server"
             style="@style/Authentication.TextView.Headline"
             android:layout_marginTop="8dp"
+            android:gravity="center"
             android:text="@string/title_sign_in_your_server"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
diff --git a/app/src/main/res/layout/fragment_chat_details.xml b/app/src/main/res/layout/fragment_chat_details.xml
index b79e71b7f0..48a7aa460a 100644
--- a/app/src/main/res/layout/fragment_chat_details.xml
+++ b/app/src/main/res/layout/fragment_chat_details.xml
@@ -21,7 +21,9 @@
                 style="@style/ChatDetails.Title.TextView"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                tools:text="#important" />
+                android:drawableStart="@drawable/ic_hashtag_black_12dp"
+                android:drawablePadding="@dimen/text_view_drawable_padding"
+                tools:text="important" />
 
             <TextView
                 android:id="@+id/title_description"
diff --git a/app/src/main/res/layout/fragment_chat_rooms.xml b/app/src/main/res/layout/fragment_chat_rooms.xml
index 1a82b796a5..0c387d2938 100644
--- a/app/src/main/res/layout/fragment_chat_rooms.xml
+++ b/app/src/main/res/layout/fragment_chat_rooms.xml
@@ -1,59 +1,73 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".chatrooms.ui.ChatRoomsFragment">
 
-    <androidx.recyclerview.widget.RecyclerView
-        android:id="@+id/recycler_view"
-        android:layout_below="@+id/text_connection_status"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent" />
-
-    <com.wang.avi.AVLoadingIndicatorView
-        android:id="@+id/view_loading"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:visibility="gone"
-        app:indicatorColor="@color/colorBlack"
-        app:indicatorName="BallPulseIndicator" />
+    <include
+        android:id="@+id/layout_app_bar_chat_room"
+        layout="@layout/app_bar_chat_rooms"
+        app:layout_constraintTop_toTopOf="parent" />
 
     <TextView
-        android:id="@+id/text_no_data_to_display"
-        style="@style/TextAppearance.AppCompat.Subhead"
-        android:layout_width="wrap_content"
+        android:id="@+id/text_directory"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_centerInParent="true"
-        android:text="@string/msg_no_data_to_display"
+        android:drawableStart="@drawable/ic_directory_48dp"
+        android:drawablePadding="10dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center_vertical"
+        android:paddingStart="16dp"
+        android:paddingTop="32dp"
+        android:paddingEnd="16dp"
+        android:paddingBottom="32dp"
+        android:text="@string/msg_directory"
+        android:textColor="#0c0d0f"
+        android:textSize="17sp"
+        android:textStyle="bold"
         android:visibility="gone"
-        tools:visibility="visible" />
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/layout_app_bar_chat_room" />
 
     <TextView
-        android:id="@+id/text_connection_status"
+        android:id="@+id/text_sort_by"
         android:layout_width="match_parent"
-        android:layout_height="32dp"
-        android:alpha="0"
-        android:background="@color/colorPrimary"
-        android:elevation="4dp"
-        android:gravity="center"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-        android:textColor="@color/colorWhite"
-        android:visibility="gone"
-        tools:alpha="1"
-        tools:text="connected"
-        tools:visibility="visible" />
+        android:layout_height="42dp"
+        android:background="#54585E"
+        android:drawableEnd="@drawable/ic_group_by_type_20dp"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center_vertical"
+        android:paddingStart="@dimen/screen_edge_left_and_right_margins"
+        android:paddingEnd="@dimen/screen_edge_left_and_right_margins"
+        android:text="@string/msg_sort_by_placeholder"
+        android:textColor="#CBCED1"
+        android:textSize="14sp"
+        android:textStyle="normal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_directory" />
 
-    <TextView
-        android:id="@+id/text_no_result_found"
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_sort_by" />
+
+    <com.wang.avi.AVLoadingIndicatorView
+        android:id="@+id/view_loading"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_centerHorizontal="true"
-        android:layout_marginTop="56dp"
-        android:text="@string/msg_no_search_found"
-        android:textSize="20sp"
         android:visibility="gone"
+        app:indicatorColor="@color/colorBlack"
+        app:indicatorName="BallPulseIndicator"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_sort_by"
         tools:visibility="visible" />
-</RelativeLayout>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_create_channel.xml b/app/src/main/res/layout/fragment_create_channel.xml
index 69097aa000..7e7249e9e8 100644
--- a/app/src/main/res/layout/fragment_create_channel.xml
+++ b/app/src/main/res/layout/fragment_create_channel.xml
@@ -4,10 +4,13 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:layout_margin="16dp"
-    android:focusableInTouchMode="true"
     tools:context="createchannel.ui.CreateChannelFragment">
 
+    <include
+        android:id="@+id/layout_app_bar"
+        layout="@layout/app_bar"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <com.wang.avi.AVLoadingIndicatorView
         android:id="@+id/view_loading"
         android:layout_width="wrap_content"
@@ -18,23 +21,26 @@
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/layout_app_bar"
         tools:visibility="visible" />
 
     <TextView
         android:id="@+id/text_channel_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
         android:text="@string/msg_public_channel"
         android:textColor="@color/colorPrimaryText"
         android:textSize="16sp"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+        app:layout_constraintTop_toBottomOf="@+id/layout_app_bar" />
 
     <TextView
         android:id="@+id/text_channel_type_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
         android:text="@string/msg_public_channel_description"
         android:textColor="@color/colorSecondaryText"
         android:textSize="12sp"
@@ -45,6 +51,7 @@
         android:id="@+id/switch_channel_type"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
         app:layout_constraintBottom_toBottomOf="@+id/text_channel_type_description"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/text_channel_type" />
@@ -53,6 +60,8 @@
         android:id="@+id/text_read_only"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+
         android:layout_marginTop="16dp"
         android:text="@string/msg_ready_only_channel"
         android:textColor="@color/colorPrimaryText"
@@ -64,6 +73,8 @@
         android:id="@+id/text_read_only_description"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+
+        android:layout_marginStart="16dp"
         android:text="@string/msg_ready_only_channel_description"
         android:textColor="@color/colorSecondaryText"
         android:textSize="12sp"
@@ -74,6 +85,8 @@
         android:id="@+id/switch_read_only"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_marginEnd="16dp"
+
         app:layout_constraintBottom_toBottomOf="@+id/text_read_only_description"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/text_read_only" />
@@ -81,7 +94,9 @@
     <ImageView
         android:id="@+id/image_channel_icon"
         android:layout_width="wrap_content"
+
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="22dp"
         android:src="@drawable/ic_hashtag_black_12dp"
         app:layout_constraintStart_toStartOf="parent"
@@ -91,6 +106,8 @@
         android:id="@+id/text_channel_name"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:backgroundTint="@color/colorDim"
         android:hint="@string/msg_channel_name"
         android:inputType="text"
@@ -107,6 +124,7 @@
         android:id="@+id/image_invite_member"
         android:layout_width="14dp"
         android:layout_height="14dp"
+        android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
         android:src="@drawable/ic_at_black_20dp"
         app:layout_constraintStart_toStartOf="parent"
@@ -116,6 +134,8 @@
         android:id="@+id/text_invite_members"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="16dp"
         android:backgroundTint="@color/colorDim"
         android:hint="@string/msg_invite_members"
         android:inputType="text"
diff --git a/app/src/main/res/layout/fragment_directory.xml b/app/src/main/res/layout/fragment_directory.xml
new file mode 100644
index 0000000000..7de8dd034a
--- /dev/null
+++ b/app/src/main/res/layout/fragment_directory.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".directory.ui.DirectoryFragment">
+
+    <include
+        android:id="@+id/layout_app_bar"
+        layout="@layout/app_bar"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <TextView
+        android:id="@+id/text_sort_by"
+        android:layout_width="match_parent"
+        android:layout_height="42dp"
+        android:background="#54585E"
+        android:drawableStart="@drawable/ic_hashtag_16dp"
+        android:drawableEnd="@drawable/ic_arrow_down"
+        android:drawablePadding="10dp"
+        android:fontFamily="sans-serif-medium"
+        android:gravity="center_vertical"
+        android:paddingStart="@dimen/screen_edge_left_and_right_margins"
+        android:paddingEnd="@dimen/screen_edge_left_and_right_margins"
+        android:text="@string/msg_channels"
+        android:textColor="#CBCED1"
+        android:textSize="14sp"
+        android:textStyle="normal"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/layout_app_bar" />
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/recycler_view"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:scrollbars="vertical"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_sort_by" />
+
+    <com.wang.avi.AVLoadingIndicatorView
+        android:id="@+id/view_loading"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:indicatorColor="@color/colorBlack"
+        app:indicatorName="BallPulseIndicator"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/text_sort_by"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_preferences.xml b/app/src/main/res/layout/fragment_preferences.xml
deleted file mode 100644
index df859fb237..0000000000
--- a/app/src/main/res/layout/fragment_preferences.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:layout_margin="16dp"
-    tools:context="preferences.ui.PreferencesFragment">
-
-    <com.wang.avi.AVLoadingIndicatorView
-        android:id="@+id/view_loading"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        app:indicatorColor="@color/colorBlack"
-        app:indicatorName="BallPulseIndicator"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:visibility="visible" />
-
-    <TextView
-        android:id="@+id/text_analytics_tracking"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/msg_analytics_tracking"
-        android:textColor="@color/colorPrimaryText"
-        android:textSize="16sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/text_analytics_tracking_description"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/msg_send_analytics_tracking"
-        android:textColor="@color/colorSecondaryText"
-        android:textSize="12sp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/text_analytics_tracking" />
-
-    <Switch
-        android:id="@+id/switch_analytics_tracking"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:checked="true"
-        app:layout_constraintBottom_toBottomOf="@+id/text_analytics_tracking_description"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/text_analytics_tracking" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/fragment_profile.xml b/app/src/main/res/layout/fragment_profile.xml
index 9877aec9ec..70ba755078 100644
--- a/app/src/main/res/layout/fragment_profile.xml
+++ b/app/src/main/res/layout/fragment_profile.xml
@@ -8,9 +8,15 @@
     android:focusableInTouchMode="true"
     tools:context=".profile.ui.ProfileFragment">
 
+    <include
+        android:id="@+id/layout_app_bar"
+        layout="@layout/app_bar"
+        app:layout_constraintTop_toTopOf="parent" />
+
     <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+        android:layout_height="wrap_content"
+        android:layout_below="@+id/layout_app_bar">
 
         <LinearLayout
             android:id="@+id/profile_container"
@@ -29,37 +35,57 @@
                 android:layout_height="wrap_content"
                 android:layout_marginTop="32dp" />
 
+            <TextView
+                android:id="@+id/text_status"
+                style="@style/Profile.TextView"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:text="@string/status" />
+
+            <TextView
+                style="@style/Profile.TextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/msg_name" />
+
             <EditText
                 android:id="@+id/text_name"
                 style="@style/Profile.EditText"
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_marginTop="32dp"
                 android:drawableStart="@drawable/ic_person_black_20dp"
-                android:hint="@string/msg_name"
+                android:hint="@string/msg_profile_name_hint"
                 android:inputType="textCapWords" />
 
+            <TextView
+                style="@style/Profile.TextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/msg_username" />
+
             <EditText
                 android:id="@+id/text_username"
                 style="@style/Profile.EditText"
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_marginTop="16dp"
                 android:drawableStart="@drawable/ic_at_black_20dp"
-                android:hint="@string/msg_username"
+                android:hint="@string/msg_profile_username_hint"
                 android:inputType="text" />
 
+            <TextView
+                style="@style/Profile.TextView"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="@string/msg_email" />
+
             <EditText
                 android:id="@+id/text_email"
                 style="@style/Profile.EditText"
                 android:layout_width="match_parent"
-                android:layout_height="48dp"
-                android:layout_marginTop="16dp"
                 android:layout_marginBottom="16dp"
                 android:drawableStart="@drawable/ic_email_black_20dp"
-                android:hint="@string/msg_email"
+                android:hint="@string/msg_profile_email_hint"
                 android:inputType="textEmailAddress" />
         </LinearLayout>
+
     </ScrollView>
 
     <com.wang.avi.AVLoadingIndicatorView
diff --git a/app/src/main/res/layout/fragment_settings.xml b/app/src/main/res/layout/fragment_settings.xml
index d630b8b9c5..6572366bf9 100644
--- a/app/src/main/res/layout/fragment_settings.xml
+++ b/app/src/main/res/layout/fragment_settings.xml
@@ -1,13 +1,330 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     tools:context=".settings.ui.SettingsFragment">
 
-    <ListView
-        android:id="@+id/settings_list"
+    <include
+        android:id="@+id/layout_app_bar"
+        layout="@layout/app_bar"
+        app:layout_constraintTop_toTopOf="parent" />
+
+    <ScrollView
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:entries="@array/settings_actions" />
-</RelativeLayout>
+        android:layout_height="0dp"
+        android:layout_below="@+id/layout_app_bar"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/layout_app_bar">
+
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:paddingTop="20dp">
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/profile_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@color/colorLightGrey"
+                android:foreground="?selectableItemBackground"
+                android:paddingStart="16dp"
+                android:paddingTop="5dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="5dp"
+                app:layout_constraintTop_toTopOf="parent">
+
+                <com.facebook.drawee.view.SimpleDraweeView
+                    android:id="@+id/image_avatar"
+                    android:layout_width="48dp"
+                    android:layout_height="48dp"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent"
+                    app:roundedCornerRadius="4dp" />
+
+                <TextView
+                    android:id="@+id/text_display_name"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:fontFamily="sans-serif-medium"
+                    android:textColor="#DE000000"
+                    android:textSize="14sp"
+                    android:textStyle="normal"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/image_avatar"
+                    app:layout_constraintTop_toTopOf="@+id/image_avatar"
+                    tools:text="user.name" />
+
+                <TextView
+                    android:id="@+id/text_status"
+                    android:layout_width="0dp"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="12dp"
+                    android:fontFamily="sans-serif"
+                    android:textColor="#99000000"
+                    android:textSize="14sp"
+                    android:textStyle="normal"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintStart_toEndOf="@+id/image_avatar"
+                    app:layout_constraintTop_toBottomOf="@+id/text_display_name"
+                    tools:text="online" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <TextView
+                android:id="@+id/text_contact_us"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:background="@color/colorLightGrey"
+                android:fontFamily="sans-serif-medium"
+                android:foreground="?selectableItemBackground"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/msg_contact_us"
+                android:textColor="#DE000000"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/profile_container" />
+
+            <TextView
+                android:id="@+id/text_language"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="@color/colorLightGrey"
+                android:fontFamily="sans-serif-medium"
+                android:foreground="?selectableItemBackground"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/msg_language"
+                android:textColor="#DE000000"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_contact_us" />
+
+            <TextView
+                android:id="@+id/text_review_this_app"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="@color/colorLightGrey"
+                android:fontFamily="sans-serif-medium"
+                android:foreground="?selectableItemBackground"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/msg_review_this_app"
+                android:textColor="#DE000000"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_language" />
+
+            <TextView
+                android:id="@+id/text_share_this_app"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="@color/colorLightGrey"
+                android:fontFamily="sans-serif-medium"
+                android:foreground="?selectableItemBackground"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/msg_share_this_app"
+                android:textColor="#DE000000"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_review_this_app" />
+
+            <TextView
+                android:id="@+id/text_administration"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:background="@color/colorLightGrey"
+                android:fontFamily="sans-serif-medium"
+                android:foreground="?selectableItemBackground"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/msg_administration"
+                android:textColor="#DE000000"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_share_this_app"
+                tools:visibility="visible" />
+
+            <TextView
+                android:id="@+id/text_license"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:background="@color/colorLightGrey"
+                android:fontFamily="sans-serif-medium"
+                android:foreground="?selectableItemBackground"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/msg_license"
+                android:textColor="#DE000000"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_administration" />
+
+            <TextView
+                android:id="@+id/text_app_version"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="@color/colorLightGrey"
+                android:fontFamily="sans-serif-medium"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/msg_app_version"
+                android:textColor="#DE000000"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_license" />
+
+            <TextView
+                android:id="@+id/text_server_version"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:background="@color/colorLightGrey"
+                android:fontFamily="sans-serif-medium"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/msg_server_version"
+                android:textColor="#DE000000"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_app_version" />
+
+            <androidx.constraintlayout.widget.ConstraintLayout
+                android:id="@+id/send_analytics_container"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:background="@color/colorLightGrey"
+                android:paddingStart="16dp"
+                android:paddingTop="5dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="5dp"
+                app:layout_constraintTop_toBottomOf="@+id/text_server_version">
+
+                <TextView
+                    android:id="@+id/text_send_crash_report"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif-medium"
+                    android:text="@string/msg_send_analytics"
+                    android:textColor="#DE000000"
+                    android:textSize="16sp"
+                    android:textStyle="normal"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toTopOf="parent" />
+
+                <Switch
+                    android:id="@+id/switch_crash_report"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:checked="false"
+                    app:layout_constraintEnd_toEndOf="parent"
+                    app:layout_constraintTop_toTopOf="@+id/text_send_crash_report" />
+
+                <TextView
+                    android:id="@+id/text_send_crash_report_description"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:fontFamily="sans-serif"
+                    android:text="@string/msg_send_analytics_tracking"
+                    android:textColor="#99000000"
+                    android:textSize="14sp"
+                    android:textStyle="normal"
+                    app:layout_constraintStart_toStartOf="parent"
+                    app:layout_constraintTop_toBottomOf="@+id/text_send_crash_report" />
+            </androidx.constraintlayout.widget.ConstraintLayout>
+
+            <TextView
+                android:id="@+id/text_logout"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dp"
+                android:fontFamily="sans-serif-medium"
+                android:foreground="?selectableItemBackground"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/msg_logout_from_rocket_chat"
+                android:textColor="@color/colorRed"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/send_analytics_container" />
+
+            <TextView
+                android:id="@+id/text_delete_account"
+                android:layout_width="0dp"
+                android:layout_height="wrap_content"
+                android:fontFamily="sans-serif-medium"
+                android:foreground="?selectableItemBackground"
+                android:paddingStart="16dp"
+                android:paddingTop="8dp"
+                android:paddingEnd="16dp"
+                android:paddingBottom="8dp"
+                android:text="@string/msg_delete_account"
+                android:textColor="@color/colorRed"
+                android:textSize="16sp"
+                android:textStyle="normal"
+                android:visibility="gone"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toBottomOf="@+id/text_logout"
+                tools:visibility="visible" />
+
+            <com.wang.avi.AVLoadingIndicatorView
+                android:id="@+id/view_loading"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:visibility="gone"
+                app:indicatorColor="@color/colorBlack"
+                app:indicatorName="BallPulseIndicator"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintTop_toTopOf="parent"
+                tools:visibility="visible" />
+
+        </androidx.constraintlayout.widget.ConstraintLayout>
+    </ScrollView>
+
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/fragment_user_details.xml b/app/src/main/res/layout/fragment_user_details.xml
index 8f78b7142e..5234df1d6c 100644
--- a/app/src/main/res/layout/fragment_user_details.xml
+++ b/app/src/main/res/layout/fragment_user_details.xml
@@ -95,7 +95,7 @@
             android:layout_height="wrap_content"
             android:layout_marginStart="@dimen/screen_edge_left_and_right_margins"
             android:layout_marginTop="20dp"
-            android:text="@string/status"
+            android:text="@string/user_detail_status"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@+id/text_message" />
 
@@ -143,6 +143,6 @@
             android:id="@+id/group_user_details"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:constraint_referenced_ids="image_blur, image_avatar, text_name, text_username, text_message, text_title_status, text_description_status, text_title_timezone, text_description_timezone" />
+            app:constraint_referenced_ids="image_blur, image_avatar, text_name, text_username, text_message, text_title_status, text_description_status, text_title_timezone, text_description_timezone, text_video_call" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
diff --git a/app/src/main/res/layout/item_account.xml b/app/src/main/res/layout/item_account.xml
deleted file mode 100644
index ed902d21a3..0000000000
--- a/app/src/main/res/layout/item_account.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingEnd="16dp"
-    android:paddingStart="16dp"
-    android:paddingTop="16dp"
-    android:background="?selectableItemBackground">
-
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/server_logo"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        app:actualImageScaleType="centerInside"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/text_server_url"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        android:textStyle="bold"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/server_logo"
-        app:layout_constraintTop_toTopOf="@id/server_logo"
-        tools:text="https://open.rocket.chat" />
-
-    <TextView
-        android:id="@+id/text_username"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:ellipsize="end"
-        android:maxLines="1"
-        app:layout_constraintBottom_toBottomOf="@id/server_logo"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/server_logo"
-        tools:text="Lucio Maciel" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_actions_attachment.xml b/app/src/main/res/layout/item_actions_attachment.xml
index be85d47aad..ecac02e795 100644
--- a/app/src/main/res/layout/item_actions_attachment.xml
+++ b/app/src/main/res/layout/item_actions_attachment.xml
@@ -24,7 +24,7 @@
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
+        tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have made sure that everything is amazing!" />
 
     <View
         android:id="@+id/quote_bar"
diff --git a/app/src/main/res/layout/item_add_account.xml b/app/src/main/res/layout/item_add_account.xml
deleted file mode 100644
index edb46d7a9f..0000000000
--- a/app/src/main/res/layout/item_add_account.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?selectableItemBackground"
-    android:padding="16dp">
-
-    <ImageView
-        android:id="@+id/server_logo"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:src="@drawable/ic_add_24dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:text="@string/action_add_account"
-        android:textAppearance="@style/TextAppearance.AppCompat.Body2"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/server_logo"
-        app:layout_constraintTop_toTopOf="parent" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_add_new_server.xml b/app/src/main/res/layout/item_add_new_server.xml
new file mode 100644
index 0000000000..de8f1cf10b
--- /dev/null
+++ b/app/src/main/res/layout/item_add_new_server.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:orientation="vertical"
+    android:padding="16dp">
+
+    <TextView
+        android:id="@+id/text_add_new_server"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:drawableStart="@drawable/ic_add_new_server_48dp"
+        android:drawablePadding="12dp"
+        android:fontFamily="sans-serif"
+        android:gravity="center"
+        android:text="@string/msg_add_new_server"
+        android:textColor="#9ea2a8"
+        android:textSize="16sp"
+        android:textStyle="bold"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/recycler_view" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_change_status.xml b/app/src/main/res/layout/item_change_status.xml
deleted file mode 100644
index b7bf77079b..0000000000
--- a/app/src/main/res/layout/item_change_status.xml
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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:divider="?android:dividerHorizontal"
-    android:orientation="vertical"
-    android:showDividers="end">
-
-    <TextView
-        android:id="@+id/text_online"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="8dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:drawablePadding="10dp"
-        android:drawableStart="@drawable/ic_status_online_12dp"
-        android:text="@string/action_online"
-        android:background="?selectableItemBackground"/>
-
-    <TextView
-        android:id="@+id/text_away"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="8dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:drawablePadding="10dp"
-        android:drawableStart="@drawable/ic_status_away_12dp"
-        android:text="@string/action_away"
-        android:background="?selectableItemBackground"/>
-
-    <TextView
-        android:id="@+id/text_busy"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="8dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:drawablePadding="10dp"
-        android:drawableStart="@drawable/ic_status_busy_12dp"
-        android:text="@string/action_busy"
-        android:background="?selectableItemBackground"/>
-
-    <TextView
-        android:id="@+id/text_invisible"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingBottom="8dp"
-        android:paddingEnd="16dp"
-        android:paddingStart="16dp"
-        android:paddingTop="8dp"
-        android:drawablePadding="10dp"
-        android:drawableStart="@drawable/ic_status_invisible_12dp"
-        android:text="@string/action_invisible"
-        android:background="?selectableItemBackground"/>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_chat.xml b/app/src/main/res/layout/item_chat.xml
index febbd65fe6..541fcf66c3 100644
--- a/app/src/main/res/layout/item_chat.xml
+++ b/app/src/main/res/layout/item_chat.xml
@@ -8,21 +8,22 @@
     android:paddingStart="@dimen/screen_edge_left_and_right_padding"
     android:paddingTop="@dimen/chat_item_top_and_bottom_padding"
     android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
-    android:paddingBottom="@dimen/chat_item_top_and_bottom_padding">
+    android:paddingBottom="@dimen/chat_item_top_and_bottom_padding"
+    tools:context=".chatrooms.adapter.RoomsAdapter">
 
-    <com.facebook.drawee.view.SimpleDraweeView
+    <ImageView
         android:id="@+id/image_avatar"
         android:layout_width="48dp"
         android:layout_height="48dp"
-        android:layout_marginTop="5dp"
+        android:layout_marginTop="2dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:roundedCornerRadius="4dp" />
+        tools:src="@tools:sample/avatars" />
 
     <ImageView
         android:id="@+id/image_chat_icon"
         android:layout_width="12dp"
-        android:layout_height="0dp"
+        android:layout_height="12dp"
         android:layout_marginStart="16dp"
         app:layout_constraintBottom_toBottomOf="@+id/text_chat_name"
         app:layout_constraintStart_toEndOf="@+id/image_avatar"
@@ -35,6 +36,7 @@
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/text_view_drawable_padding"
+        android:layout_marginEnd="@dimen/text_view_drawable_padding"
         android:textDirection="locale"
         app:layout_constraintEnd_toStartOf="@+id/text_timestamp"
         app:layout_constraintStart_toEndOf="@+id/image_chat_icon"
@@ -60,16 +62,16 @@
         android:layout_marginEnd="12dp"
         android:textDirection="locale"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/layout_unread_messages_badge"
+        app:layout_constraintEnd_toStartOf="@+id/text_total_unread_messages"
         app:layout_constraintStart_toStartOf="@+id/image_chat_icon"
         app:layout_constraintTop_toBottomOf="@+id/text_chat_name"
-        tools:text="Filipe de Lima Brito: Type something that is very big and need at least to lines, or maybe even more" />
+        tools:text="Filipe de Lima Brito: Type something that is very long and need at least two lines, or maybe even more" />
 
     <include
-        android:id="@+id/layout_unread_messages_badge"
+        android:id="@+id/text_total_unread_messages"
         layout="@layout/unread_messages_badge"
-        android:layout_width="21dp"
-        android:layout_height="21dp"
+        android:layout_width="21sp"
+        android:layout_height="21sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="@+id/text_last_message" />
 
diff --git a/app/src/main/res/layout/item_chatroom_header.xml b/app/src/main/res/layout/item_chatroom_header.xml
index 7cdcc4f53d..3324ad081c 100644
--- a/app/src/main/res/layout/item_chatroom_header.xml
+++ b/app/src/main/res/layout/item_chatroom_header.xml
@@ -10,8 +10,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="16dp"
-        android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
         android:paddingStart="@dimen/screen_edge_left_and_right_padding"
-        android:text="@string/chatroom_header" />
+        android:paddingEnd="@dimen/screen_edge_left_and_right_padding" />
 
- </LinearLayout>
\ No newline at end of file
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_directory_channel.xml b/app/src/main/res/layout/item_directory_channel.xml
new file mode 100644
index 0000000000..940f482635
--- /dev/null
+++ b/app/src/main/res/layout/item_directory_channel.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:paddingStart="@dimen/screen_edge_left_and_right_padding"
+    android:paddingTop="8dp"
+    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
+    android:paddingBottom="8dp">
+
+    <ImageView
+        android:id="@+id/image_avatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:srcCompat="@tools:sample/avatars[6]" />
+
+    <TextView
+        android:id="@+id/text_channel_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="10dp"
+        android:fontFamily="sans-serif-medium"
+        android:maxLines="1"
+        android:textColor="#0c0d0f"
+        android:textSize="17sp"
+        android:textStyle="normal"
+        app:layout_constraintEnd_toStartOf="@+id/text_channel_total_members"
+        app:layout_constraintLeft_toRightOf="@+id/image_avatar"
+        app:layout_constraintStart_toEndOf="@+id/image_avatar"
+        app:layout_constraintTop_toTopOf="@+id/image_avatar"
+        tools:text="General" />
+
+    <TextView
+        android:id="@+id/text_channel_description"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="10dp"
+        android:fontFamily="sans-serif"
+        android:maxLines="1"
+        android:textColor="#9ea2a8"
+        android:textSize="15sp"
+        android:textStyle="normal"
+        app:layout_constraintEnd_toStartOf="@+id/text_channel_total_members"
+        app:layout_constraintStart_toStartOf="@+id/text_channel_name"
+        app:layout_constraintTop_toBottomOf="@+id/text_channel_name"
+        tools:text="Community support" />
+
+    <TextView
+        android:id="@+id/text_channel_total_members"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif"
+        android:maxLines="1"
+        android:textColor="#9da2a9"
+        android:textSize="12sp"
+        android:textStyle="normal"
+        app:layout_constraintBottom_toBottomOf="@+id/text_channel_description"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/text_channel_name"
+        tools:text="230K members" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_directory_user.xml b/app/src/main/res/layout/item_directory_user.xml
new file mode 100644
index 0000000000..7f73ec4cbc
--- /dev/null
+++ b/app/src/main/res/layout/item_directory_user.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?android:attr/selectableItemBackground"
+    android:paddingStart="@dimen/screen_edge_left_and_right_padding"
+    android:paddingTop="8dp"
+    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
+    android:paddingBottom="8dp">
+
+    <ImageView
+        android:id="@+id/image_avatar"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:srcCompat="@tools:sample/avatars[6]" />
+
+    <TextView
+        android:id="@+id/text_user_name"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="16dp"
+        android:layout_marginEnd="10dp"
+        android:fontFamily="sans-serif-medium"
+        android:maxLines="1"
+        android:textColor="#0c0d0f"
+        android:textSize="17sp"
+        android:textStyle="normal"
+        app:layout_constraintEnd_toStartOf="@+id/text_server_url"
+        app:layout_constraintLeft_toRightOf="@+id/image_avatar"
+        app:layout_constraintStart_toEndOf="@+id/image_avatar"
+        app:layout_constraintTop_toTopOf="@+id/image_avatar"
+        tools:text="User" />
+
+    <TextView
+        android:id="@+id/text_user_username"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginEnd="10dp"
+        android:fontFamily="sans-serif"
+        android:maxLines="1"
+        android:textColor="#9ea2a8"
+        android:textSize="15sp"
+        android:textStyle="normal"
+        app:layout_constraintEnd_toStartOf="@+id/text_server_url"
+        app:layout_constraintStart_toStartOf="@+id/text_user_name"
+        app:layout_constraintTop_toBottomOf="@+id/text_user_name"
+        tools:text="Username" />
+
+    <!-- We only show the server url if the user is searching for global users-->
+    <TextView
+        android:id="@+id/text_server_url"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:fontFamily="sans-serif"
+        android:maxLines="1"
+        android:textColor="#9da2a9"
+        android:textSize="12sp"
+        android:textStyle="normal"
+        android:visibility="gone"
+        app:layout_constraintBottom_toBottomOf="@+id/text_user_username"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/text_user_name"
+        tools:text="230K members" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_message.xml b/app/src/main/res/layout/item_message.xml
index 9f1e708032..c9632ed562 100644
--- a/app/src/main/res/layout/item_message.xml
+++ b/app/src/main/res/layout/item_message.xml
@@ -156,7 +156,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/message_header"
         app:layout_constraintTop_toBottomOf="@+id/message_header"
-        tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
+        tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have made sure that everything is amazing!" />
 
     <Button
         android:id="@+id/button_join_video_call"
diff --git a/app/src/main/res/layout/item_message_attachment_old.xml b/app/src/main/res/layout/item_message_attachment_old.xml
deleted file mode 100644
index 33f3ea6dd6..0000000000
--- a/app/src/main/res/layout/item_message_attachment_old.xml
+++ /dev/null
@@ -1,79 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/attachment_container"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:animateLayoutChanges="true"
-    android:background="?android:attr/selectableItemBackground"
-    android:clickable="true"
-    android:focusable="true"
-    android:paddingStart="@dimen/screen_edge_left_and_right_padding"
-    android:paddingTop="@dimen/message_item_top_and_bottom_padding"
-    android:paddingEnd="@dimen/screen_edge_left_and_right_padding"
-    android:paddingBottom="@dimen/message_item_top_and_bottom_padding">
-
-    <View
-        android:id="@+id/quote_bar"
-        android:layout_width="4dp"
-        android:layout_height="0dp"
-        android:layout_marginStart="56dp"
-        android:background="@drawable/quote_vertical_gray_bar"
-        app:layout_constraintBottom_toTopOf="@+id/text_view_more"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
-    <TextView
-        android:id="@+id/text_sender"
-        style="@style/Sender.Name.TextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:textColor="@color/colorPrimary"
-        app:layout_constraintStart_toEndOf="@+id/quote_bar"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:text="Ronald Perkins" />
-
-    <TextView
-        android:id="@+id/text_message_time"
-        style="@style/ChatList.Timestamp.TextView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="10dp"
-        app:layout_constraintBottom_toBottomOf="@+id/text_sender"
-        app:layout_constraintStart_toEndOf="@+id/text_sender"
-        app:layout_constraintTop_toTopOf="@+id/text_sender"
-        tools:text="11:45 PM" />
-
-    <TextView
-        android:id="@+id/text_content"
-        style="@style/Message.Quote.TextView"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintBottom_toTopOf="@id/text_view_more"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="@+id/text_sender"
-        app:layout_constraintTop_toBottomOf="@+id/text_sender"
-        tools:text="This is a multiline chat message from Bertie that will take more than just one line of text. I have sure that everything is amazing!" />
-
-    <TextView
-        android:id="@+id/text_view_more"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:gravity="end"
-        android:textColor="@color/darkGray"
-        android:textSize="14sp"
-        app:layout_constraintEnd_toEndOf="@+id/text_content"
-        app:layout_constraintStart_toStartOf="@+id/quote_bar"
-        app:layout_constraintTop_toBottomOf="@+id/text_content"
-        tools:text="Visualizar mais" />
-
-    <include
-        layout="@layout/layout_reactions"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        app:layout_constraintStart_toStartOf="@+id/quote_bar"
-        app:layout_constraintTop_toBottomOf="@+id/text_view_more" />
-
-</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/item_server.xml b/app/src/main/res/layout/item_server.xml
new file mode 100644
index 0000000000..d5c36fea5f
--- /dev/null
+++ b/app/src/main/res/layout/item_server.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="?selectableItemBackground"
+    android:paddingStart="16dp"
+    android:paddingTop="16dp"
+    android:paddingEnd="16dp">
+
+    <ImageView
+        android:id="@+id/image_server"
+        android:layout_width="48dp"
+        android:layout_height="48dp"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:src="@tools:sample/avatars" />
+
+    <TextView
+        android:id="@+id/text_server_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:fontFamily="sans-serif-medium"
+        android:maxLines="1"
+        android:textColor="#DE000000"
+        android:textSize="16sp"
+        android:textStyle="normal"
+        app:layout_constraintStart_toEndOf="@+id/image_server"
+        app:layout_constraintTop_toTopOf="@+id/image_server"
+        tools:text="Hyper Ledger" />
+
+    <TextView
+        android:id="@+id/text_server_url"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="12dp"
+        android:layout_marginEnd="12dp"
+        android:fontFamily="sans-serif"
+        android:maxLines="1"
+        android:textColor="#99000000"
+        android:textSize="14sp"
+        android:textStyle="normal"
+        app:layout_constraintStart_toEndOf="@+id/image_server"
+        app:layout_constraintTop_toBottomOf="@+id/text_server_name"
+        tools:text="chat.hyperledger.org" />
+
+    <ImageView
+        android:id="@+id/image_check"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/ic_check"
+        android:visibility="invisible"
+        app:layout_constraintBottom_toBottomOf="@+id/image_server"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toTopOf="@+id/image_server"
+        tools:visibility="visible" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/message_action_bar.xml b/app/src/main/res/layout/message_action_bar.xml
index e2c25da693..72d99c586a 100644
--- a/app/src/main/res/layout/message_action_bar.xml
+++ b/app/src/main/res/layout/message_action_bar.xml
@@ -46,7 +46,6 @@
         android:adjustViewBounds="true"
         android:cropToPadding="true"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toStartOf="@+id/quote_bar"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_close_gray_24dp" />
@@ -65,4 +64,4 @@
         app:layout_constraintStart_toEndOf="@+id/quote_bar"
         app:layout_constraintTop_toTopOf="parent"
         tools:text="Edit message" />
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/layout/message_attachment_options.xml b/app/src/main/res/layout/message_attachment_options.xml
index fbf0150a6b..3b8746323f 100644
--- a/app/src/main/res/layout/message_attachment_options.xml
+++ b/app/src/main/res/layout/message_attachment_options.xml
@@ -11,7 +11,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:drawablePadding="20dp"
-        android:drawableStart="@drawable/ic_camera"
+        android:drawableStart="@drawable/ic_camera_24dp"
         android:gravity="start|center"
         android:text="@string/action_take_a_photo" />
 
diff --git a/app/src/main/res/layout/nav_header.xml b/app/src/main/res/layout/nav_header.xml
deleted file mode 100644
index 4609e47a21..0000000000
--- a/app/src/main/res/layout/nav_header.xml
+++ /dev/null
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="@dimen/nav_header_height">
-
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/server_logo"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:foreground="@drawable/black_gradient"
-        app:actualImageScaleType="centerCrop"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        tools:src="@tools:sample/backgrounds/scenic" />
-
-    <com.facebook.drawee.view.SimpleDraweeView
-        android:id="@+id/image_avatar"
-        android:layout_width="60dp"
-        android:layout_height="60dp"
-        android:background="@drawable/bg_empty_user_avatar"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="16dp"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:roundedCornerRadius="3dp"
-        tools:src="@tools:sample/avatars" />
-
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/account_container"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="16dp"
-        android:background="?selectableItemBackground"
-        android:elevation="2dp"
-        android:paddingStart="12dp"
-        android:paddingTop="4dp"
-        android:paddingEnd="12dp"
-        android:paddingBottom="4dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/image_avatar">
-
-        <ImageView
-            android:id="@+id/image_user_status"
-            android:layout_width="12dp"
-            android:layout_height="12dp"
-            app:layout_constraintBottom_toTopOf="@+id/text_user_name"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toStartOf="@+id/text_user_name"
-            app:layout_constraintTop_toTopOf="parent" />
-
-        <TextView
-            android:id="@+id/text_user_name"
-            style="@style/Sender.Name.TextView"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
-            android:textColor="@color/colorWhite"
-            app:layout_constraintBottom_toBottomOf="@+id/image_user_status"
-            app:layout_constraintEnd_toStartOf="@+id/image_account_expand"
-            app:layout_constraintStart_toEndOf="@+id/image_user_status"
-            app:layout_constraintTop_toTopOf="@+id/image_user_status"
-            tools:text="Lucio Maciel" />
-
-        <TextView
-            android:id="@+id/text_server_url"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginEnd="10dp"
-            android:ellipsize="end"
-            android:maxLines="1"
-            android:textAppearance="@style/TextAppearance.AppCompat.Small"
-            android:textColor="@color/colorWhite"
-            app:layout_constraintEnd_toStartOf="@+id/image_account_expand"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@+id/text_user_name"
-            tools:text="https://open.rocket.chat" />
-
-        <ImageView
-            android:id="@+id/image_account_expand"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:src="@drawable/ic_expand_more_black_24dp"
-            android:tint="@color/colorWhite"
-            app:layout_constraintBottom_toBottomOf="@+id/text_server_url"
-            app:layout_constraintEnd_toEndOf="parent" />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/unread_messages_badge.xml b/app/src/main/res/layout/unread_messages_badge.xml
index 83fe544115..cee91137cf 100644
--- a/app/src/main/res/layout/unread_messages_badge.xml
+++ b/app/src/main/res/layout/unread_messages_badge.xml
@@ -1,17 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TextView 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">
-
-    <TextView
-        android:id="@+id/text_total_unread_messages"
-        style="@style/ChatList.Badge.TextView"
-        android:layout_width="21dp"
-        android:layout_height="21dp"
-        android:background="@drawable/style_total_unread_messages"
-        android:visibility="gone"
-        tools:text="1"
-        tools:visibility="visible" />
-
-</LinearLayout>
\ No newline at end of file
+    style="@style/ChatList.Badge.TextView"
+    android:layout_width="21sp"
+    android:layout_height="21sp"
+    android:background="@drawable/style_total_unread_messages"
+    android:visibility="gone"
+    tools:text="1"
+    tools:visibility="visible" />
\ No newline at end of file
diff --git a/app/src/main/res/menu/chatrooms.xml b/app/src/main/res/menu/chatrooms.xml
index c40c4ef270..cf415f2d1d 100644
--- a/app/src/main/res/menu/chatrooms.xml
+++ b/app/src/main/res/menu/chatrooms.xml
@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto"
-    xmlns:tools="http://schemas.android.com/tools"
-    tools:ignore="AppCompatResource">
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_new_channel"
+        android:icon="@drawable/ic_new_channel_24dp"
+        android:title="@string/action_new_channel"
+        app:showAsAction="ifRoom" />
 
     <item
         android:id="@+id/action_search"
@@ -10,11 +14,4 @@
         android:title="@string/action_search"
         app:actionViewClass="androidx.appcompat.widget.SearchView"
         app:showAsAction="ifRoom|collapseActionView" />
-
-    <item
-        android:id="@+id/action_sort"
-        android:icon="@drawable/ic_sort"
-        android:title="@string/msg_sort"
-        app:showAsAction="ifRoom" />
-
 </menu>
diff --git a/app/src/main/res/menu/directory.xml b/app/src/main/res/menu/directory.xml
new file mode 100644
index 0000000000..0c72153e20
--- /dev/null
+++ b/app/src/main/res/menu/directory.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <item
+        android:id="@+id/action_search"
+        android:icon="@drawable/ic_search_white_24dp"
+        android:title="@string/action_search"
+        app:actionViewClass="androidx.appcompat.widget.SearchView"
+        app:showAsAction="ifRoom|collapseActionView" />
+</menu>
diff --git a/app/src/main/res/menu/profile.xml b/app/src/main/res/menu/profile.xml
deleted file mode 100644
index 07b62474d7..0000000000
--- a/app/src/main/res/menu/profile.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
-
-    <item
-        android:id="@+id/action_delete_account"
-        android:title="@string/action_delete_account"
-        app:showAsAction="never" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values-ar/strings.xml b/app/src/main/res/values-ar/strings.xml
index 08ed034e37..9bb98f3961 100644
--- a/app/src/main/res/values-ar/strings.xml
+++ b/app/src/main/res/values-ar/strings.xml
@@ -1,10 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <!-- Titles -->
     <string name="title_sign_in_your_server">تسجيل الدخول إلى خادمك</string>
     <string name="title_log_in">تسجيل الدخول</string>
-    <string name="title_share_the_app">انشر البرنامج</string>
     <string name="title_register_username">اسم المستخدم</string>
     <string name="title_reset_password">إعادة تعيين كلمة السر</string>
     <string name="title_sign_up">سجل</string>
@@ -21,9 +19,9 @@
     <string name="title_admin_panel">لوحة الإدارة</string>
     <string name="title_password">تغيير كلمة السر</string>
     <string name="title_update_profile">تحديث الملف الشخصي</string>
-    <string name="title_about">عنا</string>
     <string name="title_create_channel">إنشاء قناة</string>
-    <string name="title_licence">الترخيص</string>
+    <string name="title_choose_language">اختر اللغة</string>
+    <string name="title_license">الترخيص</string>
     <string name="title_are_you_sure">هل أنت متأكد؟</string>
     <string name="title_channel_details">تفاصيل القناة</string>
     <string name="title_topic">موضوع</string>
@@ -35,6 +33,7 @@
     <string name="action_use_this_username">استخدم هذا الاسم</string>
     <string name="action_terms_of_service">شروط الخدمة</string>
     <string name="action_privacy_policy">شروط الخدمة</string>
+    <string name="action_new_channel">قناة جديدة</string>
     <string name="action_search">بحث</string>
     <string name="action_update">تحديث</string>
     <string name="action_settings">الإعدادات</string>
@@ -44,11 +43,10 @@
     <string name="action_attach_a_files">إضافة ملف</string>
     <string name="action_confirm_password">تأكيد تغيير كلمة السر</string>
     <string name="action_join_chat">إنضم للمحادثة</string>
-    <string name="action_add_account">إضافة حساب</string>
-    <string name="action_online">متصل</string>
-    <string name="action_away">بعيد</string>
-    <string name="action_busy">مشغول</string>
-    <string name="action_invisible">مخفي</string>
+    <string name="msg_online">متصل</string>
+    <string name="msg_away">بعيد</string>
+    <string name="msg_busy">مشغول</string>
+    <string name="msg_invisible">مخفي</string>
     <string name="action_drawing">رسم</string>
     <string name="action_save_to_gallery">حفظ في المعرض</string>
     <string name="action_select_photo_from_gallery">اختيار صورة من المعرض</string>
@@ -59,28 +57,51 @@
     <string name="action_create_server">إنشاء خادم جديد</string>
     <string name="action_register">تسجيل</string>
     <string name="action_confirm">تأكيد</string>
-    <string name="action_delete_account">حذف حساب</string>
-    <string name="action_favorite">Favorite</string> <!-- TODO Translate -->
-    <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Translate -->
+    <string name="action_favorite">تفضيل</string>
+    <string name="action_remove_favorite">إزالة التفضيل</string>
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">التفضيلات</item>
-        <item name="item_password">تغيير كلمة السر</item>
-        <item name="change_language">نغيير اللغة</item>
-        <item name="item_share_app">نشر البرنامج</item>
-        <item name="item_rate_us">قيمنا</item>
-        <item name="item_contact_us">اتصل بنا</item>
-        <item name="item_licence">الترخيص</item>
-        <item name="item_about">عنا</item>
+    <!-- Settings messages -->
+    <string name="msg_contact_us">اتصل بنا</string>
+    <string name="msg_language">تغيير اللغة</string>
+    <string name="msg_review_this_app">قيم هذا التطبيق</string>
+    <string name="msg_share_this_app">شارك هذا التطبيق</string>
+    <string name="msg_administration">الادارة</string>
+    <string name="msg_license">الرخصة</string>
+    <string name="msg_app_version">الإصدار: %1$s (%2$d)</string>
+    <string name="msg_server_version">إصدار الخادم: %1$s</string>
+    <string name="msg_send_analytics">إرسال التحليلات</string>
+    <string name="msg_send_analytics_tracking">إرسال تحليلات لمساعدة تطوير البرنامج</string>
+    <string name="msg_do_not_send_analytics_tracking">لا يتم إرسال تحليلات لمساعدة تطوير البرنامج</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">لا يمكن لأنه إصدار FOSS</string>
+    <string name="msg_logout_from_rocket_chat">تسجيل الخروج من Rocket.Chat</string>
+    <string name="msg_delete_account">حذف الحساب</string>
+    <string name="msg_change_status">تغيير الوضع</string>
+
+    <string-array name="languages">
+        <item>الإنجليزية</item>
+        <item>العربية</item>
+        <item>الألمانية</item>
+        <item>الأسبانية</item>
+        <item>الفارسية</item>
+        <item>الفرنسية</item>
+        <item>الهندية (IN)</item>
+        <item>الإيطالية</item>
+        <item>اليابانية</item>
+        <item>البرتغالية (BR)</item>
+        <item>البرتغالية (PT)</item>
+        <item>الروسية (RU)</item>
+        <item>التركية</item>
+        <item>الأوكرانية</item>
+        <item>الصينية (CN)</item>
+        <item>الصينية (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
-    <string name="msg_generic_error">نأسف حدث خطأ ما حاول مرة أخرى</string>
+    <string name="msg_generic_error">نأسف حدث خطأ ما، حاول مرة أخرى</string>
     <string name="msg_no_data_to_display">لا يوجد بيانات للعرض</string>
     <string name="msg_check_this_out">تحقق من هذا</string>
     <string name="msg_share_using">نشر بواسطة</string>
-    <string name="msg_profile_update_successfully">تم تحديث الملف الشخصي بنجاح</string>
+    <string name="msg_profile_updated_successfully">تم تحديث الملف الشخصي بنجاح</string>
     <string name="msg_username">اسم المستخدم</string>
     <string name="msg_username_or_email">اسم المستخدم أو عنوان بريد</string>
     <string name="msg_password">كلمة السر</string>
@@ -89,27 +110,27 @@
     <string name="msg_avatar_url">رابط الشخصية</string>
     <string name="msg_or_continue_using_social_accounts">استمرار باستخدام حساب التواصل الاجتماعي</string>
     <string name="msg_new_user">مستخدم جديد؟ %1$s</string>
-    <string name="msg_forgot__your_password">نسيت كلمة السر؟</string>
+    <string name="msg_forgot_your_password">نسيت كلمة السر؟</string>
     <string name="msg_reset">إعادة تعيين</string>
     <string name="msg_check_your_email_to_reset_your_password">تم إرسال الإيميل راجع إيميلك لتحديث كلمة السر</string>
     <string name="msg_invalid_email">من فضلك أدخل عنوان بريد صحيح</string>
-    <string name="msg_new_user_agreement">بالاستمرار أنت توافق على \n%1$s و %2$s</string>
+    <string name="msg_new_user_agreement">بالاستمرار أنت توافق على\n%1$s و %2$s</string>
     <string name="msg_yesterday">أمس</string>
     <string name="msg_today">اليوم</string>
     <string name="msg_message">رسالة</string>
-    <string name="msg_video_call">Video call</string> <!-- TODO Translate -->
-    <string name="msg_join_video_call">Join video call</string> <!-- TODO Translate -->
-    <string name="msg_this_room_is_read_only">هذه الغرفة للقراءة فقك</string>
-    <string name="msg_invalid_2fa_code">Invalid 2FA Code</string>
+    <string name="msg_video_call">مكالمة فيديو</string>
+    <string name="msg_join_video_call">انضم إلى مكالمة الفيديو</string>
+    <string name="msg_this_room_is_read_only">هذه الغرفة للقراءة فقط</string>
+    <string name="msg_invalid_2fa_code">رمز 2FA غير صالح</string>
     <string name="msg_invalid_file">ملف غير صالح</string>
     <string name="msg_invalid_server_url">رابط خادم غير صحيح</string>
     <string name="msg_content_description_log_in_using_facebook">تسجيل باستخدام فيسبوك</string>
-    <string name="msg_content_description_log_in_using_github">تسجيل باستخدام Github</string>
+    <string name="msg_content_description_log_in_using_github">تسجيل باستخدام GitHub</string>
     <string name="msg_content_description_log_in_using_google">تسجيل باستخدام Google</string>
     <string name="msg_content_description_log_in_using_linkedin">تسجيل باستخدام LinkedIn</string>
     <string name="msg_content_description_log_in_using_meteor">تسجيل باستخدام Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">تسجيل باستخدام Twitter</string>
-    <string name="msg_content_description_log_in_using_gitlab">تسجيل باستخدام Gitlab</string>
+    <string name="msg_content_description_log_in_using_gitlab">تسجيل باستخدام GitLab</string>
     <string name="msg_content_description_log_in_using_wordpress">تسجيل باستخدام WordPress</string>
     <string name="msg_content_description_send_message">ارسال رسالة</string>
     <string name="msg_content_description_show_more_login_options">إظهار طرق تسجيل أخرى</string>
@@ -117,12 +138,12 @@
     <string name="msg_you">أنت</string>
     <string name="msg_unknown">غير معرف</string>
     <string name="msg_email_address">عنوان بريد</string>
-    <string name="msg_utc_offset">UTC offset</string>
+    <string name="msg_utc_offset">التقديم عن UTC</string>
     <string name="msg_new_password">إدخال كلمة سر جديدة</string>
     <string name="msg_confirm_password">تأكيد كلمة السر</string>
-    <string name="msg_channel_name">تغيير الاسم</string>
+    <string name="msg_channel_name">اسم القناة</string>
     <string name="msg_search">بحث</string>
-    <string name="msg_unread_messages">لرسالة غير مقروءة</string>
+    <string name="msg_unread_messages">رسائل غير مقروءة</string>
     <string name="msg_preview_video">فيديو</string>
     <string name="msg_preview_audio">صوت</string>
     <string name="msg_preview_photo">صورة</string>
@@ -130,16 +151,13 @@
     <string name="msg_no_messages_yet">ليس هناك رسائل بعد</string>
     <string name="msg_build">Build %1$d - %2$s - %3$s</string>
     <string name="msg_update_app_version_in_order_to_continue">خادم منتهي برجاء التواصل مع مدير الخادم للاستمرار</string>
-    <string name="msg_ver_not_recommended">
-        يبدو أن خادمك قديم %1$s يمكنك الاستمرار لكن ليس بكامل الفعالية</string>
-    <string name="msg_ver_not_minimum">
-        يبدو أن خادمك قديم %1$s من فضلك حدث الخادم للاستمرار
-    </string>
+    <string name="msg_ver_not_recommended">يبدو أن خادمك قديم %1$s يمكنك الاستمرار لكن ليس بكامل الفعالية</string>
+    <string name="msg_ver_not_minimum">يبدو أن خادمك قديم %1$s من فضلك حدث الخادم للاستمرار</string>
     <string name="msg_no_chat_title">لا توجد رسائل</string>
     <string name="msg_no_chat_description">إبدأ المحادثة لترى الرسائل هنا</string>
-    <string name="msg_http_insecure">أنت تستخدم  HTTP وهو غير آمن ونحن لا نحبذ ذلك.</string>
-    <string name="msg_error_checking_server_version">حدذ خطأ عند محاولة الوصول نسخة خادمك حاول مرة أخرى</string>
-    <string name="msg_invalid_server_protocol">النظام المستخدم غير مقبول حاول ب  HTTPS</string>
+    <string name="msg_http_insecure">أنت تستخدم HTTP وهو غير آمن ونحن لا نحبذ ذلك.</string>
+    <string name="msg_error_checking_server_version">حدث خطأ أثناء التحقق من إصدار الخادم الخاص بك، حاول مرة أخرى</string>
+    <string name="msg_invalid_server_protocol">النظام المستخدم غير مقبول، حاول ب HTTPS</string>
     <string name="msg_image_saved_successfully">تم حفظ الصورة في المعرض</string>
     <string name="msg_image_saved_failed">لم يتم حفظ الصورة</string>
     <string name="msg_edited">(معدلة)</string>
@@ -155,39 +173,44 @@
     <string name="msg_sent_attachment">إرسال مرفق</string>
     <string name="msg_welcome_to_rocket_chat">أهلا بك في Rocket.Chat</string>
     <string name="msg_team_communication">التواصل مع الفريق</string>
-    <string name="msg_login_with_email">تسجيل ب  <b>عنوان البريد </b></string>
+    <string name="msg_login_with_email">تسجيل ب <b>عنوان البريد</b></string>
     <string name="msg_create_account">إنشاء حساب</string>
     <string name="msg_continue_with_facebook">استمرار ب <b>Facebook</b></string>
-    <string name="msg_continue_with_github">استمرار ب <b>Github</b></string>
+    <string name="msg_continue_with_github">استمرار ب <b>GitHub</b></string>
     <string name="msg_continue_with_google">استمرار ب <b>Google</b></string>
-    <string name="msg_continue_with_linkedin">استمرار ب <b>Linkedin</b></string>
+    <string name="msg_continue_with_linkedin">استمرار ب <b>LinkedIn</b></string>
     <string name="msg_continue_with_gitlab">استمرار ب <b>GitLab</b></string>
     <string name="msg_continue_with_wordpress">استمرار ب <b>WordPress</b></string>
     <string name="msg_two_factor_authentication">مصادقة مزدوجة</string>
-    <string name="msg__your_2fa_code">ما هو رمز 2FA?</string>
+    <string name="msg_your_2fa_code">ما هو رمز 2FA؟</string>
     <string name="msg_permalink_copied">الرابط الثابت المنسوخ</string>
     <string name="msg_no_topic">لا يوجد موضوع مضاف</string>
     <string name="msg_no_announcement">لا يوجد ملف مضاف</string>
     <string name="msg_no_description">لا يوجد وصف مضاف</string>
     <string name="msg_send_email">أرسال بريد</string>
-    <string name="msg_android_app_support">خدمة البرنامج </string>
+    <string name="msg_android_app_support">خدمة البرنامج</string>
     <string name="msg_unable_to_update_password">لا يمكن تحديث كلمة السر خطأ: %1$s</string>
     <string name="msg_password_updated_successfully">تم تحديث كلمة السر</string>
     <plurals name="msg_reacted_with_">
-        <item quantity="one">%1$s reacted with %2$s</item>
-        <item quantity="other">%1$s reacted with %2$s</item>
-        <item quantity="many">%1$s reacted with %2$s</item>
-        <item quantity="zero">%1$s reacted with %2$s</item>
-        <item quantity="few">%1$s reacted with %2$s</item>
-        <item quantity="two">%1$s reacted with %2$s</item>
+        <item quantity="one">%1$s تفاعل ب %2$s</item>
+        <item quantity="other">%1$s تفاعل ب %2$s</item>
+        <item quantity="many">%1$s تفاعلوا ب %2$s</item>
+        <item quantity="zero">%1$s تفاعل ب %2$s</item>
+        <item quantity="few">%1$s تفاعلوا ب %2$s</item>
+        <item quantity="two">%1$s تفاعلا ب %2$s</item>
     </plurals>
-    <string name="msg_credentials_saved_successfully">Credentials saved successfully</string> <!-- TODO Translate -->
+    <string name="msg_credentials_saved_successfully">تم حفظ البيانات بنجاح</string>
+    <string name="msg_camera_permission_denied">هناك حاجة إلى إذن الكاميرا لفتحها.</string>
+    <string name="msg_storage_permission_denied">هناك حاجة إلى إذن التخزين لفتح الرسم.</string>
+    <string name="msg_server">الخادم</string>
+    <string name="msg_add_new_server">إضافة خادم جديد</string>
+    <string name="msg_directory">الدليل</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">خاص</string>
     <string name="msg_public_channel">عام</string>
-    <string name="msg_private_channel_description">أنت فقط والأشخاص المدعوون يمكنكم دخزل هذه القناة</string>
-    <string name="msg_public_channel_description">الجميع يمكنه دخول هذه المجموعة</string>
+    <string name="msg_private_channel_description">أنت والأشخاص المدعوون فقط يمكنكم دخول هذه القناة</string>
+    <string name="msg_public_channel_description">يمكن للجميع دخول هذه القناة</string>
     <string name="msg_ready_only_channel">قناة للقراءة فقط</string>
     <string name="msg_ready_only_channel_description">المدير فقط يمكنه الكتابة</string>
     <string name="msg_invite_members">دعوة عضو للقناة</string>
@@ -195,48 +218,42 @@
     <string name="msg_member_not_found">عضو غير موجود</string>
     <string name="msg_channel_created_successfully">تم انشاء القناة بنجاح</string>
     <string name="msg_message_copied">تم نسخ الرسالة</string>
-    <string name="msg_delete_message">تم حذف الرسالة</string>
-    <string name="msg_delete_description">هل أنت متأكد من حذف هذه الرسالة</string>
+    <string name="msg_delete_message">حذف الرسالة</string>
+    <string name="msg_delete_description">هل أنت متأكد من حذف هذه الرسالة؟</string>
     <string name="msg_view_more">رؤية المزيد</string>
     <string name="msg_view_less">رؤية أقل</string>
     <string name="msg_muted_on_this_channel">لقد جعلت هذه القناة صامتة</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">تتبع التحليلات</string>
-    <string name="msg_send_analytics_tracking">إرسال تحليل لمساعدة تطوير البرنامج</string>
-    <string name="msg_do_not_send_analytics_tracking">لا يتم إرسال تحليل لمساعدة تطوير البرنامج</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">لا يمكن لأنه إصدار  FOSS</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">تم تغيير اسم الغرفة ل: %1$s بواسطة %2$s</string>
     <string name="message_user_added_by">المستخدم %1$s أضيف بواسطة %2$s</string>
     <string name="message_user_removed_by">المستخدم %1$s حذف بواسطة %2$s</string>
     <string name="message_user_left">غادر القناة.</string>
-    <string name="message_user_joined_channel">إنضم للقناة</string>
+    <string name="message_user_joined_channel">انضم للقناة</string>
     <string name="message_welcome">أهلا %s</string>
     <string name="message_removed">تم حذف الرسالة</string>
-    <string name="message_pinned">تمميز رسالة:</string>
+    <string name="message_pinned">تعلق رسالة:</string>
     <string name="message_muted">المسخدم %1$s صامت بواسطة %2$s</string>
     <string name="message_unmuted">المستخدم %1$s غير صامت بواسطة %2$s</string>
     <string name="message_role_add">%1$s تم جعله %2$s بواسطة %3$s</string>
     <string name="message_role_removed">%1$s لم يعد %2$s بواسطة %3$s</string>
-    <string name="message_video_call_started">Video call started by %1$s</string> <!-- TODO Translate -->
+    <string name="message_video_call_started">بدأت مكالمة الفيديو بواسطة %1$s</string>
 
     <!-- Message actions -->
     <string name="action_msg_reply">رد</string>
-    <string name="action_info">Info</string>  <!-- TODO Translate -->
+    <string name="action_info">معلومات</string>
     <string name="action_msg_edit">تعديل</string>
     <string name="action_msg_copy">نسخ</string>
     <string name="action_msg_quote">اقتباس</string>
     <string name="action_msg_delete">حذف</string>
-    <string name="action_pin">Pin</string> <!-- TODO Translate -->
-    <string name="action_unpin">Unpin</string> <!-- TODO Translate -->
-    <string name="action_star">Star</string> <!-- TODO Translate -->
-    <string name="action_unstar">Unstar</string> <!-- TODO Translate -->
+    <string name="action_pin">علق</string>
+    <string name="action_unpin">إزالة التعليق</string>
+    <string name="action_star">التمييز بنجمة</string>
+    <string name="action_unstar">إزالة النجمة</string>
     <string name="action_msg_share">نشر</string>
     <string name="action_title_editing">تعديل الرسالة</string>
     <string name="action_msg_add_reaction">إضافة تفاعل</string>
-    <string name="action_msg_permalink">Permalink</string>  <!-- TODO Translate -->
+    <string name="action_msg_permalink">ربط رابط ثابت</string>
     <string name="action_msg_report">إبلاغ</string>
 
     <!-- Permission messages -->
@@ -252,18 +269,18 @@
     <string name="title_members_list">الأعضاء</string>
 
     <!-- Mentions -->
-    <string name="msg_mentions">إشارة</string>
-    <string name="msg_no_mention">لا إشارة</string>
-    <string name="msg_all_the_mentions_appear_here">الإشارات \nتظهر هنا</string>
+    <string name="msg_mentions">إشارات</string>
+    <string name="msg_no_mention">لا يوجد إشارة</string>
+    <string name="msg_all_the_mentions_appear_here">الإشارات\nتظهر هنا</string>
 
     <!-- Pinned Messages -->
-    <string name="title_pinned_messages">رسالة مميزة</string>
-    <string name="no_pinned_messages">رسائل غير مميزة</string>
+    <string name="title_pinned_messages">الرسائل المميزة</string>
+    <string name="no_pinned_messages">لا يوجد رسائل مميزة</string>
     <string name="no_pinned_description">الرسائل المميزة\nتظهر هنا</string>
 
     <!-- Favorite Messages -->
-    <string name="title_favorite_messages">الرسائل المفصلة</string>
-    <string name="no_favorite_messages">الرسائل غير المفضلة</string>
+    <string name="title_favorite_messages">الرسائل المفضلة</string>
+    <string name="no_favorite_messages">لا يوجد رسائل مفضلة</string>
     <string name="no_favorite_description">الرسائل المفضلة\nتظهر هنا</string>
 
     <!-- Files -->
@@ -273,17 +290,17 @@
     <string name="msg_all_files_appear_here">الملفات تظهر هنا</string>
 
     <!-- Upload Messages -->
-    <string name="max_file_size_exceeded">ملف كبير</string>
+    <string name="max_file_size_exceeded">تجاوز حجم الملف %1$d بايت الحد الأقصى لحجم التحميل وهو %2$d بايت</string>
 
     <!-- Socket status -->
-    <string name="status_connected">اتصال</string>
-    <string name="status_disconnected">قطع الاتصال</string>
+    <string name="status_connected">متصل</string>
+    <string name="status_disconnected">غير متصل</string>
     <string name="status_connecting">يتم الاتصال</string>
-    <string name="status_authenticating">المصادقة</string>
+    <string name="status_authenticating">يتم المصادقة</string>
     <string name="status_disconnecting">يتم قطع الاتصال</string>
-    <string name="status_waiting">متصل في %d ثانية</string>
+    <string name="status_waiting">يتم الاتصال في %d ثانية</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">تنبيه كل من في الغرفة</string>
     <string name="suggest_here_description">تنبيه الأعضاء المتصلين</string>
 
@@ -295,10 +312,10 @@
     <string name="Slash_TableUnflip_Description">عرض ┬─┬ ノ( ゜-゜ノ)</string>
     <string name="Create_A_New_Channel">إنشاء قناة جديدة</string>
     <string name="Show_the_keyboard_shortcut_list">عرض اختصارات الكيبورد</string>
-    <string name="Invite_user_to_join_channel_all_from">دعوة أعضاء  [#channel] للانضمام لهذه المجموعة</string>
-    <string name="Invite_user_to_join_channel_all_to">دعوة أعضاء هذه المجموعة للانضمام ل [#channel]</string>
-    <string name="Archive">ارشيف</string>
-    <string name="Remove_someone_from_room">إوالة شخص من الغرفة</string>
+    <string name="Invite_user_to_join_channel_all_from">دعوة أعضاء [#channel] للانضمام لهذه القناة</string>
+    <string name="Invite_user_to_join_channel_all_to">دعوة أعضاء هذه القناة للانضمام ل [#channel]</string>
+    <string name="Archive">أرشيف</string>
+    <string name="Remove_someone_from_room">إزالة شخص من الغرفة</string>
     <string name="Leave_the_current_channel">مغادرة القناة الحالية</string>
     <string name="Displays_action_text">عرض نص الاجراء</string>
     <string name="Direct_message_someone">رسالة مباشرة</string>
@@ -308,44 +325,48 @@
     <string name="Unarchive">حذف من الأرشيف</string>
     <string name="Join_the_given_channel">الانضمام للقناة المعطاه</string>
     <string name="Guggy_Command_Description">صنع gif بناءا على النص المعطى</string>
-    <string name="Slash_Topic_Description">وضع الموضوع</string>
+    <string name="Slash_Topic_Description">تعيين الموضوع</string>
 
-    <!-- Emoji message-->
-    <string name="msg_no_recent_emoji">لا يوجد ايموجيز </string>
-    <string name="alert_title_default_skin_tone">نغمة الجلد الافتراضية</string>
+    <!-- Emoji messages -->
+    <string name="msg_no_recent_emoji">لا يوجد ايموجيز</string>
+    <string name="alert_title_default_skin_tone">لون البشرة الافتراضي</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">ترتيب</string>
-    <string name="dialog_sort_title">ترتيب حسب</string>
-    <string name="dialog_sort_by_alphabet">أبجدي</string>
-    <string name="dialog_sort_by_activity">النشاط</string>
-    <string name="dialog_group_by_type">تجميع حسب النوع</string>
-    <string name="dialog_group_favourites">تجميع المفصلات</string>
-    <string name="chatroom_header">العناوين</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">ترتيب حسب %1$s</string>
+    <string name="msg_sort_by">ترتيب حسب</string>
+    <string name="msg_sort_by_activity">النشاط</string>
+    <string name="msg_sort_by_name">الاسم</string>
+    <string name="msg_group_by_unread_on_top">غير مقروء على القمة</string>
+    <string name="msg_group_by_type">تجميع حسب النوع</string>
+    <string name="msg_group_by_favorites">تجميع حسب المفضلات</string>
 
-    <!--ChatRooms Headers-->
-    <string name="header_favorite">Favorites</string> <!-- TODO Translate -->
-    <string name="header_channel">القنوات</string>
+    <!-- ChatRooms Headers -->
+    <string name="header_favorite">المفضلات</string>
+    <string name="msg_channels">القنوات</string>
+    <string name="msg_users">المستخدمين</string>
+    <string name="msg_search_for_global_users">البحث عن المستخدمين عالميا</string>
+    <string name="msg_search_for_global_users_description">إذا قمت بالتشغيل، يمكنك البحث عن أي مستخدم من شركات أو خوادم أخرى.</string>
     <string name="header_private_groups">المجموعات الخاصة</string>
     <string name="header_direct_messages">الرسائل المباشرة</string>
-    <string name="header_live_chats">محادثات حية</string>
+    <string name="header_live_chats">المحادثات الحية</string>
     <string name="header_unknown">غير معروف</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">تعديل الرسالة المنشورة</string>
     <string name="notif_action_reply_hint">رد</string>
-    <string name="notif_error_sending">فشل الرد حاول مرة أخرى</string>
+    <string name="notif_error_sending">فشل الرد، حاول مرة أخرى</string>
     <string name="notif_success_sending">تم إرسال الرسالة ل %1$s!</string>
     <string name="read_by">تمت القراءة بواسطة</string>
     <string name="message_information_title">معلومات الرسالة</string>
     <string name="message_room_changed_privacy">تم تغيير نوع الغرفة ل: %1$s بواسطة %2$s</string>
 
     <!-- User Details -->
-    <string name="timezone">المنظقة الزمنية</string>
-    <string name="status" translatable="false">Status</string>
+    <string name="timezone">المنطقة الزمنية</string>
+    <string name="status">الوضع: %1$s</string>
+    <string name="user_detail_status">الوضع</string>
 
     <!-- Report -->
     <string name="submit">تأكيد</string>
     <string name="required">*مطلوب</string>
     <string name="report_sent">تم إرسال تقريرك!</string>
-</resources>
\ No newline at end of file
+</resources>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
index 5e9b53ab83..184f2c041d 100644
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -3,40 +3,37 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Anmelden am Server</string>
     <string name="title_log_in">Anmelden</string>
-    <string name="title_share_the_app">App teilen</string>
     <string name="title_register_username">Registriere Benutzernamen</string>
     <string name="title_reset_password">Passwort zurücksetzen</string>
     <string name="title_sign_up">registrieren</string>
     <string name="title_authentication">Login Daten prüfen</string>
     <string name="title_legal_terms">Legal Terms</string>
     <string name="title_chats">Chats</string>
+    <string name="title_choose_language">Sprache wählen</string>
     <string name="title_profile">Profil</string>
     <string name="title_members">Benutzer</string>
     <string name="title_counted_members">Benutzer (%d)</string>
     <string name="title_settings">Einstellungen</string>
-
     <string name="title_preferences">Eigenschaften</string>
     <string name="title_change_password">Ändere Passwort</string>
     <string name="title_rate_us">Bewerten Sie uns</string>
     <string name="title_admin_panel">Administrationsmenü</string>
-
     <string name="title_password">Ändere Passwort</string>
     <string name="title_update_profile">Update Profil</string>
-    <string name="title_about">Über</string>
     <string name="title_create_channel">Erstelle Raum</string>
-
     <string name="title_are_you_sure">Sind Sie sicher?</string>
     <string name="title_channel_details">Channel-Details</string>
     <string name="title_topic">Thema</string>
     <string name="title_announcement">Ankündigung</string>
     <string name="title_description">Beschreibung</string>
-    <string name="title_licence">Lizenz</string>
+    <string name="title_license">Lizenz</string>
 
     <!-- Actions -->
     <string name="action_connect">Verbinde</string>
     <string name="action_use_this_username">Benutze den Benutzernamen</string>
     <string name="action_terms_of_service">Nutzungsbedingungen</string>
     <string name="action_privacy_policy">Datenschutz</string>
+    <string name="action_new_channel">Neuer Kanal</string>
     <string name="action_search">Suche</string>
     <string name="action_update">Updaten</string>
     <string name="action_settings">Einstellungen</string>
@@ -46,11 +43,10 @@
     <string name="action_attach_a_files">Eine Datei anhängen</string>
     <string name="action_confirm_password">Bestätige Passwort Änderung</string>
     <string name="action_join_chat">Trete Chat bei</string>
-    <string name="action_add_account">Erstelle Account</string>
-    <string name="action_online">Online</string>
-    <string name="action_away">Abwesend</string>
-    <string name="action_busy">Beschäftigt</string>
-    <string name="action_invisible">Unsichtbar</string>
+    <string name="msg_online">Online</string>
+    <string name="msg_away">Abwesend</string>
+    <string name="msg_busy">Beschäftigt</string>
+    <string name="msg_invisible">Unsichtbar</string>
     <string name="action_drawing">Zeichnung</string>
     <string name="action_save_to_gallery">Sichern in Galerie</string>
     <string name="action_select_photo_from_gallery">Foto aus der Galerie auswählen</string>
@@ -61,20 +57,43 @@
     <string name="action_create_server">Einen eigenen Server erstellen</string>
     <string name="action_register">Registrieren</string>
     <string name="action_confirm">Bestätigen</string>
-    <string name="action_delete_account">Konto löschen</string>
-    <string name="action_favorite">Favoriten</string> 
-    <string name="action_remove_favorite">Favoriten entfernen</string> 
-
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">Eigenschaften</item>
-        <item name="item_password">Passwort ändern</item>
-        <item name="change_language">Sprache ändern</item>
-        <item name="item_share_app">Link zur App teilen</item>
-        <item name="item_rate_us">Bewerten Sie uns</item>
-        <item name="item_contact_us">Kontaktieren Sie uns</item>
-        <item name="item_licence">Lizenz</item>
-        <item name="item_about">Über</item>
+    <string name="action_favorite">Favoriten</string>
+    <string name="action_remove_favorite">Favoriten entfernen</string>
+
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Kontaktiere uns</string>
+    <string name="msg_language">Sprache</string>
+    <string name="msg_review_this_app">Bewerte diese App</string>
+    <string name="msg_share_this_app">Teile diese App</string>
+    <string name="msg_administration">Administration</string>
+    <string name="msg_license">Lizenz</string>
+    <string name="msg_app_version">Version: %1$s (%2$d)</string>
+    <string name="msg_server_version">Serverversion: %1$s</string>
+    <string name="msg_send_analytics">Analysesaten senden</string>
+    <string name="msg_send_analytics_tracking">Anonyme Statistiken senden um diese App weiter zu verbessern</string>
+    <string name="msg_do_not_send_analytics_tracking">KEINE anonymen Statistiken senden um diese App weiter zu verbessern</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Nicht anwendbar, da es sich um eine FOSS version handelt</string>
+    <string name="msg_logout_from_rocket_chat">Logout von Rocket.Chat</string>
+    <string name="msg_delete_account">Konto löschen</string>
+    <string name="msg_change_status">Status ändern</string>
+
+    <string-array name="languages">
+        <item>Englisch</item>
+        <item>Arabisch</item>
+        <item>Deutsch</item>
+        <item>Spanisch</item>
+        <item>Persisch</item>
+        <item>Französisch</item>
+        <item>Hindi (IN)</item>
+        <item>Italienisch</item>
+        <item>Japanisch</item>
+        <item>Portugiesisch (BR)</item>
+        <item>Portugiesisch (PT)</item>
+        <item>Russisch (RU)</item>
+        <item>Türkisch</item>
+        <item>Ukrainisch</item>
+        <item>Chinesisch (CN)</item>
+        <item>Chinesisch (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -82,7 +101,7 @@
     <string name="msg_no_data_to_display">Keine Anzeigedaten vorhanden</string>
     <string name="msg_check_this_out">Schau dir das an</string>
     <string name="msg_share_using">Teilen Sie mit</string>
-    <string name="msg_profile_update_successfully">Profil update erfolgreich</string>
+    <string name="msg_profile_updated_successfully">Profil update erfolgreich</string>
     <string name="msg_username">Benutzername</string>
     <string name="msg_username_or_email">Benutzername oder E-Mail</string>
     <string name="msg_password">Passwort</string>
@@ -91,7 +110,7 @@
     <string name="msg_avatar_url">Avatar URL</string>
     <string name="msg_or_continue_using_social_accounts">Oder weiter mit einem Social Account</string>
     <string name="msg_new_user">Neuer Benutzer? %1$s</string>
-    <string name="msg_forgot__your_password">Passwort vergessen?</string>
+    <string name="msg_forgot_your_password">Passwort vergessen?</string>
     <string name="msg_reset">Zurücksetzen</string>
     <string name="msg_check_your_email_to_reset_your_password">E-Mail gesendet! Prüfe dein E-Mail Posteingang um dein Passwort zurückzusetzen.</string>
     <string name="msg_invalid_email">Bitte eine korrekte E-Mail Adresse eingeben</string>
@@ -106,17 +125,15 @@
     <string name="msg_invalid_file">Falsche Datei</string>
     <string name="msg_invalid_server_url">Falsche Server URL</string>
     <string name="msg_content_description_log_in_using_facebook">Login mit Facebook</string>
-    <string name="msg_content_description_log_in_using_github">Login mit Github</string>
+    <string name="msg_content_description_log_in_using_github">Login mit GitHub</string>
     <string name="msg_content_description_log_in_using_google">Login mit Google</string>
-    <string name="msg_content_description_log_in_using_linkedin">Login mit Linkedin</string>
+    <string name="msg_content_description_log_in_using_linkedin">Login mit LinkedIn</string>
     <string name="msg_content_description_log_in_using_meteor">Login mit Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Login mit Twitter</string>
-    <string name="msg_content_description_log_in_using_gitlab">Login mit Gitlab</string>
+    <string name="msg_content_description_log_in_using_gitlab">Login mit GitLab</string>
     <string name="msg_content_description_log_in_using_wordpress">Login mit WordPress</string>
     <string name="msg_content_description_send_message">Sende Nachricht</string>
-
     <string name="msg_content_description_show_more_login_options">Zeige mehr Login-Optionen</string>
-
     <string name="msg_content_description_show_attachment_options">Zeige Anhang Optionen</string>
     <string name="msg_you">Du</string>
     <string name="msg_unknown">Unbekannt</string>
@@ -160,13 +177,13 @@
     <string name="msg_login_with_email">Mit <b>e-mail</b> einloggen</string>
     <string name="msg_create_account">Einen Account erstellen</string>
     <string name="msg_continue_with_facebook">Mit <b>Facebook</b> einloggen</string>
-    <string name="msg_continue_with_github">Mit <b>Github</b> einloggen</string>
+    <string name="msg_continue_with_github">Mit <b>GitHub</b> einloggen</string>
     <string name="msg_continue_with_google">Mit <b>Google</b> einloggen</string>
-    <string name="msg_continue_with_linkedin">Mit <b>Linkedin</b> einloggen</string>
+    <string name="msg_continue_with_linkedin">Mit <b>LinkedIn</b> einloggen</string>
     <string name="msg_continue_with_gitlab">Mit <b>GitLab</b> einloggen</string>
     <string name="msg_continue_with_wordpress">Mit <b>WordPress</b> einloggen</string>
     <string name="msg_two_factor_authentication">Zwei-Faktor-Authentifizierung</string>
-    <string name="msg__your_2fa_code">Wie lautet Ihr F2A Code?</string>
+    <string name="msg_your_2fa_code">Wie lautet Ihr F2A Code?</string>
     <string name="msg_muted_on_this_channel">Sie sind auf diesem Kanal stummgeschaltet</string>
     <string name="msg_no_topic">Keine Überschrift</string>
     <string name="msg_no_announcement">Keine Ankündigung</string>
@@ -178,14 +195,18 @@
         <item quantity="other">%1$s reagierte mit %2$s</item>
     </plurals>
     <string name="msg_credentials_saved_successfully">Login-Daten erfolgreich gespeichert</string>
-
+    <string name="msg_camera_permission_denied">Zum Öffnen der Kamera ist eine Kamera-Berechtigung erforderlich.</string>
+    <string name="msg_storage_permission_denied">Zum Öffnen der Zeichnung ist eine Speicher-Berechtigung erforderlich.</string>
+    <string name="msg_server">Server</string>
+    <string name="msg_add_new_server">Neuen Server hinzufügen</string>
+    <string name="msg_directory">Verzeichnis</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privat</string>
     <string name="msg_public_channel">Öffentlich</string>
     <string name="msg_private_channel_description">Nur Sie und eingeladene Benutzer haben Zugriff auf den Raum</string>
     <string name="msg_public_channel_description">Jeder hat Zugriff auf diesen Raum</string>
-    <string name="msg_ready_only_channel">Nur lesen Raum</string>
+    <string name="msg_ready_only_channel">Nur lesend</string>
     <string name="msg_ready_only_channel_description">Nur der Admin kann neue Nachrichten schreiben</string>
     <string name="msg_invite_members">Lade Benutzer in diesen Raum ein</string>
     <string name="msg_member_already_added">Sie haben diesen Benutzer bereits selektiert</string>
@@ -201,13 +222,6 @@
     <string name="msg_send_email">E-Mail senden</string>
     <string name="msg_android_app_support">Android App-Unterstützung</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Daten für Analysezwecke</string>
-    <string name="msg_send_analytics_tracking">Anonyme Statistiken senden um diese App weiter zu verbessern</string>
-    <string name="msg_do_not_send_analytics_tracking">KEINE anonymen Statistiken senden um diese App weiter zu verbessern</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Nicht anwendbar, da es sich um eine FOSS version handelt</string>
-
-
     <!-- System messages -->
     <string name="message_room_name_changed">Raum Namen geändert zu: %1$s von %2$s</string>
     <string name="message_user_added_by">Benutzer %1$s hinzugefügt von %2$s</string>
@@ -225,19 +239,19 @@
 
     <!-- Message actions -->
     <string name="action_msg_reply">Antworten</string>
-    <string name="action_info">Info</string> <!-- TODO Add translation -->
+    <string name="action_info">Info</string>
     <string name="action_msg_edit">Bearbeiten</string>
     <string name="action_msg_copy">Kopieren</string>
     <string name="action_msg_quote">Zitieren</string>
     <string name="action_msg_delete">Löschen</string>
-    <string name="action_pin">Pin</string> <!-- TODO Add translation -->
-    <string name="action_unpin">Unpin</string> <!-- TODO Add translation -->
-    <string name="action_star">Star</string> <!-- TODO Add translation -->
-    <string name="action_unstar">Unstar</string> <!-- TODO Add translation -->
+    <string name="action_pin">Anheften</string>
+    <string name="action_unpin">Nicht anheften</string>
+    <string name="action_star">Favorisieren</string>
+    <string name="action_unstar">Nicht favorisieren</string>
     <string name="action_msg_share">Teilen</string>
     <string name="action_title_editing">Nachricht bearbeiten</string>
     <string name="action_msg_add_reaction">Reaktion hinzufügen</string>
-    <string name="action_msg_permalink">Permalink</string> <!-- TODO Add translation -->
+    <string name="action_msg_permalink">Permalink</string>
     <string name="action_msg_report">Bericht</string>
 
     <!-- Permission messages -->
@@ -284,7 +298,7 @@
     <string name="status_disconnecting">Trenne</string>
     <string name="status_waiting">Verbinde in %d Sekunden</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Benachrichtige alle in diesem Raum</string>
     <string name="suggest_here_description">Benachrichtige aktive Benutzer in diesem Raum</string>
 
@@ -311,28 +325,31 @@
     <string name="Guggy_Command_Description">Erstelle ein Gif, basierend auf den eingegebenen Text</string>
     <string name="Slash_Topic_Description">Setze Topic</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Keine letzten Emojis</string>
     <string name="alert_title_default_skin_tone">Standard Hautton</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">Sortiere</string>
-    <string name="dialog_sort_title">Sortieren nach</string>
-    <string name="dialog_sort_by_alphabet">Alphabetisch</string>
-    <string name="dialog_sort_by_activity">Aktivität</string>
-    <string name="dialog_group_by_type">Räume nach Typ</string>
-    <string name="dialog_group_favourites">Räume nach Favoriten</string>
-    <string name="chatroom_header">Kopf</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sortiere nach %1$s</string>
+    <string name="msg_sort_by">Sortiert nach</string>
+    <string name="msg_sort_by_activity">Aktivität</string>
+    <string name="msg_sort_by_name">Name</string>
+    <string name="msg_group_by_unread_on_top">Ungelesen oben</string>
+    <string name="msg_group_by_type">Gruppieren nach Typ</string>
+    <string name="msg_group_by_favorites">Gruppieren nach Favoriten</string>
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoriten</string>
-    <string name="header_channel">Räume</string>
+    <string name="msg_channels">Räume</string>
+    <string name="msg_users">Benutzer</string>
+    <string name="msg_search_for_global_users">Suche nach globalen Benutzern</string>
+    <string name="msg_search_for_global_users_description">Wenn Sie dies einschalten, können Sie nach Benutzern von anderen Unternehmen oder Servern suchen.</string>
     <string name="header_private_groups">Private Räume</string>
     <string name="header_direct_messages">Direkt Nachrichten</string>
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Unbekannt</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Bearbeite geteilte Nachricht</string>
     <string name="notif_action_reply_hint">Antworten</string>
     <string name="notif_error_sending">Antworten fehlgeschlagen. Bitte versuchen Sie es noch einmal.</string>
@@ -343,7 +360,8 @@
 
     <!-- User Details -->
     <string name="timezone">Zeitzone</string>
-
+    <string name="status">Status: %1$s</string>
+    <string name="user_detail_status">Status</string>
     <!-- Report -->
     <string name="submit">Senden</string>
     <string name="required">*erforderlich</string>
diff --git a/app/src/main/res/values-es/strings.xml b/app/src/main/res/values-es/strings.xml
index 004910abcd..c37d26129c 100644
--- a/app/src/main/res/values-es/strings.xml
+++ b/app/src/main/res/values-es/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Inicia sesión en tu servidor</string>
     <string name="title_log_in">Iniciar sesión</string>
-    <string name="title_share_the_app">Compartir aplicación</string>
     <string name="title_register_username">Registrar nombre de usuario</string>
     <string name="title_reset_password">Restablecer la contraseña</string>
     <string name="title_sign_up">Regístrate</string>
@@ -20,9 +19,9 @@
     <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
     <string name="title_password">Cambia la contraseña</string>
     <string name="title_update_profile">Actualización del perfil</string>
-    <string name="title_about">Acerca de</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_create_channel">Crear canal</string>
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
+    <string name="title_license">License</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
     <string name="title_topic">Tema</string>
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">Usa este nombre de usuario</string>
     <string name="action_terms_of_service">Términos de Servicio</string>
     <string name="action_privacy_policy">Política de Privacidad</string>
+    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
     <string name="action_search">Buscar</string>
     <string name="action_update">Actualizar</string>
     <string name="action_settings">Configuraciones</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">Attach a file</string> <!-- TODO Add translation -->
     <string name="action_confirm_password">Confirmar cambio de contraseña</string>
     <string name="action_join_chat">Unirse al chat</string>
-    <string name="action_add_account">Añadir cuenta</string>
-    <string name="action_online">Conectado(s)</string>
-    <string name="action_away">Ausente</string>
-    <string name="action_busy">Ocupado</string>
-    <string name="action_invisible">Invisible</string>
+    <string name="msg_online">Conectado(s)</string>
+    <string name="msg_away">Ausente</string>
+    <string name="msg_busy">Ocupado</string>
+    <string name="msg_invisible">Invisible</string>
     <string name="action_drawing">Dibujo</string>
     <string name="action_save_to_gallery">Guardar en la galería</string>
     <string name="action_select_photo_from_gallery">Select photo from gallery</string> <!-- TODO Add translation -->
@@ -58,20 +57,43 @@
     <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
     <string name="action_register">Register</string> <!-- TODO Add translation -->
     <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
-    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
     <string name="action_favorite">Favorite</string> <!-- TODO Add translation -->
     <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Add translation -->
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="change_language">Change language</item> <!-- TODO Add translation -->
-        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
-        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
-        <item name="item_about">About</item> <!-- TODO Add translation -->
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">Envía estadísticas anónimas para ayudar a mejorar esta aplicación</string>
+    <string name="msg_do_not_send_analytics_tracking">No envíe estadísticas anónimas para ayudar a mejorar esta aplicación</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">No aplica ya que es una versión FOSS</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
+
+    <string-array name="languages"> <!-- TODO Add translations -->
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -79,7 +101,7 @@
     <string name="msg_no_data_to_display">No hay información para mostrar</string>
     <string name="msg_check_this_out">Mira esto</string>
     <string name="msg_share_using">Compartir usando</string>
-    <string name="msg_profile_update_successfully">Actualización de perfil con éxito</string>
+    <string name="msg_profile_updated_successfully">Actualización de perfil con éxito</string>
     <string name="msg_username">usuario</string>
     <string name="msg_username_or_email">Nombre de usuario o correo electrónico</string>
     <string name="msg_password">Contraseña</string>
@@ -88,7 +110,7 @@
     <string name="msg_avatar_url">URL del avatar</string>
     <string name="msg_or_continue_using_social_accounts">O continuar usando cuentas sociales</string>
     <string name="msg_new_user">Nuevo usuario? %1$s</string>
-    <string name="msg_forgot__your_password">Se te olvidó tu contraseña?</string>
+    <string name="msg_forgot_your_password">Se te olvidó tu contraseña?</string>
     <string name="msg_reset">reiniciar</string>
     <string name="msg_check_your_email_to_reset_your_password">¡Email enviado! Verifique su bandeja de entrada para restablecer su contraseña.</string>
     <string name="msg_invalid_email">Por favor escriba un correo electrónico válido</string>
@@ -103,12 +125,12 @@
     <string name="msg_invalid_file">Archivo inválido</string>
     <string name="msg_invalid_server_url">URL del servidor inválido</string>
     <string name="msg_content_description_log_in_using_facebook">Inicia sesión usando Facebook</string>
-    <string name="msg_content_description_log_in_using_github">Inicia sesión usando Github</string>
+    <string name="msg_content_description_log_in_using_github">Inicia sesión usando GitHub</string>
     <string name="msg_content_description_log_in_using_google">Inicia sesión usando Google</string>
-    <string name="msg_content_description_log_in_using_linkedin">Inicia sesión usando Linkedin</string>
+    <string name="msg_content_description_log_in_using_linkedin">Inicia sesión usando LinkedIn</string>
     <string name="msg_content_description_log_in_using_meteor">Inicia sesión usando Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Inicia sesión usando Twitter</string>
-    <string name="msg_content_description_log_in_using_gitlab">Inicia sesión usando Gitlab</string>
+    <string name="msg_content_description_log_in_using_gitlab">Inicia sesión usando GitLab</string>
     <string name="msg_content_description_log_in_using_wordpress">Inicia sesión usando WordPress</string>
     <string name="msg_content_description_send_message">Enviar mensaje</string>
     <string name="msg_content_description_show_more_login_options">Show more login options</string> <!-- TODO Translate-->
@@ -148,20 +170,23 @@
     <string name="msg_search">Buscar</string>
     <string name="msg_message_copied">Mensaje copiado</string>
     <string name="msg_delete_message">Borrar mensaje</string>
-    <string name="msg_delete_description">Seguro que quieres borrar este mensaje</string>
+    <string name="msg_delete_description">¿Seguro que quieres borrar este mensaje?</string>
     <string name="msg_no_search_found">No se han encontrado resultados</string>
     <string name="msg_welcome_to_rocket_chat">Welcome to Rocket.Chat</string> <!-- TODO Add translation -->
     <string name="msg_team_communication">Team Communication</string> <!-- TODO Translate -->
     <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
     <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
     <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_github">Continue with <b>Github</b></string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_github">Continue with <b>GitHub</b></string> <!-- TODO Add translation -->
     <string name="msg_continue_with_google">Continue with <b>Google</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_linkedin">Continue with <b>LinkedIn</b></string> <!-- TODO Add translation -->
     <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string> <!-- TODO Add translation -->
     <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
     <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
-    <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
+    <string name="msg_your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
+    <string name="msg_server">Server</string> <!-- TODO Translate -->
+    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
+    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>
@@ -190,12 +215,8 @@
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
     </plurals>
     <string name="msg_credentials_saved_successfully">Credenciales guardadas con éxito</string>
-
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string> <!-- TODO Add translation -->
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string> <!-- TODO Add translation -->
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string> <!-- TODO Add translation -->
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
 
     <!-- System messages -->
     <string name="message_room_name_changed">Nombre de la sala cambiado para: %1$s por %2$s</string>
@@ -227,8 +248,7 @@
     <string name="action_title_editing">Edición de mensaje</string>
     <string name="action_msg_add_reaction">Añadir una reacción</string>
     <string name="action_msg_permalink">Permalink</string> <!-- TODO Add translation -->
-    <!-- TODO - Add proper translation -->
-    <string name="action_msg_report">Report</string>
+    <string name="action_msg_report">Report</string> <!-- TODO Add translation -->
 
     <!-- Permission messages -->
     <string name="permission_editing_not_allowed">La edición no és permitida</string>
@@ -275,7 +295,7 @@
     <string name="status_disconnecting">Desconectando</string>
     <string name="status_waiting">Conectando en %d segundos</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notificar a todos en esta sala</string>
     <string name="suggest_here_description">Notificar usuarios activos en esta sala</string>
 
@@ -302,28 +322,31 @@
     <string name="Guggy_Command_Description">Genera un gif basado en el texto proporcionado</string>
     <string name="Slash_Topic_Description">Establecer tema</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Sin emojis recientes</string>
     <string name="alert_title_default_skin_tone">Tono de piel predeterminado</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">Ordenar</string>
-    <string name="dialog_sort_title">Ordenar por</string>
-    <string name="dialog_sort_by_alphabet">Alfabético</string>
-    <string name="dialog_sort_by_activity">Actividad</string>
-    <string name="dialog_group_by_type">Agrupar por tipo</string>
-    <string name="dialog_group_favourites">Agrupar favoritos</string>
-    <string name="chatroom_header">Cabezazo</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
+    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
+    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
+    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
+    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
-    <string name="header_channel">Canales</string>
+    <string name="msg_channels">Canales</string>
+    <string name="msg_users">Users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Grupos privados</string>
     <string name="header_direct_messages">Mensajes directos</string>
     <string name="header_live_chats">Chats en vivo</string>
     <string name="header_unknown">Desconocido</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Edita mensaje compartido</string>
     <string name="notif_action_reply_hint">RESPUESTA</string>
     <string name="notif_error_sending">La respuesta ha fallado. Inténtalo de nuevo.</string>
@@ -339,6 +362,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string> <!-- TODO - Add proper translation -->
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
diff --git a/app/src/main/res/values-fa/strings.xml b/app/src/main/res/values-fa/strings.xml
index f28ddd0858..64890f4844 100644
--- a/app/src/main/res/values-fa/strings.xml
+++ b/app/src/main/res/values-fa/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">به سرور خود متصل شوید</string>
     <string name="title_log_in">ورود</string>
-    <string name="title_share_the_app">به اشتراک‌گذاری اپلیکیشن</string>
     <string name="title_register_username">ثبت شناسه‌ی کاربری</string>
     <string name="title_reset_password">تعویض گذرواژه</string>
     <string name="title_sign_up">ثبت‌‌نام کنید</string>
@@ -19,10 +18,10 @@
     <string name="title_rate_us">به ما امتیاز دهید</string>
     <string name="title_admin_panel">Admin panel</string> <!-- TODO Add translation -->
     <string name="title_password">تغییر گذرواژه</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_update_profile">به روزرسانی نمایه</string>
-    <string name="title_about">درباره</string>
     <string name="title_create_channel">ایجاد کانال</string>
-    <string name="title_licence">مجوز</string>
+    <string name="title_license">مجوز</string>
     <string name="title_are_you_sure">آیا مطمئن هستید؟</string>
     <string name="title_channel_details">جزئیات کانال</string>
     <string name="title_topic">موضوع</string>
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">از این شناسه‌ی کاربری استفاده کنید</string>
     <string name="action_terms_of_service">شرایط خدمات رسانی</string>
     <string name="action_privacy_policy">سیاست حفظ جریم خصوصی</string>
+    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
     <string name="action_search">جست‌وجو</string>
     <string name="action_update">به روزرسانی</string>
     <string name="action_settings">تنظیمات</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">ضمیمه کردن پرونده</string>
     <string name="action_confirm_password">موافقت با تغییر گذرواژه</string>
     <string name="action_join_chat">به گفت‌وگو بپیوندید</string>
-    <string name="action_add_account">اضافه کردن حساب کاربری</string>
-    <string name="action_online">آنلاین</string>
-    <string name="action_away">Away</string> <!-- TODO Add translation -->
-    <string name="action_busy">مشغول</string>
-    <string name="action_invisible">نامرئی</string>
+    <string name="msg_online">آنلاین</string>
+    <string name="msg_away">Away</string> <!-- TODO Add translation -->
+    <string name="msg_busy">مشغول</string>
+    <string name="msg_invisible">نامرئی</string>
     <string name="action_drawing">کشیدن</string>
     <string name="action_save_to_gallery">ذخیره در آلبوم</string>
     <string name="action_select_photo_from_gallery">انتخاب عکس از آلبوم</string>
@@ -58,20 +57,43 @@
     <string name="action_create_server">ایجاد سرور جدید</string>
     <string name="action_register">ثبت‌نام</string>
     <string name="action_confirm">تایید</string>
-    <string name="action_delete_account">حذف حساب کاربری</string>
     <string name="action_favorite">Favorite</string> <!-- TODO Add translation -->
     <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Add translation -->
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">ترجیحات</item>
-        <item name="item_password">تغییر گذرواژه</item>
-        <item name="item_share_app">به اشتراک‌گذاری اپلیکیشن</item>
-        <item name="change_language">Change language</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">به ما امتیاز دهید</item>
-        <item name="item_contact_us">تماس با ما</item>
-        <item name="item_licence">مجوز</item>
-        <item name="item_about">درباره</item>
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">برای بهبود این کاره آمار ناشناس بفرستید</string>
+    <string name="msg_do_not_send_analytics_tracking">برای بهبود این کاره آمار ناشناس نفرستید</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">قابل اجرا نیست زیرا نسخه‌ی FOSS است</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
+
+    <string-array name="languages"> <!-- TODO Add translations -->
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -79,7 +101,7 @@
     <string name="msg_no_data_to_display">اطلاعاتی برای نمایش وجود نداد</string>
     <string name="msg_check_this_out">اینجا را ببینید</string>
     <string name="msg_share_using">تغییر کاربری</string>
-    <string name="msg_profile_update_successfully">نمایه با موفقیت به روزرسانی شد</string>
+    <string name="msg_profile_updated_successfully">نمایه با موفقیت به روزرسانی شد</string>
     <string name="msg_username">شناسه‌ی کاربری</string>
     <string name="msg_username_or_email">حساب‌کاربری یا ایمیل</string>
     <string name="msg_password">گذرواژه</string>
@@ -87,8 +109,8 @@
     <string name="msg_email">ایمیل</string>
     <string name="msg_avatar_url">URL تصویر نمایه</string>
     <string name="msg_or_continue_using_social_accounts">یا به استفاده از سرورهای اجتماعی ادامه دهید</string>
-    <string name="msg_new_user">%1$s کاربر جدید?</string>
-    <string name="msg_forgot__your_password">گذرواژه‌تان را فراموش کردید؟</string>
+    <string name="msg_new_user">%1$s کاربر جدید؟</string>
+    <string name="msg_forgot_your_password">گذرواژه‌تان را فراموش کردید؟</string>
     <string name="msg_reset">راه اندازی مجدد</string>
     <string name="msg_check_your_email_to_reset_your_password">ایمیل فرستاده شد. صندوق ورودی خود را برای تعویض گذرواژه چک کنید</string>
     <string name="msg_invalid_email">لطفا یک ایمیل معتبر را بنویسید</string>
@@ -163,8 +185,8 @@
     <string name="msg_continue_with_gitlab">ادامه دادن با <b>گیت‌لب</b></string>
     <string name="msg_continue_with_wordpress">ادامه دادن با <b>وردپرس</b></string>
     <string name="msg_two_factor_authentication">تایید هویت دو فاکتوره</string>
-	<string name="msg__your_2fa_code">کد 2FA تان چیست؟</string>
-	<string name="msg_permalink_copied">پیوند کپی شد</string>
+    <string name="msg_your_2fa_code">کد 2FA تان چیست؟</string>
+    <string name="msg_permalink_copied">پیوند کپی شد</string>
     <string name="msg_no_topic">No topic</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement</string> <!-- TODO Add translation -->
     <string name="msg_no_description">No description</string> <!-- TODO Add translation -->
@@ -177,6 +199,11 @@
         <item quantity="other">%1$s reacted with %2$s</item>
     </plurals> <!-- TODO Add translation -->
     <string name="msg_credentials_saved_successfully">اختیارها با موفقیت ذخیره شد</string>
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
+    <string name="msg_server">Server</string> <!-- TODO Translate -->
+    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
+    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">خصوصی</string>
@@ -196,12 +223,6 @@
     <string name="msg_view_less">مشاهده‌ی کمتر</string>
     <string name="msg_muted_on_this_channel">آیا این کانال را بی‌صدا کردید؟</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">ردگیری تحلیلی</string>
-    <string name="msg_send_analytics_tracking">برای بهبود این کاره آمار ناشناس بفرستید</string>
-    <string name="msg_do_not_send_analytics_tracking">برای بهبود این کاره آمار ناشناس نفرستید</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">قابل اجرا نیست زیرا نسخه‌ی FOSS است</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">Room name changed to: %1$s by %2$s</string> <!-- TODO Add translation -->
     <string name="message_user_added_by">User %1$s added by %2$s</string> <!-- TODO Add translation -->
@@ -278,7 +299,7 @@
     <string name="status_disconnecting">درحال قطع شده</string>
     <string name="status_waiting">Connecting in %d seconds</string> <!-- TODO Add translation -->
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">به همه در این اتاق خبر بده</string>
     <string name="suggest_here_description">به کاربران فعال در این اتاق خبر بده</string>
 
@@ -305,28 +326,31 @@
     <string name="Guggy_Command_Description">ساخت یک gif بر اساس متن آماده‌شده</string>
     <string name="Slash_Topic_Description">تعیین موضوع</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">هیچ ایموجی اخیری موجود نیست</string>
     <string name="alert_title_default_skin_tone">مدل پوسته‌ی پیش‌فرض</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">دسته بندی</string>
-    <string name="dialog_sort_title">دسته بندی بر اساس</string>
-    <string name="dialog_sort_by_alphabet">الفبا</string>
-    <string name="dialog_sort_by_activity">فعالیت</string>
-    <string name="dialog_group_by_type">گروه کردن بر اساس نوع</string>
-    <string name="dialog_group_favourites">گروه کردن موردعلاقه‌ها</string>
-    <string name="chatroom_header">سرپیام</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
+    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
+    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
+    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
+    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
-    <string name="header_channel">کانال‌ها</string>
+    <string name="msg_channels">کانال‌ها</string>
+    <string name="msg_users">Users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">گروه‌های خصوصی</string>
     <string name="header_direct_messages">پیام‌های خصوصی</string>
     <string name="header_live_chats">گفت‌وگوهای زنده</string>
     <string name="header_unknown">ناشناس</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">ویراش پیام به اشتراک گذاشته شده</string>
     <string name="notif_action_reply_hint">جواب دادن</string>
     <string name="notif_error_sending">جواب با شکست مواجه شد. لطفا دوباره تلاش کنید.</string>
@@ -336,7 +360,9 @@
     <string name="message_room_changed_privacy">Room type changed to: %1$s by %2$s</string> <!-- TODO Add translation -->
 
     <!-- User Details -->
-    <string name="timezone">منطقه‌ی زمانی</string>
+    <string name="timezone">منطقه‌ زمانی</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">واگذاری</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
index cb271bdf19..5693e604a1 100644
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Connectez-vous sur votre serveur</string>
     <string name="title_log_in">S\'identifier</string>
-    <string name="title_share_the_app">Partager l\'application</string>
     <string name="title_register_username">Enregistrer le nom d\'utilisateur</string>
     <string name="title_reset_password">Réinitialiser mot de passe</string>
     <string name="title_sign_up">S\'inscrire</string>
@@ -15,14 +14,14 @@
     <string name="title_counted_members">Membres (%d)</string>
     <string name="title_settings">Paramètres</string>
     <string name="title_preferences">Préférences</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_change_password">Changer le mot de passe</string>
     <string name="title_rate_us">évaluez nous</string>
     <string name="title_admin_panel">l\' administration</string>
     <string name="title_password">Changer le mot de passe</string>
     <string name="title_update_profile">Mettre à jour le profil</string>
-    <string name="title_about">À propos</string>
     <string name="title_create_channel">Créer salon</string>
-    <string name="title_licence">les permis</string>
+    <string name="title_license">les permis</string>
     <string name="title_are_you_sure">Êtes-vous sûr?</string>
     <string name="title_channel_details">Détails de la chaîne</string>
     <string name="title_topic">Sujet</string>
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">Utilisez ce nom d\'utilisateur</string>
     <string name="action_terms_of_service">Conditions d\'utilisation</string>
     <string name="action_privacy_policy">Politique de confidentialité</string>
+    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
     <string name="action_search">Chercher</string>
     <string name="action_update">Mettre à jour</string>
     <string name="action_settings">Paramètres</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">Joindre un fichier</string>
     <string name="action_confirm_password">Confirmer le mot de passe</string>
     <string name="action_join_chat">Rejoignez le chat</string>
-    <string name="action_add_account">Ajouter un compte</string>
-    <string name="action_online">En ligne</string>
-    <string name="action_away">Loin</string>
-    <string name="action_busy">Occupé</string>
-    <string name="action_invisible">Invisible</string>
+    <string name="msg_online">En ligne</string>
+    <string name="msg_away">Loin</string>
+    <string name="msg_busy">Occupé</string>
+    <string name="msg_invisible">Invisible</string>
     <string name="action_drawing">Dessin</string>
     <string name="action_save_to_gallery">Sauvegarder vers la gallerie</string>
     <string name="action_select_photo_from_gallery">Sélectionner depuis la gallerie</string>
@@ -58,20 +57,43 @@
     <string name="action_create_server">Créer un nouveau serveur</string>
     <string name="action_register">registre</string>
     <string name="action_confirm">Confirmer</string>
-    <string name="action_delete_account">Effacer le compte</string>
     <string name="action_favorite">Favorite</string> <!-- TODO Add translation -->
     <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Add translation -->
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">Préférences</item>
-        <item name="item_password">Changer le mot de passe</item>
-        <item name="change_language">Changer de langue</item>
-        <item name="item_share_app">Partager l\'application</item>
-        <item name="item_rate_us">Évaluez nous</item>
-        <item name="item_contact_us">Contactez nous</item>
-        <item name="item_licence">les permis</item>
-        <item name="item_about">Sur</item>
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">Envoyer des statistiques anonymes pour aider à l\'amélioration de l\'application</string>
+    <string name="msg_do_not_send_analytics_tracking">Ne pas envoyer des statistiques anonymes pour aider à l\'amélioration de l\'application</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Ne s\'applique pas étant donné qu\'il s\'agit d\'une version FOSS</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
+
+    <string-array name="languages"> <!-- TODO Add translations -->
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -79,7 +101,7 @@
     <string name="msg_no_data_to_display">Aucune donnée à afficher</string>
     <string name="msg_check_this_out">regarde ça</string>
     <string name="msg_share_using">Partager en utilisant</string>
-    <string name="msg_profile_update_successfully">Mise à jour du profil avec succès</string>
+    <string name="msg_profile_updated_successfully">Mise à jour du profil avec succès</string>
     <string name="msg_username">nom d\'utilisateur</string>
     <string name="msg_username_or_email">Nom d\'utilisateur ou email</string>
     <string name="msg_password">Mot de passe</string>
@@ -88,7 +110,7 @@
     <string name="msg_avatar_url">URL de l\'avatar</string>
     <string name="msg_or_continue_using_social_accounts">Ou continuer en utilisant les comptes sociaux</string>
     <string name="msg_new_user">Nouvel utilisateur? %1$s</string>
-    <string name="msg_forgot__your_password">Mot de passe oublié ? %1$s</string>
+    <string name="msg_forgot_your_password">Mot de passe oublié? %1$s</string>
     <string name="msg_reset">Réinitialiser</string>
     <string name="msg_check_your_email_to_reset_your_password">Email envoyé ! Consultez votre boîte mail pour réinitialiser votre mot de passe.</string>
     <string name="msg_invalid_email">Veuillez entrer une adresse valide</string>
@@ -103,12 +125,12 @@
     <string name="msg_invalid_file">Fichier non valide</string>
     <string name="msg_invalid_server_url">URL de serveur non valide</string>
     <string name="msg_content_description_log_in_using_facebook">Connectez-vous en utilisant Facebook</string>
-    <string name="msg_content_description_log_in_using_github">Connectez-vous en utilisant Github</string>
+    <string name="msg_content_description_log_in_using_github">Connectez-vous en utilisant GitHub</string>
     <string name="msg_content_description_log_in_using_google">Connectez-vous en utilisant Google</string>
-    <string name="msg_content_description_log_in_using_linkedin">Connectez-vous en utilisant Linkedin</string>
+    <string name="msg_content_description_log_in_using_linkedin">Connectez-vous en utilisant LinkedIn</string>
     <string name="msg_content_description_log_in_using_meteor">Connectez-vous en utilisant Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Connectez-vous en utilisant Twitter</string>
-    <string name="msg_content_description_log_in_using_gitlab">Connectez-vous en utilisant Gitlab</string>
+    <string name="msg_content_description_log_in_using_gitlab">Connectez-vous en utilisant GitLab</string>
     <string name="msg_content_description_log_in_using_wordpress">Connectez-vous en utilisant WordPress</string>
     <string name="msg_content_description_send_message">Envoyer message</string>
     <string name="msg_content_description_show_more_login_options">montrer plus d\'options le login</string>
@@ -152,19 +174,19 @@
     <string name="msg_file_description">Description du fichier</string>
     <string name="msg_send">envoyer</string>
     <string name="msg_delete_message">Supprimer Message</string>
-    <string name="msg_delete_description">Êtes-vous sûr de vouloir supprimer ce message</string>
+    <string name="msg_delete_description">Êtes-vous sûr de vouloir supprimer ce message?</string>
     <string name="msg_welcome_to_rocket_chat">Bienvenue à Rocket.Chat</string>
     <string name="msg_team_communication">Communication d\'équipe</string>
     <string name="msg_login_with_email">le login avec <b>e-mail</b></string>
     <string name="msg_create_account">Créer un compte</string>
     <string name="msg_continue_with_facebook">Continuer avec <b>Facebook</b></string>
-    <string name="msg_continue_with_github">Continuer avec <b>Github</b></string>
+    <string name="msg_continue_with_github">Continuer avec <b>GitHub</b></string>
     <string name="msg_continue_with_google">Continuer avec <b>Google</b></string>
-    <string name="msg_continue_with_linkedin">Continuer avec <b>Linkedin</b></string>
+    <string name="msg_continue_with_linkedin">Continuer avec <b>LinkedIn</b></string>
     <string name="msg_continue_with_gitlab">Continuer avec <b>GitLab</b></string>
     <string name="msg_continue_with_wordpress">Continuer avec <b>WordPress</b></string>
     <string name="msg_two_factor_authentication">authentification à deux facteurs</string>
-    <string name="msg__your_2fa_code">Quel est votre code 2FA?</string>
+    <string name="msg_your_2fa_code">Quel est votre code 2FA?</string>
     <string name="msg_view_more">voir de plus</string>
     <string name="msg_view_less">voir de plus</string>
     <string name="msg_permalink_copied">Permalink copié</string>
@@ -181,6 +203,11 @@
         <item quantity="other">%1$s a réagi avec %2$s</item>
     </plurals>
     <string name="msg_credentials_saved_successfully">Certificats sauvegardés</string>
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
+    <string name="msg_server">Server</string> <!-- TODO Translate -->
+    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
+    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privé</string>
@@ -194,12 +221,6 @@
     <string name="msg_member_not_found">Membre non trouvé</string>
     <string name="msg_channel_created_successfully">Salon créé</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Pistage à des fins d\'analyses</string>
-    <string name="msg_send_analytics_tracking">Envoyer des statistiques anonymes pour aider à l\'amélioration de l\'application</string>
-    <string name="msg_do_not_send_analytics_tracking">Ne pas envoyer des statistiques anonymes pour aider à l\'amélioration de l\'application</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Ne s\'applique pas étant donné qu\'il s\'agit d\'une version FOSS</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">Le nom du salon %1$s a été changé en %2$s</string>
     <string name="message_user_added_by">Utilisateur %1$s ajouté par %2$s</string>
@@ -276,7 +297,7 @@
     <string name="status_disconnecting">Déconnexion</string>
     <string name="status_waiting">Connexion dans %d secondes</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifier tous les utilisateurs dans ce salon</string>
     <string name="suggest_here_description">Notifier les utilisateurs actifs dans ce salon</string>
 
@@ -303,28 +324,31 @@
     <string name="Guggy_Command_Description">Génère un gif basé sur le texte fourni</string>
     <string name="Slash_Topic_Description">Définir le sujet</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Aucun emoji récent</string>
     <string name="alert_title_default_skin_tone">Tonalité de peau par défaut</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">Trier</string>
-    <string name="dialog_sort_title">Trier par</string>
-    <string name="dialog_sort_by_alphabet">Alphabétique</string>
-    <string name="dialog_sort_by_activity">Activité</string>
-    <string name="dialog_group_by_type">Grouper par type</string>
-    <string name="dialog_group_favourites">Grouper favoris</string>
-    <string name="chatroom_header">Entête</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
+    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
+    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
+    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
+    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoris</string>
-    <string name="header_channel">Salons</string>
+    <string name="msg_channels">Salons</string>
+    <string name="msg_users">Users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Groupes privés</string>
     <string name="header_direct_messages">Messages directs</string>
     <string name="header_live_chats">Chats en direct</string>
     <string name="header_unknown">Inconnu</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Modifier le message partagé</string>
     <string name="notif_action_reply_hint">RÉPONDRE</string>
     <string name="notif_error_sending">La réponse a échoué. Veuillez réessayer.</string>
@@ -335,9 +359,10 @@
     <string name="msg_sent_attachment">Envoyé un fichier</string>
     <string name="message_room_changed_privacy">Changé de type de chambre : %1$s de %2$s</string>
 
-
     <!-- User Details -->
     <string name="timezone">Fuseau horaire</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Soumettre</string>
diff --git a/app/src/main/res/values-hi-rIN/strings.xml b/app/src/main/res/values-hi-rIN/strings.xml
index 625867b33b..7238c689f6 100644
--- a/app/src/main/res/values-hi-rIN/strings.xml
+++ b/app/src/main/res/values-hi-rIN/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">अपने सर्वर में साइन इन करें</string>
     <string name="title_log_in">लॉग इन करें</string>
-    <string name="title_share_the_app">ऐप शेयर करे</string>
     <string name="title_register_username">रजिस्टर उपयोगकर्ता नाम</string>
     <string name="title_reset_password">पासवर्ड रीसेट करें</string>
     <string name="title_sign_up">साइन अप करें</string>
@@ -20,9 +19,9 @@
     <string name="title_admin_panel">एडमिन पैनल</string>
     <string name="title_password">पासवर्ड बदलें</string>
     <string name="title_update_profile">प्रोफ़ाइल अपडेट करें</string>
-    <string name="title_about">परिचय</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_create_channel">चैनल बनाएं</string>
-    <string name="title_licence">लाइसेंस</string>
+    <string name="title_license">लाइसेंस</string>
     <string name="title_are_you_sure">क्या आपको यकीन है?</string>
     <string name="title_channel_details">चैनल विवरण</string>
     <string name="title_topic">विषय</string>
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">इस उपयोगकर्ता नाम का उपयोग करें</string>
     <string name="action_terms_of_service">सेवा की शर्तें</string>
     <string name="action_privacy_policy">गोपनीयता नीति</string>
+    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
     <string name="action_search">खोजें</string>
     <string name="action_update">अद्यतन करें</string>
     <string name="action_settings">सेटिंग्स</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">एक फ़ाइल जोडो</string>
     <string name="action_confirm_password">पासवर्ड परिवर्तन की पुष्टि करें</string>
     <string name="action_join_chat">चैट में शामिल हों</string>
-    <string name="action_add_account">खाता जोड़ो</string>
-    <string name="action_online">ऑनलाइन</string>
-    <string name="action_away">दूर</string>
-    <string name="action_busy">व्यस्त</string>
-    <string name="action_invisible">अदृश्य</string>
+    <string name="msg_online">ऑनलाइन</string>
+    <string name="msg_away">दूर</string>
+    <string name="msg_busy">व्यस्त</string>
+    <string name="msg_invisible">अदृश्य</string>
     <string name="action_save_to_gallery">गैलरी में सहेजें</string>
     <string name="action_drawing">चित्रकारी</string>
     <string name="action_select_photo_from_gallery">गैलरी से फोटो का चयन करें</string>
@@ -58,20 +57,43 @@
     <string name="action_create_server">नया सर्वर बनाएं</string>
     <string name="action_register">रजिस्टर</string>
     <string name="action_confirm">पुष्टि करें</string>
-    <string name="action_delete_account">खाता हटा दो</string>
     <string name="action_favorite">Favorite</string> <!-- TODO Add translation -->
     <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Add translation -->
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">पसंद</item>
-        <item name="item_password">पासवर्ड बदलें</item>
-        <item name="change_language">भाषा बदलें</item>
-        <item name="item_share_app">ऐप शेयर करें</item>
-        <item name="item_rate_us">हमें रेटिंग दें</item>
-        <item name="item_contact_us">हमसे संपर्क करें</item>
-        <item name="item_licence">लाइसेंस</item>
-        <item name="item_about">के बारे में</item>
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">इस ऐप को बेहतर बनाने में मदद के लिए अज्ञात स्टेटिक्स भेजें</string>
+    <string name="msg_do_not_send_analytics_tracking">इस ऐप को बेहतर बनाने में मदद के लिए अनाम स्टेटिक न भेजें</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">लागू नहीं है क्योंकि यह एक FOSS संस्करण है</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
+
+    <string-array name="languages"> <!-- TODO Add translations -->
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -79,7 +101,7 @@
     <string name="msg_no_data_to_display">डेटा प्रदर्शित करने के लिए उपलब्ध नहीं हैं</string>
     <string name="msg_check_this_out">इसकी जांच करें</string>
     <string name="msg_share_using">उपयोग कर साझा करें</string>
-    <string name="msg_profile_update_successfully">प्रोफ़ाइल सफलतापूर्वक अपडेट हो गया है</string>
+    <string name="msg_profile_updated_successfully">प्रोफ़ाइल सफलतापूर्वक अपडेट हो गया है</string>
     <string name="msg_username">यूजरनेम</string>
     <string name="msg_username_or_email">यूजरनेम या ईमेल</string>
     <string name="msg_password">पासवर्ड</string>
@@ -88,7 +110,7 @@
     <string name="msg_avatar_url">अवतार यूआरएल</string>
     <string name="msg_or_continue_using_social_accounts">या सामाजिक खाते का उपयोग करना जारी रखें</string>
     <string name="msg_new_user">नया उपयोगकर्ता? %1$s</string>
-    <string name="msg_forgot__your_password">पासवर्ड भूल गए?</string>
+    <string name="msg_forgot_your_password">पासवर्ड भूल गए?</string>
     <string name="msg_reset">रीसेट करें</string>
     <string name="msg_check_your_email_to_reset_your_password">ईमेल गया गया है! अपना पासवर्ड रीसेट करने के लिए अपने इनबॉक्स की जांच करें।</string>
     <string name="msg_invalid_email">कृपया एक वैध ई-मेल टाइप करें</string>
@@ -103,12 +125,12 @@
     <string name="msg_invalid_file">अवैध फाइल</string>
     <string name="msg_invalid_server_url">अमान्य सर्वर यूआरL</string>
     <string name="msg_content_description_log_in_using_facebook">Facebook द्वारा लॉगिन करें</string>
-    <string name="msg_content_description_log_in_using_github">Github द्वारा लॉगिन करें</string>
+    <string name="msg_content_description_log_in_using_github">GitHub द्वारा लॉगिन करें</string>
     <string name="msg_content_description_log_in_using_google">Google द्वारा लॉगिन करें</string>
-    <string name="msg_content_description_log_in_using_linkedin">Linkedin द्वारा लॉगिन करें</string>
+    <string name="msg_content_description_log_in_using_linkedin">LinkedIn द्वारा लॉगिन करें</string>
     <string name="msg_content_description_log_in_using_meteor">Meteor द्वारा लॉगिन करें</string>
     <string name="msg_content_description_log_in_using_twitter">Twitter द्वारा लॉगिन करें</string>
-    <string name="msg_content_description_log_in_using_gitlab">Gitlab द्वारा लॉगिन करें</string>
+    <string name="msg_content_description_log_in_using_gitlab">GitLab द्वारा लॉगिन करें</string>
     <string name="msg_content_description_log_in_using_wordpress">WordPress द्वारा लॉगिन करें</string>
     <string name="msg_content_description_send_message">मेसेज भेजें</string>
     <string name="msg_content_description_show_more_login_options">अधिक लॉगिन विकल्प दिखाएं</string>
@@ -154,19 +176,21 @@
     <string name="msg_send">भेजें</string>
     <string name="msg_sent_attachment">एक अनुलग्नक भेजा</string>
     <string name="msg_delete_message">संदेश को हटाएं</string>
-    <string name="msg_delete_description">क्या आप निश्चित रूप से यह संदेश हटाना चाहते हैं</string>
+    <string name="msg_delete_description">क्या आप निश्चित रूप से यह संदेश हटाना चाहते हैं?</string>
     <string name="msg_welcome_to_rocket_chat">Rocket.Chat में आपका स्वागत है</string>
     <string name="msg_team_communication">टीम संचार</string>
     <string name="msg_login_with_email">ई-मेल के साथ लॉगिन करें</string>
     <string name="msg_create_account">खाता बनाएं</string>
     <string name="msg_continue_with_facebook"><b>Facebook</b> के साथ जारी रखें</string>
-    <string name="msg_continue_with_github"><b>Github</b> के साथ जारी रखें</string>
+    <string name="msg_continue_with_github"><b>GitHub</b> के साथ जारी रखें</string>
     <string name="msg_continue_with_google"><b>Google</b> के साथ जारी रखें</string>
-    <string name="msg_continue_with_linkedin"><b>Linkedin</b> के साथ जारी रखें</string>
+    <string name="msg_continue_with_linkedin"><b>LinkedIn</b> के साथ जारी रखें</string>
     <string name="msg_continue_with_gitlab"><b>GitLab</b> के साथ जारी रखें</string>
     <string name="msg_continue_with_wordpress"><b>WordPress</b> के साथ जारी रखें</string>
     <string name="msg_two_factor_authentication">दो तरीकों से प्रमाणीकरण</string>
-    <string name="msg__your_2fa_code">आपका 2FA कोड क्या है?</string>
+    <string name="msg_your_2fa_code">आपका 2FA कोड क्या है?</string>
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">प्राइवेट</string>
@@ -196,12 +220,9 @@
         <item quantity="many">%1$s ने %2$s के साथ प्रतिक्रिया व्यक्त की</item>
     </plurals>
     <string name="msg_credentials_saved_successfully">प्रमाण पत्र सफलतापूर्वक सहेजे गए</string>
-
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">एनालिटिक्स ट्रैकिंग</string>
-    <string name="msg_send_analytics_tracking">इस ऐप को बेहतर बनाने में मदद के लिए अज्ञात स्टेटिक्स भेजें</string>
-    <string name="msg_do_not_send_analytics_tracking">इस ऐप को बेहतर बनाने में मदद के लिए अनाम स्टेटिक न भेजें</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">लागू नहीं है क्योंकि यह एक FOSS संस्करण है</string>
+    <string name="msg_server">Server</string> <!-- TODO Translate -->
+    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
+    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
 
     <!-- System messages -->
     <string name="message_room_name_changed">%2$s ने रूम का नाम बदलकर %1$s किया</string>
@@ -279,7 +300,7 @@
     <string name="status_disconnecting">डिसकनेक्टिंग</string>
     <string name="status_waiting">%d सेकेंड में कनेक्ट हो रहा है</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">इस कमरे में सभी को सूचित करें</string>
     <string name="suggest_here_description">इस कमरे में सक्रिय उपयोगकर्ताओं को सूचित करना</string>
 
@@ -306,28 +327,31 @@
     <string name="Guggy_Command_Description">दिए गए पाठ पर आधारित gif उत्पन्न करता</string>
     <string name="Slash_Topic_Description">विषय सेट करें</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji"> कोई नया इमोजी नहीं</string>
     <string name="alert_title_default_skin_tone">डिफ़ॉल्ट त्वचा टोन</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">क्रम</string>
-    <string name="dialog_sort_title">द्वारा सॉर्ट करें</string>
-    <string name="dialog_sort_by_alphabet">वर्णानुक्रम</string>
-    <string name="dialog_sort_by_activity">गतिविधि</string>
-    <string name="dialog_group_by_type">प्रकार के आधार पर समूह</string>
-    <string name="dialog_group_favourites">पसंदीदा समूह</string>
-    <string name="chatroom_header">हैडर</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
+    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
+    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
+    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
+    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">पसंदीदा</string>
-    <string name="header_channel">चैनलों</string>
+    <string name="msg_channels">चैनलों</string>
+    <string name="msg_users">Users</string> <!-- TODO Translate -->
     <string name="header_private_groups">निजी समूहों</string>
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_direct_messages">प्रत्यक्ष संदेश</string>
     <string name="header_live_chats">लाइव चैट</string>
     <string name="header_unknown">अज्ञात</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">साझा संदेश संपादित करें</string>
     <string name="notif_action_reply_hint">जवाब</string>
     <string name="notif_error_sending">उत्तर विफल हुआ है। कृपया फिर से प्रयास करें।</string>
@@ -339,6 +363,8 @@
 
     <!-- User Details -->
     <string name="timezone">समय क्षेत्र</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">जमा करें</string>
diff --git a/app/src/main/res/values-it/strings.xml b/app/src/main/res/values-it/strings.xml
index 9e6ae1cb97..cdf6833595 100644
--- a/app/src/main/res/values-it/strings.xml
+++ b/app/src/main/res/values-it/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Accedi al tuo server</string>
     <string name="title_log_in">Accesso</string>
-    <string name="title_share_the_app">Condividi la App</string>
     <string name="title_register_username">Registra nome utente</string>
     <string name="title_reset_password">Annullare password</string>
     <string name="title_sign_up">Iscrizione</string>
@@ -20,10 +19,10 @@
     <string name="title_admin_panel">Pannello di Amministrazione</string>
     <string name="title_password">Password</string>
     <string name="title_update_profile">Aggiorna Profilo</string>
-    <string name="title_about">Informazioni</string>
     <string name="title_create_channel">Crea Canale</string>
-    <string name="title_licence">licenza</string>
-    <string name="title_are_you_sure">Sei sicuro che vuoi uscire ?</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
+    <string name="title_license">licenza</string>
+    <string name="title_are_you_sure">Sei sicuro che vuoi uscire?</string>
     <string name="title_channel_details">Allegare un file</string>
     <string name="title_topic">Argomento</string>
     <string name="title_announcement">Annuncio</string>
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">Usa questo nome utente</string>
     <string name="action_terms_of_service">Termini di Servizio</string>
     <string name="action_privacy_policy">Politica sulla Riservatezza</string>
+    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
     <string name="action_search">Cerca</string>
     <string name="action_update">Aggiorna</string>
     <string name="action_settings">Parametri</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">Ceangail comhad</string>
     <string name="action_confirm_password">Conferma Cambio Password</string>
     <string name="action_join_chat">Iscriviti alla stanza</string>
-    <string name="action_add_account">Aggiungi utente</string>
-    <string name="action_online">In linea</string>
-    <string name="action_away">Lontano</string>
-    <string name="action_busy">Occupato</string>
-    <string name="action_invisible">Invisibile</string>
+    <string name="msg_online">In linea</string>
+    <string name="msg_away">Lontano</string>
+    <string name="msg_busy">Occupato</string>
+    <string name="msg_invisible">Invisibile</string>
     <string name="action_drawing">Disegno</string>
     <string name="action_save_to_gallery">Salva in galleria</string>
     <string name="action_select_photo_from_gallery">Seleziona foto dalla galleria</string>
@@ -58,20 +57,43 @@
     <string name="action_create_server">Crea un nuovo server</string>
     <string name="action_register">Registra</string>
     <string name="action_confirm">Conferma</string>
-    <string name="action_delete_account">Elimina utente</string>
     <string name="action_favorite">Favorite</string> <!-- TODO Add translation -->
     <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Add translation -->
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">Preferenze</item>
-        <item name="item_password">Cambia password</item>
-        <item name="change_language">Cambia lingua</item>
-        <item name="item_share_app">Condividi app</item>
-        <item name="item_rate_us">Votaci</item>
-        <item name="item_contact_us">Contattaci</item>
-        <item name="item_licence">Licenza</item>
-        <item name="item_about">Di</item>
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">Invia statistiche anonime per migliorare questa app</string>
+    <string name="msg_do_not_send_analytics_tracking">Non inviare statiche anonime per migliorare questa app</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Non applicabile poiché è una versione FOSS</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
+
+    <string-array name="languages"> <!-- TODO Add translations -->
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -79,7 +101,7 @@
     <string name="msg_no_data_to_display">Nessun dato da visualizzare</string>
     <string name="msg_check_this_out">Controllalo</string>
     <string name="msg_share_using">Condividi utilizzando</string>
-    <string name="msg_profile_update_successfully">Aggiornamento del profilo con successo</string>
+    <string name="msg_profile_updated_successfully">Aggiornamento del profilo con successo</string>
     <string name="msg_username">Nome utente</string>
     <string name="msg_username_or_email">Nome utente o e-mail</string>
     <string name="msg_password">Password</string>
@@ -88,7 +110,7 @@
     <string name="msg_avatar_url">Avatar URL</string>
     <string name="msg_or_continue_using_social_accounts">O continuare utilizzando un account social</string>
     <string name="msg_new_user">Nuovo utente? %1$s</string>
-    <string name="msg_forgot__your_password">Hai dimenticato la tua password?</string>
+    <string name="msg_forgot_your_password">Hai dimenticato la tua password?</string>
     <string name="msg_reset">Reimposta</string>
     <string name="msg_check_your_email_to_reset_your_password">E-mail inviata! Controlla la tua casella di posta per reimpostare la password.</string>
     <string name="msg_invalid_email">Per favore digita una e-mail valida</string>
@@ -103,12 +125,12 @@
     <string name="msg_invalid_file">Documento non valido</string>
     <string name="msg_invalid_server_url">URL del server non valido</string>
     <string name="msg_content_description_log_in_using_facebook">Accedi usando Facebook</string>
-    <string name="msg_content_description_log_in_using_github">Accedi usando Github</string>
+    <string name="msg_content_description_log_in_using_github">Accedi usando GitHub</string>
     <string name="msg_content_description_log_in_using_google">Accedi usando Google</string>
-    <string name="msg_content_description_log_in_using_linkedin">Accedi usando Linkedin</string>
+    <string name="msg_content_description_log_in_using_linkedin">Accedi usando LinkedIn</string>
     <string name="msg_content_description_log_in_using_meteor">Accedi usando Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Accedi usando Twitter</string>
-    <string name="msg_content_description_log_in_using_gitlab">Accedi usando Gitlab</string>
+    <string name="msg_content_description_log_in_using_gitlab">Accedi usando GitLab</string>
     <string name="msg_content_description_log_in_using_wordpress">Accedi usando WordPress</string>
     <string name="msg_content_description_send_message">Invia messaggio</string>
     <string name="msg_content_description_show_more_login_options">Mostra ulteriori opzioni di accesso</string>
@@ -154,13 +176,13 @@
     <string name="msg_login_with_email">Accedi con <b>e-mail</b></string>
     <string name="msg_create_account">Crea un utente</string>
     <string name="msg_continue_with_facebook">Continua con <b>Facebook</b></string>
-    <string name="msg_continue_with_github">Continua con <b>Github</b></string>
+    <string name="msg_continue_with_github">Continua con <b>GitHub</b></string>
     <string name="msg_continue_with_google">Continua con <b>Google</b></string>
-    <string name="msg_continue_with_linkedin">Continua con <b>Linkedin</b></string>
+    <string name="msg_continue_with_linkedin">Continua con <b>LinkedIn</b></string>
     <string name="msg_continue_with_gitlab">Continua con <b>GitLab</b></string>
     <string name="msg_continue_with_wordpress">Continua con <b>WordPress</b></string>
     <string name="msg_two_factor_authentication">Autenticazione a 2 fattori (2FA)</string>
-    <string name="msg__your_2fa_code">Qual è il tuo codice 2FA ?</string>
+    <string name="msg_your_2fa_code">Qual è il tuo codice 2FA?</string>
     <string name="msg_permalink_copied">Permalink copiato</string>
     <string name="msg_no_topic">No topic</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement</string> <!-- TODO Add translation -->
@@ -174,6 +196,11 @@
         <item quantity="other">%1$s ha reagito con %2$s</item>
     </plurals>
     <string name="msg_credentials_saved_successfully">Credenziali salvate con successo</string>
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
+    <string name="msg_server">Server</string> <!-- TODO Translate -->
+    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
+    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privato</string>
@@ -188,17 +215,11 @@
     <string name="msg_channel_created_successfully">Canale creato con successo</string>
     <string name="msg_message_copied">Messaggio copiato</string>
     <string name="msg_delete_message">Cancellare Messaggio</string>
-    <string name="msg_delete_description">Sei sicuro di voler eliminare questo messaggio ?</string>
+    <string name="msg_delete_description">Sei sicuro di voler eliminare questo messaggio?</string>
     <string name="msg_view_more">vedere di più</string>
     <string name="msg_view_less">vedere di meno</string>
     <string name="msg_muted_on_this_channel">Sei disattivato su questo canale</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Tracciamento Analitico</string>
-    <string name="msg_send_analytics_tracking">Invia statistiche anonime per migliorare questa app</string>
-    <string name="msg_do_not_send_analytics_tracking">Non inviare statiche anonime per migliorare questa app</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Non applicabile poiché è una versione FOSS</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">Nome della camera cambiato in: %1$s da %2$s</string>
     <string name="message_user_added_by">Utente %1$s aggiunto da %2$s</string>
@@ -275,7 +296,7 @@
     <string name="status_disconnecting">Disconessione</string>
     <string name="status_waiting">Collegamento fra %d secondi</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifica tutti in questa stanza</string>
     <string name="suggest_here_description">Notifica gli utenti attivi di questa stanza</string>
 
@@ -302,28 +323,31 @@
     <string name="Guggy_Command_Description">Genera una gif in base al testo fornito</string>
     <string name="Slash_Topic_Description">Imposta argomento</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">No recent emojis</string>
     <string name="alert_title_default_skin_tone">Default skin tone</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">Ordinare</string>
-    <string name="dialog_sort_title">Ordinare per</string>
-    <string name="dialog_sort_by_alphabet">Alfabeto</string>
-    <string name="dialog_sort_by_activity">Attività</string>
-    <string name="dialog_group_by_type">Raggruppa per tipo</string>
-    <string name="dialog_group_favourites">Raggruppa preferiti</string>
-    <string name="chatroom_header">Intestazione</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
+    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
+    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
+    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
+    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
-    <string name="header_channel">Canali</string>
+    <string name="msg_channels">Canali</string>
+    <string name="msg_users">Users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Gruppi Privati</string>
     <string name="header_direct_messages">Messaggi Diretti</string>
     <string name="header_live_chats">Stanza in diretta</string>
     <string name="header_unknown">Sconosciuto</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Modifica messaggio condiviso</string>
     <string name="notif_action_reply_hint">Risposta</string>
     <string name="notif_error_sending">La risposta è fallita. Per favore riprova.</string>
@@ -334,6 +358,8 @@
 
     <!-- User Details -->
     <string name="timezone">Fuso Orario</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Invia</string>
diff --git a/app/src/main/res/values-ja/strings.xml b/app/src/main/res/values-ja/strings.xml
index 7b2b0a3ae9..4cfebbe82d 100644
--- a/app/src/main/res/values-ja/strings.xml
+++ b/app/src/main/res/values-ja/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">サーバーに接続</string>
     <string name="title_log_in">ログイン</string>
-    <string name="title_share_the_app">アプリを共有する</string>
     <string name="title_register_username">ユーザー名を登録する</string>
     <string name="title_reset_password">パスワードリセット</string>
     <string name="title_sign_up">サインアップ</string>
@@ -20,8 +19,8 @@
     <string name="title_admin_panel">管理パネル</string>
     <string name="title_password">パスワードの変更</string>
     <string name="title_update_profile">プロフィールの更新</string>
-    <string name="title_about">About</string><!-- TODO Add translation -->
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
+    <string name="title_license">License</string> <!-- TODO Add translation -->
     <string name="title_create_channel">新しいチャネルを作成</string>
     <string name="title_are_you_sure">本気ですか？</string>
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">このユーザー名を使用する</string>
     <string name="action_terms_of_service">サービス利用規約</string>
     <string name="action_privacy_policy">プライバシーポリシー</string>
+    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
     <string name="action_search">検索</string>
     <string name="action_update">更新</string>
     <string name="action_settings">設定</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">Attach a file</string> <!-- TODO Add translation -->
     <string name="action_confirm_password">変更したパスワードの確認</string>
     <string name="action_join_chat">チャットに参加</string>
-    <string name="action_add_account">サーバーの追加</string>
-    <string name="action_online">オンライン</string>
-    <string name="action_away">離席中</string>
-    <string name="action_busy">取り込み中</string>
-    <string name="action_invisible">状態を隠す</string>
+    <string name="msg_online">オンライン</string>
+    <string name="msg_away">離席中</string>
+    <string name="msg_busy">取り込み中</string>
+    <string name="msg_invisible">状態を隠す</string>
     <string name="action_drawing">絵を描く</string>
     <string name="action_save_to_gallery">ギャラリーに保存</string>
     <string name="action_select_photo_from_gallery">ギャラリーの写真を選択</string>
@@ -58,20 +57,43 @@
     <string name="action_create_server">新規サーバーを作成</string>
     <string name="action_register">登録</string>
     <string name="action_confirm">確認</string>
-    <string name="action_delete_account">アカウントを削除する</string>
     <string name="action_favorite">Favorite</string> <!-- TODO Add translation -->
     <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Add translation -->
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="change_language">Change language </item><!-- TODO Add translation -->
-        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
-        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
-        <item name="item_about">About</item> <!-- TODO Add translation -->
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">アプリ改善のための匿名統計情報を送信する</string>
+    <string name="msg_do_not_send_analytics_tracking">アプリ改善のための匿名統計情報を送信しない</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">FOSSバージョンのため、適用できません</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
+
+    <string-array name="languages"> <!-- TODO Add translations -->
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -79,7 +101,7 @@
     <string name="msg_no_data_to_display">表示するデータがありません</string>
     <string name="msg_check_this_out">これをチェックする</string>
     <string name="msg_share_using">共有する</string>
-    <string name="msg_profile_update_successfully">プロフィールの更新に成功しました</string>
+    <string name="msg_profile_updated_successfully">プロフィールの更新に成功しました</string>
     <string name="msg_username">ユーザー名</string>
     <string name="msg_username_or_email">メールアドレスまたはユーザー名</string>
     <string name="msg_password">パスワード</string>
@@ -88,7 +110,7 @@
     <string name="msg_avatar_url">アバター URL</string>
     <string name="msg_or_continue_using_social_accounts">またはソーシャルアカウントを使用する</string>
     <string name="msg_new_user">新規ユーザー? %1$s</string>
-    <string name="msg_forgot__your_password">パスワードをお忘れですか?</string>
+    <string name="msg_forgot_your_password">パスワードをお忘れですか?</string>
     <string name="msg_reset">リセット</string>
     <string name="msg_check_your_email_to_reset_your_password">メールが送信されました! パスワードを変更するためには、受信ボックスを確認してください。</string>
     <string name="msg_invalid_email">有効なメールアドレスを入力してください</string>
@@ -103,12 +125,12 @@
     <string name="msg_invalid_file">無効なファイル</string>
     <string name="msg_invalid_server_url">無効なサーバー URL</string>
     <string name="msg_content_description_log_in_using_facebook">Facebookでログイン</string>
-    <string name="msg_content_description_log_in_using_github">Githubでログイン</string>
+    <string name="msg_content_description_log_in_using_github">GitHubでログイン</string>
     <string name="msg_content_description_log_in_using_google">Googleでログイン</string>
-    <string name="msg_content_description_log_in_using_linkedin">Linkedinでログイン</string>
+    <string name="msg_content_description_log_in_using_linkedin">LinkedInでログイン</string>
     <string name="msg_content_description_log_in_using_meteor">Meteorでログイン</string>
     <string name="msg_content_description_log_in_using_twitter">Twitterでログイン</string>
-    <string name="msg_content_description_log_in_using_gitlab">Gitlabでログイン</string>
+    <string name="msg_content_description_log_in_using_gitlab">GitLabでログイン</string>
     <string name="msg_content_description_log_in_using_wordpress">WordPressでログイン</string>
     <string name="msg_content_description_send_message">メッセージを送信</string>
     <string name="msg_content_description_show_more_login_options">その他ログインオプション</string>
@@ -157,13 +179,13 @@
     <string name="msg_login_with_email"><b>e-mail</b>でログイン</string>
     <string name="msg_create_account">アカウントを作成</string>
     <string name="msg_continue_with_facebook"><b>Facebook</b>でログイン</string>
-    <string name="msg_continue_with_github"><b>Github</b>でログイン</string>
+    <string name="msg_continue_with_github"><b>GitHub</b>でログイン</string>
     <string name="msg_continue_with_google"><b>Google</b>でログイン</string>
-    <string name="msg_continue_with_linkedin"><b>Linkedin</b>でログイン</string>
+    <string name="msg_continue_with_linkedin"><b>LinkedIn</b>でログイン</string>
     <string name="msg_continue_with_gitlab"><b>GitLab</b>でログイン</string>
     <string name="msg_continue_with_wordpress"><b>WordPress</b>でログイン</string>
     <string name="msg_two_factor_authentication">二要素認証</string>
-    <string name="msg__your_2fa_code">あなたの 2FA コードは何ですか?</string>
+    <string name="msg_your_2fa_code">あなたの 2FA コードは何ですか?</string>
     <string name="msg_view_more">更に表示</string>
     <string name="msg_view_less">隠す</string>
     <string name="msg_muted_on_this_channel">あなたはこのチャンネルでミュートされています</string>
@@ -177,6 +199,11 @@
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
     </plurals>
     <string name="msg_credentials_saved_successfully">資格情報を正常に保存しました</string>
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
+    <string name="msg_server">Server</string> <!-- TODO Translate -->
+    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
+    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">プライベート</string>
@@ -196,12 +223,6 @@
     <string name="msg_send_email">Send email</string> <!-- TODO - Add proper translation -->
     <string name="msg_android_app_support">Android app support</string> <!-- TODO - Add proper translation -->
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">トラッキングの分析</string>
-    <string name="msg_send_analytics_tracking">アプリ改善のための匿名統計情報を送信する</string>
-    <string name="msg_do_not_send_analytics_tracking">アプリ改善のための匿名統計情報を送信しない</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">FOSSバージョンのため、適用できません</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">ルーム名を %1$s から %2$s へ変更しました。</string>
     <string name="message_user_added_by">%1$s がユーザー %2$s を追加しました。</string>
@@ -278,7 +299,7 @@
     <string name="status_disconnecting">切断</string>
     <string name="status_waiting">%d 秒間接続中</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">このルームの全員に通知</string>
     <string name="suggest_here_description">この部屋のアクティブユーザーに通知する</string>
 
@@ -305,29 +326,31 @@
     <string name="Guggy_Command_Description">提供されたテキストに基づいてgifを生成する</string>
     <string name="Slash_Topic_Description">設定トピック</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">最近の絵文字はありません</string>
     <string name="alert_title_default_skin_tone">デフォルトスキントークン</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">ソート</string>
-    <string name="dialog_sort_title">ソート</string>
-    <string name="dialog_sort_by_alphabet">アルファベット順</string>
-    <string name="dialog_sort_by_activity">アクティビティ順</string>
-    <string name="dialog_group_by_type">グループ別</string>
-    <string name="dialog_group_favourites">お気に入りのグループ</string>
-    <string name="chatroom_header">ヘッダ</string>
-
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
+    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
+    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
+    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
+    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
-    <string name="header_channel">チャンネル</string>
+    <string name="msg_channels">チャンネル</string>
+    <string name="msg_users">Users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">プライベートグループ</string>
     <string name="header_direct_messages">ダイレクトメッセージ</string>
     <string name="header_live_chats">ライブチャット</string>
     <string name="header_unknown">不明</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">共有メッセージの編集</string>
     <string name="notif_action_reply_hint">返信</string>
     <string name="notif_error_sending">送信に失敗しました。もう一度お試しください。</string>
@@ -339,6 +362,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml
index d262de5c0a..99149bf599 100644
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Faça login no seu servidor</string>
     <string name="title_log_in">Entrar</string>
-    <string name="title_share_the_app">Compartilhe o aplicativo</string>
     <string name="title_register_username">Registre o nome de usuário</string>
     <string name="title_reset_password">Redefinir senha</string>
     <string name="title_sign_up">Inscreva-se</string>
@@ -17,12 +16,12 @@
     <string name="title_preferences">Preferencias</string>
     <string name="title_change_password">Alterar senha</string>
     <string name="title_rate_us">nos avalie</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_admin_panel">Painel administrativo</string>
     <string name="title_password">Alterar senha</string>
     <string name="title_update_profile">Editar perfil</string>
-    <string name="title_about">Sobre</string>
     <string name="title_create_channel">Criar chat</string>
-    <string name="title_licence">Licença</string>
+    <string name="title_license">Licença</string>
     <string name="title_are_you_sure">Você tem certeza?</string>
     <string name="title_channel_details">Detalhes do canal</string>
     <string name="title_topic">Tópico</string>
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">Usar este nome de usuário</string>
     <string name="action_terms_of_service">Termos de Serviço</string>
     <string name="action_privacy_policy">Política de Privacidade</string>
+    <string name="action_new_channel">Novo canal</string>
     <string name="action_search">Pesquisar</string>
     <string name="action_update">Atualizar</string>
     <string name="action_settings">Configurações</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">Anexar um arquivo</string>
     <string name="action_confirm_password">Confirme a nova senha</string>
     <string name="action_join_chat">Entrar no Chat</string>
-    <string name="action_add_account">Adicionar conta</string>
-    <string name="action_online">Online</string>
-    <string name="action_away">Ausente</string>
-    <string name="action_busy">Ocupado</string>
-    <string name="action_invisible">Invisível</string>
+    <string name="msg_online">Online</string>
+    <string name="msg_away">Ausente</string>
+    <string name="msg_busy">Ocupado</string>
+    <string name="msg_invisible">Invisível</string>
     <string name="action_drawing">Desenhando</string>
     <string name="action_save_to_gallery">Salvar na galeria</string>
     <string name="action_select_photo_from_gallery">Escolher foto da galeria</string>
@@ -58,20 +57,43 @@
     <string name="action_create_server">Criar um novo servidor</string>
     <string name="action_register">Registrar</string>
     <string name="action_confirm">Confirmar</string>
-    <string name="action_delete_account">Deletar conta</string>
     <string name="action_favorite">Favoritar</string>
     <string name="action_remove_favorite">Remover favorito</string>
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">Preferências</item>
-        <item name="item_password">Alterar senha</item>
-        <item name="change_language">Alterar idioma</item>
-        <item name="item_share_app">Compartilhar app</item>
-        <item name="item_rate_us">Classifique-nos</item>
-        <item name="item_contact_us">Contate-nos</item>
-        <item name="item_licence">Licença</item>
-        <item name="item_about">Sobre</item>
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">Envie estatísticas anônimas para ajudar a melhorar este app</string>
+    <string name="msg_do_not_send_analytics_tracking">Não envie estatísticas anônimas para ajudar a melhorar este app</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Não aplicável devido a versão do aplicativo ser FOSS</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
+
+    <string-array name="languages"> <!-- TODO Add translations -->
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -79,7 +101,7 @@
     <string name="msg_no_data_to_display">Nenhum dado para exibir</string>
     <string name="msg_check_this_out">Veja isso</string>
     <string name="msg_share_using">compartilhar usando</string>
-    <string name="msg_profile_update_successfully">Perfil atualizado com sucesso</string>
+    <string name="msg_profile_updated_successfully">Perfil atualizado com sucesso</string>
     <string name="msg_username">nome de usuário</string>
     <string name="msg_username_or_email">Nome de usuário ou email</string>
     <string name="msg_password">Senha</string>
@@ -88,7 +110,7 @@
     <string name="msg_avatar_url">URL do avatar</string>
     <string name="msg_or_continue_using_social_accounts">Ou continue através de contas sociais</string>
     <string name="msg_new_user">Novo usuário? %1$s</string>
-    <string name="msg_forgot__your_password">Esqueceu sua senha?</string>
+    <string name="msg_forgot_your_password">Esqueceu sua senha?</string>
     <string name="msg_reset">Redefinir</string>
     <string name="msg_check_your_email_to_reset_your_password">Email enviado! Verifique sua caixa de entrada para redefinir sua senha.</string>
     <string name="msg_invalid_email">Por favor informe um e-mail válido</string>
@@ -103,12 +125,12 @@
     <string name="msg_invalid_file">Arquivo inválido</string>
     <string name="msg_invalid_server_url">URL de servidor inválido</string>
     <string name="msg_content_description_log_in_using_facebook">Fazer login através do Facebook</string>
-    <string name="msg_content_description_log_in_using_github">Fazer login através do Github</string>
+    <string name="msg_content_description_log_in_using_github">Fazer login através do GitHub</string>
     <string name="msg_content_description_log_in_using_google">Fazer login através do Google</string>
-    <string name="msg_content_description_log_in_using_linkedin">Fazer login através do Linkedin</string>
+    <string name="msg_content_description_log_in_using_linkedin">Fazer login através do LinkedIn</string>
     <string name="msg_content_description_log_in_using_meteor">Fazer login através do Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Fazer login através do Twitter</string>
-    <string name="msg_content_description_log_in_using_gitlab">Fazer login através do Gitlab</string>
+    <string name="msg_content_description_log_in_using_gitlab">Fazer login através do GitLab</string>
     <string name="msg_content_description_log_in_using_wordpress">Fazer login através do WordPress</string>
     <string name="msg_content_description_send_message">Enviar mensagem</string>
     <string name="msg_content_description_show_more_login_options">Mostrar mais opções de login</string>
@@ -159,13 +181,13 @@
     <string name="msg_login_with_email">Fazer login com <b>e-mail</b></string>
     <string name="msg_create_account">Criar conta</string>
     <string name="msg_continue_with_facebook">Continuar com <b>Facebook</b></string>
-    <string name="msg_continue_with_github">Continuar com <b>Github</b></string>
+    <string name="msg_continue_with_github">Continuar com <b>GitHub</b></string>
     <string name="msg_continue_with_google">Continuar com <b>Google</b></string>
-    <string name="msg_continue_with_linkedin">Continuar com <b>Linkedin</b></string>
+    <string name="msg_continue_with_linkedin">Continuar com <b>LinkedIn</b></string>
     <string name="msg_continue_with_gitlab">Continuar com <b>GitLab</b></string>
     <string name="msg_continue_with_wordpress">Continuar com <b>WordPress</b></string>
     <string name="msg_two_factor_authentication">Autenticação de dois fatores</string>
-    <string name="msg__your_2fa_code">Qual é o seu código da autenticação de dois fatores?</string>
+    <string name="msg_your_2fa_code">Qual é o seu código da autenticação de dois fatores?</string>
     <string name="msg_view_more">visualizar mais</string>
     <string name="msg_view_less">visualizar menos</string>
     <string name="msg_permalink_copied">Permalink copiado</string>
@@ -177,12 +199,16 @@
     <string name="msg_no_description">Nenhuma descrição</string>
     <string name="msg_unable_to_update_password">Não foi possível atualizar a senha. Mensagem de erro: %1$s</string>
     <string name="msg_password_updated_successfully">Senha alterada com sucesso</string>
-    <string name="msg_sort">Ordenar</string>
     <plurals name="msg_reacted_with_">
         <item quantity="one">%1$s reagiu com %2$s</item>
         <item quantity="other">%1$s reagiram com %2$s</item>
     </plurals>
     <string name="msg_credentials_saved_successfully">Credenciais salvas com sucesso</string>
+    <string name="msg_server">Servidor</string>
+    <string name="msg_add_new_server">Adicionar Novo Servidor</string>
+    <string name="msg_directory">Diretório</string>
+    <string name="msg_camera_permission_denied">A permissão da câmera é necessária</string>
+    <string name="msg_storage_permission_denied">A permissão de armazenamento é necessária</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>
@@ -196,12 +222,6 @@
     <string name="msg_member_not_found">Membro não encontrado</string>
     <string name="msg_channel_created_successfully">Chat criado com sucesso</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Rastreamento de análises</string>
-    <string name="msg_send_analytics_tracking">Envie estatísticas anônimas para ajudar a melhorar este app</string>
-    <string name="msg_do_not_send_analytics_tracking">Não envie estatísticas anônimas para ajudar a melhorar este app</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Não aplicável devido a versão do aplicativo ser FOSS</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">Nome da sala alterado para: %1$s por %2$s</string>
     <string name="message_user_added_by">Usuário %1$s adicionado por %2$s</string>
@@ -278,7 +298,7 @@
     <string name="status_disconnecting">Desconectando</string>
     <string name="status_waiting">Conectando em %d segundos</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifica todos nesta sala</string>
     <string name="suggest_here_description">Notifica usuários ativos nesta sala</string>
 
@@ -305,27 +325,31 @@
     <string name="Guggy_Command_Description">Gera um gif baseado no texto dado</string>
     <string name="Slash_Topic_Description">Definir tópico</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Nenhum emoji recente</string>
     <string name="alert_title_default_skin_tone">Tom de pele padrão</string>
 
-    <!-- Sorting and grouping-->
-    <string name="dialog_sort_title">Ordenar por</string>
-    <string name="dialog_sort_by_alphabet">Alfabeticamente</string>
-    <string name="dialog_sort_by_activity">Atividade</string>
-    <string name="dialog_group_by_type">Agrupar por tipo</string>
-    <string name="dialog_group_favourites">Grupos favoritos</string>
-    <string name="chatroom_header">Cabeçalho</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Ordenar por %1$s</string>
+    <string name="msg_sort_by">Ordernar por</string>
+    <string name="msg_sort_by_activity">Atividade</string>
+    <string name="msg_sort_by_name">Nome</string>
+    <string name="msg_group_by_unread_on_top">Não lidas no topo</string>
+    <string name="msg_group_by_type">Agrupar por tipo</string>
+    <string name="msg_group_by_favorites">Agrupar por favoritos</string>
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoritos</string>
-    <string name="header_channel">Canais</string>
+    <string name="msg_channels">Canais</string>
+    <string name="msg_users">Usuários</string>
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Grupos Privados</string>
     <string name="header_direct_messages">Mensagens diretas</string>
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Desconhecido</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Editar mensagem compartilhada</string>
     <string name="notif_action_reply_hint">RESPONDER</string>
     <string name="notif_error_sending">Falha ao enviar a mensagem.</string>
@@ -338,6 +362,8 @@
 
     <!-- User Details -->
     <string name="timezone">Fuso horário</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Enviar</string>
diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml
index 4835a7760b..9ff0bea9be 100644
--- a/app/src/main/res/values-pt-rPT/strings.xml
+++ b/app/src/main/res/values-pt-rPT/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Entre no seu servidor</string>
     <string name="title_log_in">Entrar</string>
-    <string name="title_share_the_app">Partilhe a Aplicação</string>
     <string name="title_register_username">Registe um utilizador</string>
     <string name="title_reset_password">Reponha a palavra-passe</string>
     <string name="title_sign_up">Inscreva-se</string>
@@ -17,12 +16,12 @@
     <string name="title_preferences">Preferências</string>
     <string name="title_change_password">Alterar palavra-passe</string>
     <string name="title_rate_us">Avalie-nos</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_admin_panel">Painel de Administração</string>
     <string name="title_password">Alterar palavra-passe</string>
     <string name="title_update_profile">Actualizar perfil</string>
-    <string name="title_about">Acerca</string>
     <string name="title_create_channel">Criar Canal</string>
-    <string name="title_licence">Licença</string>
+    <string name="title_license">Licença</string>
     <string name="title_are_you_sure">Tem a certeza?</string>
     <string name="title_channel_details">Detalhes do Canal</string>
     <string name="title_topic">Tópico</string>
@@ -35,6 +34,7 @@
     <string name="action_terms_of_service">Termos do Serviço</string>
     <string name="action_privacy_policy">Política de Privacidade</string>
     <string name="action_search">Pesquisar</string>
+    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
     <string name="action_update">Actualizar</string>
     <string name="action_settings">Definições</string>
     <string name="action_create_channel">Criar canal</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">Enviar um ficheiro</string>
     <string name="action_confirm_password">Confirme a alteração da palavra-passe</string>
     <string name="action_join_chat">Entre no chat</string>
-    <string name="action_add_account">Adicionar conta</string>
-    <string name="action_online">Online</string>
-    <string name="action_away">Ausente</string>
-    <string name="action_busy">Ocupado</string>
-    <string name="action_invisible">Invisível</string>
+    <string name="msg_online">Online</string>
+    <string name="msg_away">Ausente</string>
+    <string name="msg_busy">Ocupado</string>
+    <string name="msg_invisible">Invisível</string>
     <string name="action_drawing">A desenhar</string>
     <string name="action_save_to_gallery">Guardar na galeria</string>
     <string name="action_select_photo_from_gallery">Selecione a foto da galeria</string>
@@ -58,26 +57,50 @@
     <string name="action_create_server">Crie um novo servidor</string>
     <string name="action_register">Registar</string>
     <string name="action_confirm">Confirmar</string>
-    <string name="action_delete_account">Apagar conta</string>
+    <string name="action_favorite">Marcar chat como favorito</string>
+    <string name="action_remove_favorite">Desmarcar chat como favorito</string>
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">Preferências</item>
-        <item name="item_password">Alterar palavra-passe</item>
-        <item name="change_language">Alterar idioma</item>
-        <item name="item_share_app">Partilhe a aplicação</item>
-        <item name="item_rate_us">Avalie-nos</item>
-        <item name="item_contact_us">Contacte-nos</item>
-        <item name="item_licence">Licença</item>
-        <item name="item_about">Acerca</item>
-    </string-array>
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">Enviar estatísticas anónimas para ajudar a melhorar esta aplicação</string>
+    <string name="msg_do_not_send_analytics_tracking">Não enviar estatísticas anónimas para ajudar a melhorar esta aplicação</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Não aplicável, visto ser uma versão FOSS</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
 
+    <string-array name="languages"> <!-- TODO Add translations -->
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
+    </string-array>
     <!-- Regular information messages -->
     <string name="msg_generic_error">Lamentamos, ocorreu um erro, tente novamente</string>
     <string name="msg_no_data_to_display">Sem dados para mostrar</string>
     <string name="msg_check_this_out">Experimente isto</string>
     <string name="msg_share_using">Partilhe usando</string>
-    <string name="msg_profile_update_successfully">Perfil actualizado com sucesso</string>
+    <string name="msg_profile_updated_successfully">Perfil actualizado com sucesso</string>
     <string name="msg_username">utilizador</string>
     <string name="msg_username_or_email">Utilizador ou e-mail</string>
     <string name="msg_password">Palavra-passe</string>
@@ -86,26 +109,27 @@
     <string name="msg_avatar_url">URL do avatar</string>
     <string name="msg_or_continue_using_social_accounts">Ou continue utilizando uma conta social</string>
     <string name="msg_new_user">Novo utilizador? %1$s</string>
-    <string name="msg_forgot__your_password">Esqueceu a sua palavra-passe?</string>
+    <string name="msg_forgot_your_password">Esqueceu a sua palavra-passe?</string>
     <string name="msg_reset">Repor</string>
     <string name="msg_check_your_email_to_reset_your_password">E-mail enviado! Verifique a sua caixa de entrada para repor a sua palavra-passe.</string>
     <string name="msg_invalid_email">Por favor introduza um endereço de e-mail válido</string>
     <string name="msg_new_user_agreement">Ao prosseguir, você concorda com os nossos \n%1$s e %2$s</string>
-    <string name="msg_more_than_ninety_nine_unread_messages" translatable="false">99+</string>
     <string name="msg_yesterday">Ontem</string>
     <string name="msg_today">Hoje</string>
     <string name="msg_message">Mensagem</string>
+    <string name="msg_video_call">Video call</string> <!-- TODO Translate -->
+    <string name="msg_join_video_call">Join video call</string> <!-- TODO Translate -->
     <string name="msg_this_room_is_read_only">Esta sala é apenas de leitura</string>
     <string name="msg_invalid_2fa_code">Código 2FA inválido</string>
     <string name="msg_invalid_file">Ficheiro inválido</string>
     <string name="msg_invalid_server_url">URL de servidor inválido</string>
     <string name="msg_content_description_log_in_using_facebook">Entre utilizando Facebook</string>
-    <string name="msg_content_description_log_in_using_github">Entre utilizando Github</string>
+    <string name="msg_content_description_log_in_using_github">Entre utilizando GitHub</string>
     <string name="msg_content_description_log_in_using_google">Entre utilizando Google</string>
     <string name="msg_content_description_log_in_using_linkedin">Entre utilizando LinkedIn</string>
     <string name="msg_content_description_log_in_using_meteor">Entre utilizando Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Entre utilizando Twitter</string>
-    <string name="msg_content_description_log_in_using_gitlab">Entre utilizando Gitlab</string>
+    <string name="msg_content_description_log_in_using_gitlab">Entre utilizando GitLab</string>
     <string name="msg_content_description_log_in_using_wordpress">Entre utilizando WordPress</string>
     <string name="msg_content_description_send_message">Enviar mensagem</string>
     <string name="msg_content_description_show_more_login_options">Mostrar mais opções de entrada</string>
@@ -154,13 +178,13 @@
     <string name="msg_login_with_email">Entre com <b>e-mail</b></string>
     <string name="msg_create_account">Crie uma conta</string>
     <string name="msg_continue_with_facebook">Continue com <b>Facebook</b></string>
-    <string name="msg_continue_with_github">Continue com <b>Github</b></string>
+    <string name="msg_continue_with_github">Continue com <b>GitHub</b></string>
     <string name="msg_continue_with_google">Continue com <b>Google</b></string>
-    <string name="msg_continue_with_linkedin">Continue com <b>Linkedin</b></string>
+    <string name="msg_continue_with_linkedin">Continue com <b>LinkedIn</b></string>
     <string name="msg_continue_with_gitlab">Continue com <b>GitLab</b></string>
     <string name="msg_continue_with_wordpress">Continue com <b>WordPress</b></string>
     <string name="msg_two_factor_authentication">Autenticação 2FA</string>
-    <string name="msg__your_2fa_code">Qual é o seu código 2FA?</string>
+    <string name="msg_your_2fa_code">Qual é o seu código 2FA?</string>
     <string name="msg_permalink_copied">Link permanente copiado</string>
     <string name="msg_no_topic">Nenhum tópico adicionado</string>
     <string name="msg_no_announcement">Nenhum anúncio adicionado</string>
@@ -173,6 +197,12 @@
         <item quantity="one">%1$s reagiu com %2$s</item>
         <item quantity="other">%1$s reagiram com %2$s</item>
     </plurals>
+    <string name="msg_credentials_saved_successfully">Credentials saved successfully</string> <!-- TODO Translate -->
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
+    <string name="msg_server">Server</string> <!-- TODO Translate -->
+    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
+    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Privado</string>
@@ -192,12 +222,6 @@
     <string name="msg_view_less">mostrar menos</string>
     <string name="msg_muted_on_this_channel">Você está silenciado neste canal</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Acompanhamento de análise</string>
-    <string name="msg_send_analytics_tracking">Enviar estatísticas anónimas para ajudar a melhorar esta aplicação</string>
-    <string name="msg_do_not_send_analytics_tracking">Não enviar estatísticas anónimas para ajudar a melhorar esta aplicação</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Não aplicável, visto ser uma versão FOSS</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">Nome da sala alterado para: %1$s por %2$s</string>
     <string name="message_user_added_by">Utilizador %1$s adicionado por %2$s</string>
@@ -211,8 +235,7 @@
     <string name="message_unmuted">Utilizador %2$s removeu o silêncio de %1$s</string>
     <string name="message_role_add">%3$s deu estatuto de %2$s a %1$s</string>
     <string name="message_role_removed">%3$s retirou o estatuto de %2$s a %1$s</string>
-    <string name="action_favorite">Marcar chat como favorito</string>
-    <string name="action_remove_favorite">Desmarcar chat como favorito</string>
+    <string name="message_video_call_started">Video call started by %1$s</string> <!-- TODO Translate -->
 
     <!-- Message actions -->
     <string name="action_msg_reply">Responder</string>
@@ -275,7 +298,7 @@
     <string name="status_disconnecting">A desligar</string>
     <string name="status_waiting">A ligar dentro de %d segundos</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notifica todos os utilizadores nesta sala</string>
     <string name="suggest_here_description">Notifica os utilizadores activos nesta sala</string>
 
@@ -302,28 +325,31 @@
     <string name="Guggy_Command_Description">Gera um GIF baseado no texto fornecido</string>
     <string name="Slash_Topic_Description">Define o tópico</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Nenhum emojis recente</string>
     <string name="alert_title_default_skin_tone">Tom de pele padrão</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">Ordenar</string>
-    <string name="dialog_sort_title">Ordenar por</string>
-    <string name="dialog_sort_by_alphabet">Alfabeticamente</string>
-    <string name="dialog_sort_by_activity">Actividade</string>
-    <string name="dialog_group_by_type">Agrupar por tipo</string>
-    <string name="dialog_group_favourites">Agrupar favoritos</string>
-    <string name="chatroom_header">Cabeçalho</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
+    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
+    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
+    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
+    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favoritos</string>
-    <string name="header_channel">Canais</string>
+    <string name="msg_channels">Canais</string>
+    <string name="msg_users">Users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Grupos Privados</string>
     <string name="header_direct_messages">Mensagens Directas</string>
     <string name="header_live_chats">Chats ao Vivo</string>
     <string name="header_unknown">Desconhecido</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Editar mensagem partilhada</string>
     <string name="notif_action_reply_hint">RESPONDER</string>
     <string name="notif_error_sending">A resposta falhou. Tente novamente.</string>
@@ -332,11 +358,10 @@
     <string name="message_information_title">Informação da Mensagem</string>
     <string name="message_room_changed_privacy">Tipo de sala alterado para: %1$s por %2$s</string>
 
-    <string name="foss" translatable="false">(FOSS)</string>
-
     <!-- User Details -->
     <string name="timezone">Fuso Horário</string>
-    <string name="status">Estado</string>
+    <string name="status">Estado: %1$s</string>
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Enviar</string>
diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml
index ecba490793..9f53bec231 100644
--- a/app/src/main/res/values-ru-rRU/strings.xml
+++ b/app/src/main/res/values-ru-rRU/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Ваш сервер</string>
     <string name="title_log_in">Войти</string>
-    <string name="title_share_the_app">добавить приложение</string>
     <string name="title_register_username">Зарегистрировать имя</string>
     <string name="title_reset_password">Сброс пароля</string>
     <string name="title_sign_up">Зарегистрироваться</string>
@@ -20,13 +19,13 @@
     <string name="title_admin_panel">Панель админа</string>
     <string name="title_password">Изменить пароль</string>
     <string name="title_update_profile">Обновить профиль</string>
-    <string name="title_about">О программе</string>
+    <string name="title_choose_language">Изменить язык</string>
     <string name="title_create_channel">Создать новый канал</string>
     <string name="title_channel_details">О канале</string>
     <string name="title_topic">Тема</string>
     <string name="title_announcement">Объявление</string>
     <string name="title_description">Описание</string>
-    <string name="title_licence">Лицензия</string>
+    <string name="title_license">Лицензия</string>
     <string name="title_are_you_sure">Вы уверены?</string>
 
     <!-- Actions -->
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">Использовать это имя</string>
     <string name="action_terms_of_service">Условия использования</string>
     <string name="action_privacy_policy">Политика конфиденциальности</string>
+    <string name="action_new_channel">Новый канал</string>
     <string name="action_search">Поиск</string>
     <string name="action_update">Обновить</string>
     <string name="action_settings">Настройки</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">Прикрепить файл</string>
     <string name="action_confirm_password">Подтверждение изменения пароля</string>
     <string name="action_join_chat">Присоединиться к чату</string>
-    <string name="action_add_account">Добавить аккаунт</string>
-    <string name="action_online">Онлайн</string>
-    <string name="action_away">Отошел</string>
-    <string name="action_busy">Занят</string>
-    <string name="action_invisible">Невидимый</string>
+    <string name="msg_online">Онлайн</string>
+    <string name="msg_away">Отошел</string>
+    <string name="msg_busy">Занят</string>
+    <string name="msg_invisible">Невидимый</string>
     <string name="action_drawing">Рисунок</string>
     <string name="action_save_to_gallery">Сохранить в галерею</string>
     <string name="action_select_photo_from_gallery">Выбрать из галереи</string>
@@ -58,20 +57,43 @@
     <string name="action_create_server">Создать новый сервер</string>
     <string name="action_register">Зарегистрировать</string>
     <string name="action_confirm">Подтвердить</string>
-    <string name="action_delete_account">Удалить аккаунт</string>
     <string name="action_favorite">В избранное</string>
     <string name="action_remove_favorite">Удалить из избранного</string>
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">Персональные</item>
-        <item name="item_password">Изменить пароль</item>
-        <item name="change_language">Изменить язык</item>
-        <item name="item_share_app">Поделиться приложением</item>
-        <item name="item_rate_us">Оцените нас</item>
-        <item name="item_contact_us">Связаться с нами</item>
-        <item name="item_licence">Лицензия</item>
-        <item name="item_about">О программе</item>
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Связаться с нами</string>
+    <string name="msg_language">Изменить язык</string>
+    <string name="msg_review_this_app">Оставить отзыв</string>
+    <string name="msg_share_this_app">Поделиться приложением</string>
+    <string name="msg_administration">Панель админа</string>
+    <string name="msg_license">Лицензия</string>
+    <string name="msg_app_version">Версия программы: %1$s (%2$d)</string>
+    <string name="msg_server_version">Версия сервера: %1$s</string>
+    <string name="msg_send_analytics">Отправка аналитики</string>
+    <string name="msg_send_analytics_tracking">Отправлять анонимную статистику для улучшения приложения.</string>
+    <string name="msg_do_not_send_analytics_tracking">Не отправлять анонимную статистику для улучшения приложения</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Не применимо, так как это FOSS версия</string>
+    <string name="msg_logout_from_rocket_chat">Выйти из Rocket.Chat</string>
+    <string name="msg_delete_account">Удалить аккаунт</string>
+    <string name="msg_change_status">Изменить статус</string>
+
+    <string-array name="languages">
+        <item>Английский</item>
+        <item>Арабский</item>
+        <item>Немецкий</item>
+        <item>Испанский</item>
+        <item>Персидский</item>
+        <item>Французский</item>
+        <item>Хинди (IN)</item>
+        <item>Итальянский</item>
+        <item>Японский</item>
+        <item>Португальский (BR)</item>
+        <item>Португальский (PT)</item>
+        <item>Русский (RU)</item>
+        <item>Турецкий</item>
+        <item>Украинский</item>
+        <item>Китайский (CN)</item>
+        <item>Китайский (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -79,7 +101,7 @@
     <string name="msg_no_data_to_display">Нет данных для отображения</string>
     <string name="msg_check_this_out">Проверь это</string>
     <string name="msg_share_using">Совместное использование</string>
-    <string name="msg_profile_update_successfully">Профиль успешно обновлен</string>
+    <string name="msg_profile_updated_successfully">Профиль успешно обновлен</string>
     <string name="msg_username">имя пользователя</string>
     <string name="msg_username_or_email">имя пользователя или e-mail</string>
     <string name="msg_password">пароль</string>
@@ -88,7 +110,7 @@
     <string name="msg_avatar_url">URL аватара</string>
     <string name="msg_or_continue_using_social_accounts">Или продолжить, используя социальные учетные записи</string>
     <string name="msg_new_user">Новый пользователь? %1$s</string>
-    <string name="msg_forgot__your_password">Забыли пароль?</string>
+    <string name="msg_forgot_your_password">Забыли пароль?</string>
     <string name="msg_reset">Сброс</string>
     <string name="msg_check_your_email_to_reset_your_password">Письмо отправлено! Проверьте свой почтовый ящик, чтобы сбросить пароль.</string>
     <string name="msg_invalid_email">Введите действующий e-mail</string>
@@ -103,12 +125,12 @@
     <string name="msg_invalid_file">Неверный файл</string>
     <string name="msg_invalid_server_url">Неверный URL-адрес сервера.</string>
     <string name="msg_content_description_log_in_using_facebook">Войти с помощью Facebook</string>
-    <string name="msg_content_description_log_in_using_github">Войти с помощью Github</string>
+    <string name="msg_content_description_log_in_using_github">Войти с помощью GitHub</string>
     <string name="msg_content_description_log_in_using_google">Войти с помощью Google</string>
-    <string name="msg_content_description_log_in_using_linkedin">Войти с помощью Linkedin</string>
+    <string name="msg_content_description_log_in_using_linkedin">Войти с помощью LinkedIn</string>
     <string name="msg_content_description_log_in_using_meteor">Войти с помощью Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Войти с помощью Twitter</string>
-    <string name="msg_content_description_log_in_using_gitlab">Войти с помощью Gitlab</string>
+    <string name="msg_content_description_log_in_using_gitlab">Войти с помощью GitLab</string>
     <string name="msg_content_description_log_in_using_wordpress">Войти с помощью WordPress</string>
     <string name="msg_content_description_send_message">Отправить сообщение</string>
     <string name="msg_content_description_show_more_login_options">Больше параметров входа</string>
@@ -156,13 +178,13 @@
     <string name="msg_login_with_email">Войти с помощью <b>e-mail</b></string>
     <string name="msg_create_account">Создать аккаунт</string>
     <string name="msg_continue_with_facebook">Войти с помощью <b>Facebook</b></string>
-    <string name="msg_continue_with_github">Войти с помощью <b>Github</b></string>
+    <string name="msg_continue_with_github">Войти с помощью <b>GitHub</b></string>
     <string name="msg_continue_with_google">Войти с помощью <b>Google</b></string>
-    <string name="msg_continue_with_linkedin">Войти с помощью <b>Linkedin</b></string>
+    <string name="msg_continue_with_linkedin">Войти с помощью <b>LinkedIn</b></string>
     <string name="msg_continue_with_gitlab">Войти с помощью <b>GitLab</b></string>
     <string name="msg_continue_with_wordpress">Войти с помощью <b>WordPress</b></string>
     <string name="msg_two_factor_authentication">Двухфакторная аутентификация</string>
-    <string name="msg__your_2fa_code">Ваш код 2FA?</string>
+    <string name="msg_your_2fa_code">Ваш код 2FA?</string>
     <string name="msg_view_more">больше</string>
     <string name="msg_view_less">меньше</string>
     <string name="msg_permalink_copied">Ссылка скопирована</string>
@@ -180,6 +202,11 @@
         <item quantity="many">%1$s реагируют с %2$s</item>
     </plurals>
     <string name="msg_credentials_saved_successfully">Учетные данные успешно сохранены</string>
+    <string name="msg_camera_permission_denied">Необходимо разрешение на использование камеры</string>
+    <string name="msg_storage_permission_denied">Необходимо разрешение на использование хранилища</string>
+    <string name="msg_server">Сервер</string>
+    <string name="msg_add_new_server">Добавить новый сервер</string>
+    <string name="msg_directory">Каталог</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватный</string>
@@ -193,12 +220,6 @@
     <string name="msg_member_not_found">Пользователь не найден</string>
     <string name="msg_channel_created_successfully">Канал создан успешно</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Отслеживание аналитики</string>
-    <string name="msg_send_analytics_tracking">Отправлять анонимную статистику для улучшения приложения.</string>
-    <string name="msg_do_not_send_analytics_tracking">Не отправлять анонимную статистику для улучшения приложения</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Не применимо, так как это FOSS версия</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">%2$s изменил название канала на %1$s</string>
     <string name="message_user_added_by">Пользователь %1$s добавлен пользователем %2$s</string>
@@ -275,7 +296,7 @@
     <string name="status_disconnecting">Отключаемся…</string>
     <string name="status_waiting">Соединение через %d секунд</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Уведомить всех в этом чате</string>
     <string name="suggest_here_description">Уведомить всех активных пользователей в этом чате</string>
 
@@ -302,28 +323,31 @@
     <string name="Guggy_Command_Description">Создает gif на основе предоставленного текста</string>
     <string name="Slash_Topic_Description">Задать тему</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Пусто</string>
     <string name="alert_title_default_skin_tone">Тон кожи по умолчанию</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">Сортировать</string>
-    <string name="dialog_sort_title">Сортировать по</string>
-    <string name="dialog_sort_by_alphabet">По алфавиту</string>
-    <string name="dialog_sort_by_activity">По активности</string>
-    <string name="dialog_group_by_type">Группировать по типу</string>
-    <string name="dialog_group_favourites">Группировать избранное</string>
-    <string name="chatroom_header">Заголовок</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Сортировать по %1$s</string>
+    <string name="msg_sort_by">Сортировать по</string>
+    <string name="msg_sort_by_activity">Активности</string>
+    <string name="msg_sort_by_name">Имени</string>
+    <string name="msg_group_by_unread_on_top">Непрочитанные сверху</string>
+    <string name="msg_group_by_type">Группировать по типу</string>
+    <string name="msg_group_by_favorites">Группировать по избранному</string>
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Избранные</string>
-    <string name="header_channel">Каналы</string>
+    <string name="msg_channels">Каналы</string>
+    <string name="msg_users">Пользователи</string>
+    <string name="msg_search_for_global_users">Поиск глобальных пользователей</string>
+    <string name="msg_search_for_global_users_description">При активации станет возможен поиск пользователей на других серверах.</string>
     <string name="header_private_groups">Приватные каналы</string>
     <string name="header_direct_messages">Личная переписка</string>
     <string name="header_live_chats">Живые чаты</string>
     <string name="header_unknown">Неизвестные</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Редактировать сообщение</string>
     <string name="notif_action_reply_hint">ОТВЕТИТЬ</string>
     <string name="notif_error_sending">Не удалось ответить. Пожалуйста, попробуйте еще раз.</string>
@@ -335,6 +359,8 @@
 
     <!-- User Details -->
     <string name="timezone">Часовой пояс</string>
+    <string name="status">Статус: %1$s</string>
+    <string name="user_detail_status">Статус</string>
 
     <!-- Report -->
     <string name="submit">Отправить</string>
diff --git a/app/src/main/res/values-tr/strings.xml b/app/src/main/res/values-tr/strings.xml
index 738f2e3289..081e4c4e0e 100644
--- a/app/src/main/res/values-tr/strings.xml
+++ b/app/src/main/res/values-tr/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Sunucunuza Bağlantı Kurun</string>
     <string name="title_log_in">Giriş Yapın</string>
-    <string name="title_share_the_app">uygulamayı Paylaş</string>
     <string name="title_register_username">Kullanıcı Adıyla Kaydolun</string>
     <string name="title_reset_password">Şifre Sıfırlama</string>
     <string name="title_sign_up">Kayıt Olun</string>
@@ -20,9 +19,9 @@
     <string name="title_admin_panel">Yönetici Paneli</string>
     <string name="title_password">Şifrenizi Değiştirin</string>
     <string name="title_update_profile">Profilinizi Düzenleyin</string>
-    <string name="title_about">Hakkında</string>
     <string name="title_create_channel">Yeni Kanal Oluştur</string>
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
+    <string name="title_license">License</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
     <string name="title_topic">konu</string>
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">Bu kullanıcı adını kullan</string>
     <string name="action_terms_of_service">Kullanım Şartları</string>
     <string name="action_privacy_policy">Gizlilik Sözleşmesi</string>
+    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
     <string name="action_search">Ara</string>
     <string name="action_update">Güncelle</string>
     <string name="action_settings">Ayarlar</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">Attach a file</string> <!-- TODO Add translation -->
     <string name="action_confirm_password">Şifre Değişikliğini Onaylayın</string>
     <string name="action_join_chat">Sohbete Bağlan</string>
-    <string name="action_add_account">Hesap Ekle</string>
-    <string name="action_online">Çevrimiçi</string>
-    <string name="action_away">Uzakta</string>
-    <string name="action_busy">Meşgul</string>
-    <string name="action_invisible">Görünmez</string>
+    <string name="msg_online">Çevrimiçi</string>
+    <string name="msg_away">Uzakta</string>
+    <string name="msg_busy">Meşgul</string>
+    <string name="msg_invisible">Görünmez</string>
     <string name="action_drawing">Çizim</string>
     <string name="action_save_to_gallery">Galeriye kaydet</string>
     <string name="action_select_photo_from_gallery">Galeriden resim seç</string>
@@ -58,20 +57,43 @@
     <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
     <string name="action_register">Register</string> <!-- TODO Add translation -->
     <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
-    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
     <string name="action_favorite">Favorite</string> <!-- TODO Add translation -->
     <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Add translation -->
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="change_language">Change language</item> <!-- TODO Add translation -->
-        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
-        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
-        <item name="item_about">About</item> <!-- TODO Add translation -->
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">Uygulamanın gelişmesine katkıda bulunmak için anonim istatistik bilgisi gönder</string>
+    <string name="msg_do_not_send_analytics_tracking">Uygulamanın gelişmesine katkıda bulunmak için anonim istatistik bilgisi gönderme</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">FOSS sürümü olduğundan uygulanabilir değil</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
+
+    <string-array name="languages"> <!-- TODO Add translations -->
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -79,7 +101,7 @@
     <string name="msg_no_data_to_display">Görüntülenecek veri bulunmamaktadır.</string>
     <string name="msg_check_this_out">bunu kontrol et</string>
     <string name="msg_share_using">kullanarak paylaş</string>
-    <string name="msg_profile_update_successfully">Profil bilgileri başarıyla güncellenmiştir.</string>
+    <string name="msg_profile_updated_successfully">Profil bilgileri başarıyla güncellenmiştir.</string>
     <string name="msg_username">kullanıcı adı</string>
     <string name="msg_username_or_email">kullanıcı adı veya eposta</string>
     <string name="msg_password">şifre</string>
@@ -88,7 +110,7 @@
     <string name="msg_avatar_url">avatar URL</string>
     <string name="msg_or_continue_using_social_accounts">Veya sosyal medya hesaplarınızdan birini kullanarak devam edin</string>
     <string name="msg_new_user">Yeni kullanıcı? %1$s</string>
-    <string name="msg_forgot__your_password">Forgot your password?</string> <!-- TODO Add translation -->
+    <string name="msg_forgot_your_password">Forgot your password?</string> <!-- TODO Add translation -->
     <string name="msg_reset">Sıfırla</string>
     <string name="msg_check_your_email_to_reset_your_password">Eposta gönderilmiştir! Şifrenizi sıfırlamak için eposta kutunuzu kontrol ediniz.</string>
     <string name="msg_invalid_email">Lütfen, geçerli bir eposta adresi giriniz</string>
@@ -103,13 +125,13 @@
     <string name="msg_invalid_file">Geçersiz dosya</string>
     <string name="msg_invalid_server_url">Geçersiz sunucu adresi</string>
     <string name="msg_content_description_log_in_using_facebook">Facebook Hesabı ile Giriş Yap</string>
-    <string name="msg_content_description_log_in_using_github">Github Hesabı ile Giriş Yap</string>
+    <string name="msg_content_description_log_in_using_github">GitHub Hesabı ile Giriş Yap</string>
     <string name="msg_content_description_log_in_using_google">Google Hesabı ile Giriş Yap</string>
     <string name="msg_content_description_log_in_using_linkedin">LinkedIn Hesabı ile Giriş Yap</string>
     <string name="msg_content_description_log_in_using_meteor">Meteor Hesabı ile Giriş Yap</string>
     <string name="msg_content_description_log_in_using_twitter">Twitter Hesabı ile Giriş Yap</string>
-    <string name="msg_content_description_log_in_using_gitlab">Gitlab Hesabı ile Giriş Yap</string>
-    <string name="msg_content_description_log_in_using_wordpress">Wordpress Hesabı ile Giriş Yap</string>
+    <string name="msg_content_description_log_in_using_gitlab">GitLab Hesabı ile Giriş Yap</string>
+    <string name="msg_content_description_log_in_using_wordpress">WordPress Hesabı ile Giriş Yap</string>
     <string name="msg_content_description_send_message">Mesaj gönder</string>
     <string name="msg_content_description_show_more_login_options">Show more login options</string> <!-- TODO Add translation -->
     <string name="msg_content_description_show_attachment_options">Dosya eki seçeneklerini göster</string>
@@ -157,13 +179,15 @@
     <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
     <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
     <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_github">Continue with <b>Github</b></string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_github">Continue with <b>GitHub</b></string> <!-- TODO Add translation -->
     <string name="msg_continue_with_google">Continue with <b>Google</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_linkedin">Continue with <b>LinkedIn</b></string> <!-- TODO Add translation -->
     <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string> <!-- TODO Add translation -->
     <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
     <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
-    <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
+    <string name="msg_your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Özel</string>
@@ -178,7 +202,7 @@
     <string name="msg_channel_created_successfully">Kanal başarıyla oluşturuldu</string>
     <string name="msg_message_copied">Mesaj kopyalandı</string>
     <string name="msg_delete_message">Mesajı Sil</string>
-    <string name="msg_delete_description">Bu mesajı silmek istediğinizden emin misiniz</string>
+    <string name="msg_delete_description">Bu mesajı silmek istediğinizden emin misiniz?</string>
     <string name="msg_view_more">Daha fazla göster</string>
     <string name="msg_view_less">Daha az göster</string>
     <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
@@ -195,12 +219,9 @@
         <item quantity="other">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
     </plurals>
     <string name="msg_credentials_saved_successfully">Kimlik bilgileri başarıyla kaydedildi</string>
-
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">İstatistik takibi</string>
-    <string name="msg_send_analytics_tracking">Uygulamanın gelişmesine katkıda bulunmak için anonim istatistik bilgisi gönder</string>
-    <string name="msg_do_not_send_analytics_tracking">Uygulamanın gelişmesine katkıda bulunmak için anonim istatistik bilgisi gönderme</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">FOSS sürümü olduğundan uygulanabilir değil</string>
+    <string name="msg_server">Server</string> <!-- TODO Translate -->
+    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
+    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
 
     <!-- System messages -->
     <string name="message_room_name_changed">Oda ismi %2$s\'dan %1$s\'a değiştirildi</string>
@@ -279,7 +300,7 @@
     <string name="status_disconnecting">Bağlantı kesiliyor</string>
     <string name="status_waiting">%d saniye içinde bağlanılacak</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Bu odadaki herkese bildir</string>
     <string name="suggest_here_description">Bu odadaki aktif kullanıcılara bildir</string>
 
@@ -306,28 +327,31 @@
     <string name="Guggy_Command_Description">Belirlenen yazıya göre gif oluşturur</string>
     <string name="Slash_Topic_Description">Konuyu belirle</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Son kullanılan emoji bulunmamaktadır</string>
     <string name="alert_title_default_skin_tone">Varsayılan tasarım tonu</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">Sırala</string>
-    <string name="dialog_sort_title">Sırala</string>
-    <string name="dialog_sort_by_alphabet">Alfabetik</string>
-    <string name="dialog_sort_by_activity">Aktiviteye Göre</string>
-    <string name="dialog_group_by_type">Türüne göre grupla</string>
-    <string name="dialog_group_favourites">Favorileri grupla</string>
-    <string name="chatroom_header">Başlık</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
+    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
+    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
+    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
+    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
-    <string name="header_channel">Kanallar</string>
+    <string name="msg_channels">Kanallar</string>
+    <string name="msg_users">Users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Gizli Gruplar</string>
     <string name="header_direct_messages">Direkt Mesajlar</string>
     <string name="header_live_chats">Canlı Sohbetler</string>
     <string name="header_unknown">Bilinmeyen</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Paylaşılan mesajı düzenle</string>
     <string name="notif_action_reply_hint">YANITLA</string>
     <string name="notif_error_sending">Yanıtlama başarısız oldu. Lütfen, tekrar deneyiniz.</string>
@@ -338,6 +362,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string> <!--TODO - Add proper translation-->
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!--TODO - Add proper translation-->
diff --git a/app/src/main/res/values-uk/strings.xml b/app/src/main/res/values-uk/strings.xml
index f1ab1033e2..56dcda881c 100644
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">Ваш сервер</string>
     <string name="title_log_in">Увійти</string>
-    <string name="title_share_the_app">поділитися прикладом</string>
     <string name="title_register_username">Зареєструвати ім\'я</string>
     <string name="title_reset_password">Відновлення паролю</string>
     <string name="title_sign_up">Зареєструватися</string>
@@ -20,9 +19,9 @@
     <string name="title_admin_panel">Панель адміністратора</string>
     <string name="title_password">Змінити пароль</string>
     <string name="title_update_profile">Оновити профіль</string>
-    <string name="title_about">"Про програму"</string>
     <string name="title_create_channel">Створити новий канал</string>
-    <string name="title_licence">Licence</string> <!-- TODO Add translation -->
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
+    <string name="title_license">License</string> <!-- TODO Add translation -->
     <string name="title_are_you_sure">Are you sure?</string> <!-- TODO Add translation -->
     <string name="title_channel_details">Channel Details</string> <!-- TODO add translation -->
     <string name="title_topic">Тема</string>
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">Використати це ім\'я</string>
     <string name="action_terms_of_service">Умови використання</string>
     <string name="action_privacy_policy">Політика конфіденційності</string>
+    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
     <string name="action_search">Пошук</string>
     <string name="action_update">Оновити</string>
     <string name="action_settings">Налаштування</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">Attach a file</string> <!-- TODO Add translation -->
     <string name="action_confirm_password">Підтвердження зміни пароля</string>
     <string name="action_join_chat">Приєднатися до чату</string>
-    <string name="action_add_account">Додати аккаунт</string>
-    <string name="action_online">Онлайн</string>
-    <string name="action_away">Відійшов</string>
-    <string name="action_busy">Зайнятий</string>
-    <string name="action_invisible">Невидимий</string>
+    <string name="msg_online">Онлайн</string>
+    <string name="msg_away">Відійшов</string>
+    <string name="msg_busy">Зайнятий</string>
+    <string name="msg_invisible">Невидимий</string>
     <string name="action_drawing">Малюнок</string>
     <string name="action_save_to_gallery">Зберегти до галереї</string>
     <string name="action_select_photo_from_gallery">Вибрати з галереї</string>
@@ -58,20 +57,43 @@
     <string name="action_create_server">Create a new server</string> <!-- TODO Add translation -->
     <string name="action_register">Register</string> <!-- TODO Add translation -->
     <string name="action_confirm">Confirm</string> <!-- TODO Add translation -->
-    <string name="action_delete_account">Delete account</string> <!-- TODO Add translation -->
     <string name="action_favorite">Favorite</string> <!-- TODO Add translation -->
     <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Add translation -->
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item> <!-- TODO Add translation -->
-        <item name="item_password">Change password</item> <!-- TODO Add translation -->
-        <item name="change_language">Change language</item> <!-- TODO Add translation -->
-        <item name="item_share_app">Share app</item> <!-- TODO Add translation -->
-        <item name="item_rate_us">Rate us</item> <!-- TODO Add translation -->
-        <item name="item_contact_us">Contact us</item> <!-- TODO Add translation -->
-        <item name="item_licence">Licence</item> <!-- TODO Add translation -->
-        <item name="item_about">About</item> <!-- TODO Add translation -->
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">Надсилати анонімну статистику для покращення роботи програми</string>
+    <string name="msg_do_not_send_analytics_tracking">Не надсилати анонімну статистику для покращення роботи програми</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Недоступно у FOSS версії</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
+
+    <string-array name="languages"> <!-- TODO Add translations -->
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -79,7 +101,7 @@
     <string name="msg_no_data_to_display">Немає даних для відображення</string>
     <string name="msg_check_this_out">Перевір це</string>
     <string name="msg_share_using">поділитися використанням</string>
-    <string name="msg_profile_update_successfully">"Профіль оновлено успішно "</string>
+    <string name="msg_profile_updated_successfully">"Профіль оновлено успішно "</string>
     <string name="msg_username">Ім\'я користувача</string>
     <string name="msg_username_or_email">Ім\'я користувача або e-mail</string>
     <string name="msg_password">пароль</string>
@@ -88,7 +110,7 @@
     <string name="msg_avatar_url">URL аватара</string>
     <string name="msg_or_continue_using_social_accounts">Або продовжити, за допомогою акаунта у соціальних мережах</string>
     <string name="msg_new_user">Новий користувач? %1$s</string>
-    <string name="msg_forgot__your_password">Забули пароль? %1$s</string>
+    <string name="msg_forgot_your_password">Забули пароль? %1$s</string>
     <string name="msg_reset">Скинути</string>
     <string name="msg_check_your_email_to_reset_your_password">Лист було відправлено! Перевірте свою поштову скриньку, щоб скинути пароль.</string>
     <string name="msg_invalid_email">Введіть діючий e-mail</string>
@@ -103,13 +125,13 @@
     <string name="msg_invalid_file">Неправильний файл</string>
     <string name="msg_invalid_server_url">Неправильний URL-адреса сервера.</string>
     <string name="msg_content_description_log_in_using_facebook">Увійти за допомогою Facebook</string>
-    <string name="msg_content_description_log_in_using_github">Увійти за допомогою Github</string>
+    <string name="msg_content_description_log_in_using_github">Увійти за допомогою GitHub</string>
     <string name="msg_content_description_log_in_using_google">Увійти за допомогою Google</string>
-    <string name="msg_content_description_log_in_using_linkedin">Увійти за допомогою Linkedin</string>
+    <string name="msg_content_description_log_in_using_linkedin">Увійти за допомогою LinkedIn</string>
     <string name="msg_content_description_log_in_using_meteor">Увійти за допомогою Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Увійти за допомогою Twitter</string>
-    <string name="msg_content_description_log_in_using_gitlab">Увійти за допомогою Gitlab</string>
-    <string name="msg_content_description_log_in_using_wordpress">Увійти за допомогою Wordpress</string>
+    <string name="msg_content_description_log_in_using_gitlab">Увійти за допомогою GitLab</string>
+    <string name="msg_content_description_log_in_using_wordpress">Увійти за допомогою WordPress</string>
     <string name="msg_content_description_send_message">Надіслати повідомлення</string>
     <string name="msg_content_description_show_more_login_options">Show more login options</string> <!-- TODO Translate-->
     <string name="msg_content_description_show_attachment_options">Показати параметри долучення</string>
@@ -155,13 +177,13 @@
     <string name="msg_login_with_email">Login with <b>e-mail</b></string> <!-- TODO Add translation -->
     <string name="msg_create_account">Create an account</string> <!-- TODO Add translation -->
     <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_github">Continue with <b>Github</b></string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_github">Continue with <b>GitHub</b></string> <!-- TODO Add translation -->
     <string name="msg_continue_with_google">Continue with <b>Google</b></string> <!-- TODO Add translation -->
-    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string> <!-- TODO Add translation -->
+    <string name="msg_continue_with_linkedin">Continue with <b>LinkedIn</b></string> <!-- TODO Add translation -->
     <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string> <!-- TODO Add translation -->
     <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string> <!-- TODO Add translation -->
     <string name="msg_two_factor_authentication">Two-factor Authentication</string> <!-- TODO Add translation -->
-    <string name="msg__your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
+    <string name="msg_your_2fa_code">What’s your 2FA code?</string> <!-- TODO Add translation -->
     <string name="msg_view_more">view more</string> <!-- TODO - Add proper translation -->
     <string name="msg_view_less">view less</string> <!-- TODO - Add proper translation -->
     <string name="msg_permalink_copied">Permalink copied</string> <!-- TODO - Add proper translation -->
@@ -179,6 +201,11 @@
         <item quantity="many">%1$s reacted with %2$s</item> <!-- TODO - Add proper translation -->
     </plurals>
     <string name="msg_credentials_saved_successfully">Облікові дані було успішно збережено</string>
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
+    <string name="msg_server">Server</string> <!-- TODO Translate -->
+    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
+    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Приватний</string>
@@ -192,12 +219,6 @@
     <string name="msg_member_not_found">"Користувача не знайдено "</string>
     <string name="msg_channel_created_successfully">Канал був створений успішно</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Збір аналітики</string>
-    <string name="msg_send_analytics_tracking">Надсилати анонімну статистику для покращення роботи програми</string>
-    <string name="msg_do_not_send_analytics_tracking">Не надсилати анонімну статистику для покращення роботи програми</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Недоступно у FOSS версії</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">%2$s змінив назву каналу на %1$s</string>
     <string name="message_user_added_by">Користувач %2$s додав користувача %1$s</string>
@@ -274,7 +295,7 @@
     <string name="status_disconnecting">Відключаємося…</string>
     <string name="status_waiting">З\'єднання через %d секунд</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Повідомити всіх у цьому чаті</string>
     <string name="suggest_here_description">Повідомити всіх активних користувачів у цьому чаті</string>
 
@@ -301,28 +322,31 @@
     <string name="Guggy_Command_Description">Створює gif використовуючи наданий текст</string>
     <string name="Slash_Topic_Description">Встановити тему</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">Пусто</string>
     <string name="alert_title_default_skin_tone">Тон шкіри за замовчуванням</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">Сортувати</string>
-    <string name="dialog_sort_title">Сортувати за</string>
-    <string name="dialog_sort_by_alphabet">За алфавітом</string>
-    <string name="dialog_sort_by_activity">За активністю</string>
-    <string name="dialog_group_by_type">Групувати за типом</string>
-    <string name="dialog_group_favourites">Групувати обране</string>
-    <string name="chatroom_header">Заголовок</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
+    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
+    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
+    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
+    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
-    <string name="header_channel">Канали</string>
+    <string name="msg_channels">Канали</string>
+    <string name="msg_users">Users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">Приватні канали</string>
     <string name="header_direct_messages">Особисті повідомлення</string>
     <string name="header_live_chats">Живі чати</string>
     <string name="header_unknown">Невідомі</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Редагувати повідомлення</string>
     <string name="notif_action_reply_hint">ВІДПОВІСТИ</string>
     <string name="notif_error_sending">Не вдалося відповісти. Будь ласка, спробуйте ще раз.</string>
@@ -335,6 +359,8 @@
 
     <!-- User Details -->
     <string name="timezone">Timezone</string>
+    <string name="status">Status: %1$s</string> <!-- TODO Translate -->
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">Submit</string> <!-- TODO - Add proper translation -->
diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml
index 73f34fb82f..28b57edb7e 100644
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">登录您的服务器</string>
     <string name="title_log_in">登录</string>
-    <string name="title_share_the_app">分享App</string>
     <string name="title_register_username">注册用户</string>
     <string name="title_reset_password">重置密码</string>
     <string name="title_sign_up">登录</string>
@@ -20,11 +19,11 @@
     <string name="title_admin_panel">管理面板</string>
     <string name="title_password">修改密码</string>
     <string name="title_update_profile">更新资料</string>
-    <string name="title_about">关于</string>
     <string name="title_create_channel">新建频道</string>
-    <string name="title_licence">许可证</string>
+    <string name="title_license">许可证</string>
     <string name="title_are_you_sure">你确定?</string>
     <string name="title_channel_details">频道信息</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Add translation -->
     <string name="title_topic">主题</string>
     <string name="title_announcement">公告</string>
     <string name="title_description">描述</string>
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">使用这个用户名</string>
     <string name="action_terms_of_service">服务条款</string>
     <string name="action_privacy_policy">隐私政策</string>
+    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
     <string name="action_search">搜索</string>
     <string name="action_update">更新</string>
     <string name="action_settings">设置</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">添加附件</string>
     <string name="action_confirm_password">确认修改密码</string>
     <string name="action_join_chat">加入聊天</string>
-    <string name="action_add_account">添加账户</string>
-    <string name="action_online">在线</string>
-    <string name="action_away">离开</string>
-    <string name="action_busy">忙碌</string>
-    <string name="action_invisible">隐身</string>
+    <string name="msg_online">在线</string>
+    <string name="msg_away">离开</string>
+    <string name="msg_busy">忙碌</string>
+    <string name="msg_invisible">隐身</string>
     <string name="action_drawing">绘画</string>
     <string name="action_save_to_gallery">保存到图库</string>
     <string name="action_select_photo_from_gallery">从图库选照片</string>
@@ -58,20 +57,43 @@
     <string name="action_create_server">新建一个新服务器</string>
     <string name="action_register">注册</string>
     <string name="action_confirm">确定</string>
-    <string name="action_delete_account">删除账户</string>
     <string name="action_favorite">Favorite</string> <!-- TODO Add translation -->
     <string name="action_remove_favorite">Remove favorite</string> <!-- TODO Add translation -->
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">首选项</item>
-        <item name="item_password">修改密码</item>
-        <item name="change_language">更改语言</item>
-        <item name="item_share_app">分享app</item>
-        <item name="item_rate_us">给我们打分</item>
-        <item name="item_contact_us">联系我们</item>
-        <item name="item_licence">许可证</item>
-        <item name="item_about">关于</item>
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">发送匿名统计信息来帮助改善App</string>
+    <string name="msg_do_not_send_analytics_tracking">不要发送匿名统计信息，我不想帮组改善App</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">不适用，因为这事开源软件</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
+
+    <string-array name="languages"> <!-- TODO Add translations -->
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -79,7 +101,7 @@
     <string name="msg_no_data_to_display">没有数据显示</string>
     <string name="msg_check_this_out">检查这里</string>
     <string name="msg_share_using">分享使用</string>
-    <string name="msg_profile_update_successfully">资料更新成功</string>
+    <string name="msg_profile_updated_successfully">资料更新成功</string>
     <string name="msg_username">用户名</string>
     <string name="msg_username_or_email">用户名或邮箱</string>
     <string name="msg_password">密码</string>
@@ -88,7 +110,7 @@
     <string name="msg_avatar_url">头像网址</string>
     <string name="msg_or_continue_using_social_accounts">或继续使用社交账号</string>
     <string name="msg_new_user">新用户? %1$s</string>
-    <string name="msg_forgot__your_password">忘记密码?</string>
+    <string name="msg_forgot_your_password">忘记密码?</string>
     <string name="msg_reset">重置</string>
     <string name="msg_check_your_email_to_reset_your_password">邮件已发送!请根据邮件提示重置密码.</string>
     <string name="msg_invalid_email">请输入有效邮箱地址</string>
@@ -103,12 +125,12 @@
     <string name="msg_invalid_file">无效文件</string>
     <string name="msg_invalid_server_url">无效的服务器地址</string>
     <string name="msg_content_description_log_in_using_facebook">使用Facebook账户登录</string>
-    <string name="msg_content_description_log_in_using_github">使用Github账户登录</string>
+    <string name="msg_content_description_log_in_using_github">使用GitHub账户登录</string>
     <string name="msg_content_description_log_in_using_google">使用Google账户登录</string>
-    <string name="msg_content_description_log_in_using_linkedin">使用Linkedin账户登录</string>
+    <string name="msg_content_description_log_in_using_linkedin">使用LinkedIn账户登录</string>
     <string name="msg_content_description_log_in_using_meteor">使用Meteor账户登录</string>
     <string name="msg_content_description_log_in_using_twitter">使用Twitter账户登录</string>
-    <string name="msg_content_description_log_in_using_gitlab">使用Gitlab账户登录</string>
+    <string name="msg_content_description_log_in_using_gitlab">使用GitLab账户登录</string>
     <string name="msg_content_description_log_in_using_wordpress">使用WordPress账户登录</string>
     <string name="msg_content_description_send_message">发送消息</string>
     <string name="msg_content_description_show_more_login_options">显示更多登录选项</string>
@@ -154,13 +176,13 @@
     <string name="msg_login_with_email">使用<b>邮箱</b>登录</string>
     <string name="msg_create_account">新建账户</string>
     <string name="msg_continue_with_facebook">使用<b>Facebook</b>账号继续</string>
-    <string name="msg_continue_with_github">使用<b>Github</b>账号继续</string>
+    <string name="msg_continue_with_github">使用<b>GitHub</b>账号继续</string>
     <string name="msg_continue_with_google">使用<b>Google</b>账号继续</string>
-    <string name="msg_continue_with_linkedin">使用<b>Linkedin</b>账号继续</string>
+    <string name="msg_continue_with_linkedin">使用<b>LinkedIn</b>账号继续</string>
     <string name="msg_continue_with_gitlab">使用<b>GitLab</b>账号继续</string>
     <string name="msg_continue_with_wordpress">使用<b>WordPress</b>账号继续</string>
     <string name="msg_two_factor_authentication">两步认证</string>
-    <string name="msg__your_2fa_code">什么是2FA 码?</string>
+    <string name="msg_your_2fa_code">什么是2FA 码?</string>
     <string name="msg_permalink_copied">永久链接已拷贝</string>
     <string name="msg_no_topic">No topic</string> <!-- TODO Add translation -->
     <string name="msg_no_announcement">No announcement</string> <!-- TODO Add translation -->
@@ -174,6 +196,11 @@
         <item quantity="other">%1$s 使用了 %2$s</item>
     </plurals>
     <string name="msg_credentials_saved_successfully">凭证成功保存</string>
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
+    <string name="msg_server">Server</string> <!-- TODO Translate -->
+    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
+    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">隐私</string>
@@ -188,17 +215,11 @@
     <string name="msg_channel_created_successfully">成功建立频道</string>
     <string name="msg_message_copied">消息已拷贝</string>
     <string name="msg_delete_message">删除消息</string>
-    <string name="msg_delete_description">您确定要删除这条消息吗</string>
+    <string name="msg_delete_description">您确定要删除这条消息吗?</string>
     <string name="msg_view_more">显示更多</string>
     <string name="msg_view_less">显示更少</string>
     <string name="msg_muted_on_this_channel">您被禁言了</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">跟踪分析</string>
-    <string name="msg_send_analytics_tracking">发送匿名统计信息来帮助改善App</string>
-    <string name="msg_do_not_send_analytics_tracking">不要发送匿名统计信息，我不想帮组改善App</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">不适用，因为这事开源软件</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">频道名改为: %1$s by %2$s</string>
     <string name="message_user_added_by">%2$s增加了用户%1$s </string>
@@ -275,7 +296,7 @@
     <string name="status_disconnecting">断线中</string>
     <string name="status_waiting">连接持续了 %d 秒</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">提醒频道内所有人</string>
     <string name="suggest_here_description">提醒频道内在线的人</string>
 
@@ -302,28 +323,31 @@
     <string name="Guggy_Command_Description">根据文本生成GIF</string>
     <string name="Slash_Topic_Description">设定主题</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">没有最近的emojis</string>
     <string name="alert_title_default_skin_tone">默认皮肤颜色</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">排序</string>
-    <string name="dialog_sort_title">排序按</string>
-    <string name="dialog_sort_by_alphabet">字母</string>
-    <string name="dialog_sort_by_activity">活跃</string>
-    <string name="dialog_group_by_type">按类型分组</string>
-    <string name="dialog_group_favourites">收藏分组</string>
-    <string name="chatroom_header">头部</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
+    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
+    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
+    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
+    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
-    <string name="header_channel">频道</string>
+    <string name="msg_channels">频道</string>
+    <string name="msg_users">Users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">私人组</string>
     <string name="header_direct_messages">直接对话</string>
     <string name="header_live_chats">Live 对话</string>
     <string name="header_unknown">未知</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">编辑分享的消息</string>
     <string name="notif_action_reply_hint">回复</string>
     <string name="notif_error_sending">回复失败，请重试.</string>
@@ -332,11 +356,10 @@
     <string name="message_information_title">消息信息</string>
     <string name="message_room_changed_privacy">频道类型更改为: %1$s by %2$s</string>
 
-    <string name="foss" translatable="false">(开源)</string>
-
     <!-- User Details -->
     <string name="timezone">时区</string>
-    <string name="status" translatable="false">状态</string>
+    <string name="status">状态: %1$s</string>
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">提交</string>
diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml
index 2c4d01dbe0..e7ad15bbe3 100644
--- a/app/src/main/res/values-zh-rTW/strings.xml
+++ b/app/src/main/res/values-zh-rTW/strings.xml
@@ -3,7 +3,6 @@
     <!-- Titles -->
     <string name="title_sign_in_your_server">登入您的伺服器</string>
     <string name="title_log_in">登入</string>
-    <string name="title_share_the_app">分享App</string>
     <string name="title_register_username">註冊使用者</string>
     <string name="title_reset_password">重置密碼</string>
     <string name="title_sign_up">登入</string>
@@ -20,11 +19,11 @@
     <string name="title_admin_panel">管理面板</string>
     <string name="title_password">修改密碼</string>
     <string name="title_update_profile">更新資料</string>
-    <string name="title_about">關於</string>
     <string name="title_create_channel">建立新頻道</string>
-    <string name="title_licence">許可</string>
+    <string name="title_license">許可</string>
     <string name="title_are_you_sure">確定嗎?</string>
     <string name="title_channel_details">頻道訊息</string>
+    <string name="title_choose_language">Choose Language</string> <!-- TODO Translate -->
     <string name="title_topic">主題</string>
     <string name="title_announcement">公告</string>
     <string name="title_description">描述</string>
@@ -34,6 +33,7 @@
     <string name="action_use_this_username">使用這個名稱</string>
     <string name="action_terms_of_service">服務條款</string>
     <string name="action_privacy_policy">隱私政策</string>
+    <string name="action_new_channel">New channel</string> <!-- TODO Translate -->
     <string name="action_search">搜尋</string>
     <string name="action_update">更新</string>
     <string name="action_settings">設定</string>
@@ -43,11 +43,10 @@
     <string name="action_attach_a_files">添加檔案</string>
     <string name="action_confirm_password">確認修改密碼</string>
     <string name="action_join_chat">加入聊天</string>
-    <string name="action_add_account">新增帳戶</string>
-    <string name="action_online">線上</string>
-    <string name="action_away">離線</string>
-    <string name="action_busy">忙碌</string>
-    <string name="action_invisible">隱藏</string>
+    <string name="msg_online">線上</string>
+    <string name="msg_away">離線</string>
+    <string name="msg_busy">忙碌</string>
+    <string name="msg_invisible">隱藏</string>
     <string name="action_drawing">畫畫中...</string>
     <string name="action_save_to_gallery">保存到相簿</string>
     <string name="action_select_photo_from_gallery">從相簿中選取照片</string>
@@ -58,28 +57,32 @@
     <string name="action_create_server">建立一個新的伺服器</string>
     <string name="action_register">註冊</string>
     <string name="action_confirm">確定</string>
-    <string name="action_delete_account">刪除帳戶</string>
     <string name="action_favorite">加入蒐藏</string>
     <string name="action_remove_favorite">從蒐藏中移除</string>
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">首选项</item>
-        <item name="item_password">修改密碼</item>
-        <item name="change_language">更換語言</item>
-        <item name="item_share_app">分享這個App</item>
-        <item name="item_rate_us">給我們一個評價</item>
-        <item name="item_contact_us">聯絡我們</item>
-        <item name="item_licence">許可證</item>
-        <item name="item_about">關於</item>
-    </string-array>
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string> <!-- TODO Translate -->
+    <string name="msg_language">Language</string> <!-- TODO Translate -->
+    <string name="msg_review_this_app">Review this app</string> <!-- TODO Translate -->
+    <string name="msg_share_this_app">Share this app</string> <!-- TODO Translate -->
+    <string name="msg_administration">Administration</string> <!-- TODO Translate -->
+    <string name="msg_license">License</string> <!-- TODO Translate -->
+    <string name="msg_app_version">Version: %1$s (%2$d)</string> <!-- TODO Translate -->
+    <string name="msg_server_version">Server version: %1$s</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics">Send analytics</string> <!-- TODO Translate -->
+    <string name="msg_send_analytics_tracking">發送匿名訊息來改善App</string>
+    <string name="msg_do_not_send_analytics_tracking">不要發送匿名訊息，我不想幫助這個App</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">不適用，因為這個軟體是Foss版本</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string> <!-- TODO Translate -->
+    <string name="msg_delete_account">Delete account</string> <!-- TODO Translate -->
+    <string name="msg_change_status">Change status</string> <!-- TODO Translate -->
 
     <!-- Regular information messages -->
     <string name="msg_generic_error">發生了錯誤，請稍後試試</string>
     <string name="msg_no_data_to_display">沒有資料</string>
     <string name="msg_check_this_out">請檢查這裡</string>
     <string name="msg_share_using">分享使用</string>
-    <string name="msg_profile_update_successfully">資料更新成功</string>
+    <string name="msg_profile_updated_successfully">資料更新成功</string>
     <string name="msg_username">使用者名稱</string>
     <string name="msg_username_or_email">使用者名稱或是電子信箱</string>
     <string name="msg_password">密碼</string>
@@ -88,7 +91,7 @@
     <string name="msg_avatar_url">頭貼網址</string>
     <string name="msg_or_continue_using_social_accounts">或繼續使用社交帳號</string>
     <string name="msg_new_user">新的使用者? %1$s</string>
-    <string name="msg_forgot__your_password">忘記密碼?</string>
+    <string name="msg_forgot_your_password">忘記密碼?</string>
     <string name="msg_reset">重置</string>
     <string name="msg_check_your_email_to_reset_your_password">郵件已發送!請根據電子郵件提示重新設定密碼.</string>
     <string name="msg_invalid_email">請輸入有效的電子信箱</string>
@@ -103,12 +106,12 @@
     <string name="msg_invalid_file">無效的檔案</string>
     <string name="msg_invalid_server_url">無效的伺服器地址</string>
     <string name="msg_content_description_log_in_using_facebook">使用Facebook帳戶登入</string>
-    <string name="msg_content_description_log_in_using_github">使用Github帳戶登入</string>
+    <string name="msg_content_description_log_in_using_github">使用GitHub帳戶登入</string>
     <string name="msg_content_description_log_in_using_google">使用Google帳戶登入</string>
-    <string name="msg_content_description_log_in_using_linkedin">使用Linkedin帳戶登入</string>
+    <string name="msg_content_description_log_in_using_linkedin">使用LinkedIn帳戶登入</string>
     <string name="msg_content_description_log_in_using_meteor">使用Meteor帳戶登入</string>
     <string name="msg_content_description_log_in_using_twitter">使用Twitter帳戶登入</string>
-    <string name="msg_content_description_log_in_using_gitlab">使用Gitlab帳戶登入</string>
+    <string name="msg_content_description_log_in_using_gitlab">使用GitLab帳戶登入</string>
     <string name="msg_content_description_log_in_using_wordpress">使用WordPress帳戶登入</string>
     <string name="msg_content_description_send_message">發送訊息</string>
     <string name="msg_content_description_show_more_login_options">顯示更多登入選像</string>
@@ -154,13 +157,13 @@
     <string name="msg_login_with_email">使用<b>信箱</b>登入</string>
     <string name="msg_create_account">新增帳戶</string>
     <string name="msg_continue_with_facebook">使用<b>Facebook</b>帳號繼續</string>
-    <string name="msg_continue_with_github">使用<b>Github</b>帳號繼續</string>
+    <string name="msg_continue_with_github">使用<b>GitHub</b>帳號繼續</string>
     <string name="msg_continue_with_google">使用<b>Google</b>帳號繼續</string>
-    <string name="msg_continue_with_linkedin">使用<b>Linkedin</b>帳號繼續</string>
+    <string name="msg_continue_with_linkedin">使用<b>LinkedIn</b>帳號繼續</string>
     <string name="msg_continue_with_gitlab">使用<b>GitLab</b>帳號繼續</string>
     <string name="msg_continue_with_wordpress">使用<b>WordPress</b>帳號繼續</string>
     <string name="msg_two_factor_authentication">兩步驟認證(2FA)</string>
-    <string name="msg__your_2fa_code">什麼是2FA?</string>
+    <string name="msg_your_2fa_code">什麼是2FA?</string>
     <string name="msg_permalink_copied">永久連結已經複製</string>
     <string name="msg_no_topic">沒有主題</string>
     <string name="msg_no_announcement">沒有公告</string>
@@ -174,6 +177,11 @@
         <item quantity="other">%1$s 使用了 %2$s</item>
     </plurals>
     <string name="msg_credentials_saved_successfully">憑證保存成功</string>
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string> <!-- TODO Add translation -->
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string> <!-- TODO Add translation -->
+    <string name="msg_server">Server</string> <!-- TODO Translate -->
+    <string name="msg_add_new_server">Add New Server</string>  <!-- TODO Translate -->
+    <string name="msg_directory">Directory</string> <!-- TODO Translate -->
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">隱私</string>
@@ -193,12 +201,6 @@
     <string name="msg_view_less">顯示更少</string>
     <string name="msg_muted_on_this_channel">您被禁言了</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">追蹤分析</string>
-    <string name="msg_send_analytics_tracking">發送匿名訊息來改善App</string>
-    <string name="msg_do_not_send_analytics_tracking">不要發送匿名訊息，我不想幫助這個App</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">不適用，因為這個軟體是Foss版本</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">頻道已經改名為: %1$s by %2$s</string>
     <string name="message_user_added_by">%2$s增加了新的成員%1$s </string>
@@ -275,7 +277,7 @@
     <string name="status_disconnecting">斷線中</string>
     <string name="status_waiting">連線持續了 %d 秒</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">提醒頻道內所有成員</string>
     <string name="suggest_here_description">提醒頻道內所有在線上的成員</string>
 
@@ -302,28 +304,31 @@
     <string name="Guggy_Command_Description">根據輸入訊息產生GIF</string>
     <string name="Slash_Topic_Description">設定主題</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">最近沒有使用emojis</string>
     <string name="alert_title_default_skin_tone">預設主題顏色</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">排序</string>
-    <string name="dialog_sort_title">根據開頭排序</string>
-    <string name="dialog_sort_by_alphabet">根據字母排序</string>
-    <string name="dialog_sort_by_activity">根據活躍度排序</string>
-    <string name="dialog_group_by_type">根據類型分組</string>
-    <string name="dialog_group_favourites">根據蒐藏分组</string>
-    <string name="chatroom_header">聊天室頭貼</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string> <!-- TODO Translate -->
+    <string name="msg_sort_by">Sort by</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_activity">Activity</string> <!-- TODO Translate -->
+    <string name="msg_sort_by_name">Name</string> <!-- TODO Translate -->
+    <string name="msg_group_by_unread_on_top">Unread on top</string> <!-- TODO Translate -->
+    <string name="msg_group_by_type">Group by type</string> <!-- TODO Translate -->
+    <string name="msg_group_by_favorites">Group by favorites</string> <!-- TODO Translate -->
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string><!-- TODO - Add proper translation -->
-    <string name="header_channel">頻道</string>
+    <string name="msg_channels">頻道</string>
+    <string name="msg_users">Users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users">Search for global users</string> <!-- TODO Translate -->
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string> <!-- TODO Translate -->
     <string name="header_private_groups">私人群組</string>
     <string name="header_direct_messages">直接對話</string>
     <string name="header_live_chats">Live 對話</string>
     <string name="header_unknown">未知</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">編輯分享的訊息</string>
     <string name="notif_action_reply_hint">回覆</string>
     <string name="notif_error_sending">回覆失敗，請重試.</string>
@@ -332,11 +337,10 @@
     <string name="message_information_title">消息訊息</string>
     <string name="message_room_changed_privacy">頻道類型更改為: %1$s by %2$s</string>
 
-    <string name="foss" translatable="false">(FOSS)</string>
-
     <!-- User Details -->
     <string name="timezone">時區</string>
-    <string name="status" translatable="false">狀態</string>
+    <string name="status">狀態: %1$s</string>
+    <string name="user_detail_status">Status</string> <!-- TODO Translate -->
 
     <!-- Report -->
     <string name="submit">提交</string>
diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml
deleted file mode 100644
index d453f333cc..0000000000
--- a/app/src/main/res/values/ids.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <item name="menu_section_one" type="id"/>
-    <item name="menu_section_two" type="id"/>
-    <item name="menu_section_three" type="id"/>
-
-    <item name="menu_action_chats" type="id"/>
-    <item name="menu_action_create_channel" type="id"/>
-    <item name="menu_action_profile" type="id"/>
-    <item name="menu_action_settings" type="id"/>
-    <item name="menu_action_admin_panel" type="id"/>
-    <item name="menu_action_logout" type="id"/>
-
-</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 86d66709d6..5d4ae3300e 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -15,7 +15,6 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <!-- Titles -->
     <string name="title_sign_in_your_server">Sign in to your server</string>
     <string name="title_log_in">Login</string>
-    <string name="title_share_the_app">Share App</string>
     <string name="title_register_username">Register username</string>
     <string name="title_reset_password">Reset password</string>
     <string name="title_sign_up">Sign up</string>
@@ -32,10 +31,10 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="title_admin_panel">Admin panel</string>
     <string name="title_password">Change Password</string>
     <string name="title_update_profile">Update profile</string>
-    <string name="title_about">About</string>
     <string name="title_create_channel">Create Channel</string>
-    <string name="title_licence">Licence</string>
+    <string name="title_license">License</string>
     <string name="title_are_you_sure">Are you sure?</string>
+    <string name="title_choose_language">Choose Language</string>
     <string name="title_channel_details">Channel Details</string>
     <string name="title_topic">Topic</string>
     <string name="title_announcement">Announcement</string>
@@ -46,6 +45,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="action_use_this_username">Use this username</string>
     <string name="action_terms_of_service">Terms of Service</string>
     <string name="action_privacy_policy">Privacy Policy</string>
+    <string name="action_new_channel">New channel</string>
     <string name="action_search">Search</string>
     <string name="action_update">Update</string>
     <string name="action_settings">Settings</string>
@@ -55,11 +55,10 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="action_attach_a_files">Attach a file</string>
     <string name="action_confirm_password">Confirm Password Change</string>
     <string name="action_join_chat">Join Chat</string>
-    <string name="action_add_account">Add account</string>
-    <string name="action_online">Online</string>
-    <string name="action_away">Away</string>
-    <string name="action_busy">Busy</string>
-    <string name="action_invisible">Invisible</string>
+    <string name="msg_online">Online</string>
+    <string name="msg_away">Away</string>
+    <string name="msg_busy">Busy</string>
+    <string name="msg_invisible">Invisible</string>
     <string name="action_drawing">Drawing</string>
     <string name="action_save_to_gallery">Save to gallery</string>
     <string name="action_select_photo_from_gallery">Select photo from gallery</string>
@@ -70,20 +69,43 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="action_create_server">Create a new server</string>
     <string name="action_register">Register</string>
     <string name="action_confirm">Confirm</string>
-    <string name="action_delete_account">Delete account</string>
     <string name="action_favorite">Favorite</string>
     <string name="action_remove_favorite">Remove favorite</string>
 
-    <!-- Settings List -->
-    <string-array name="settings_actions">
-        <item name="item_preferences">Preferences</item>
-        <item name="item_password">Change password</item>
-        <item name="change_language">Change language</item>
-        <item name="item_share_app">Share app</item>
-        <item name="item_rate_us">Rate us</item>
-        <item name="item_contact_us">Contact us</item>
-        <item name="item_licence">Licence</item>
-        <item name="item_about">About</item>
+    <!-- Settings messages -->
+    <string name="msg_contact_us">Contact us</string>
+    <string name="msg_language">Language</string>
+    <string name="msg_review_this_app">Review this app</string>
+    <string name="msg_share_this_app">Share this app</string>
+    <string name="msg_administration">Administration</string>
+    <string name="msg_license">License</string>
+    <string name="msg_app_version">Version: %1$s (%2$d)</string>
+    <string name="msg_server_version">Server version: %1$s</string>
+    <string name="msg_send_analytics">Send analytics</string>
+    <string name="msg_send_analytics_tracking">Send anonymous statistics to help improve this app</string>
+    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statistics to help improve this app</string>
+    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string>
+    <string name="msg_logout_from_rocket_chat">Logout from Rocket.Chat</string>
+    <string name="msg_delete_account">Delete account</string>
+    <string name="msg_change_status">Change status</string>
+
+    <string-array name="languages">
+        <item>English</item>
+        <item>Arabic</item>
+        <item>German</item>
+        <item>Spanish</item>
+        <item>Persian</item>
+        <item>French</item>
+        <item>Hindi (IN)</item>
+        <item>Italian</item>
+        <item>Japanese</item>
+        <item>Portuguese (BR)</item>
+        <item>Portuguese (PT)</item>
+        <item>Russian (RU)</item>
+        <item>Turkish</item>
+        <item>Ukrainian</item>
+        <item>Chinese (CN)</item>
+        <item>Chinese (TW)</item>
     </string-array>
 
     <!-- Regular information messages -->
@@ -91,16 +113,19 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_no_data_to_display">No data to display</string>
     <string name="msg_check_this_out">Check this out</string>
     <string name="msg_share_using">Share using</string>
-    <string name="msg_profile_update_successfully">Profile update successfully</string>
-    <string name="msg_username">username</string>
+    <string name="msg_username">Username</string>
+    <string name="msg_profile_username_hint" translatable="false">Please enter your username</string> <!-- TODO Make translatable and add translations -->
+    <string name="msg_profile_updated_successfully">Profile updated successfully</string>
     <string name="msg_username_or_email">Username or email</string>
     <string name="msg_password">Password</string>
     <string name="msg_name">Name</string>
+    <string name="msg_profile_name_hint" translatable="false">Please enter your name…</string>
     <string name="msg_email">Email</string>
+    <string name="msg_profile_email_hint" translatable="false">Please enter your email address</string> <!-- TODO Make translatable and add translations -->
     <string name="msg_avatar_url">avatar URL</string>
     <string name="msg_or_continue_using_social_accounts">Or continue using social accounts</string>
     <string name="msg_new_user">New user? %1$s</string>
-    <string name="msg_forgot__your_password">Forgot your password?</string>
+    <string name="msg_forgot_your_password">Forgot your password?</string>
     <string name="msg_reset">Reset</string>
     <string name="msg_check_your_email_to_reset_your_password">Email sent! Check your inbox to reset your password.</string>
     <string name="msg_invalid_email">Please type a valid e-mail</string>
@@ -116,12 +141,12 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_invalid_file">Invalid file</string>
     <string name="msg_invalid_server_url">Invalid server URL</string>
     <string name="msg_content_description_log_in_using_facebook">Login using Facebook</string>
-    <string name="msg_content_description_log_in_using_github">Login using Github</string>
+    <string name="msg_content_description_log_in_using_github">Login using GitHub</string>
     <string name="msg_content_description_log_in_using_google">Login using Google</string>
     <string name="msg_content_description_log_in_using_linkedin">Login using LinkedIn</string>
     <string name="msg_content_description_log_in_using_meteor">Login using Meteor</string>
     <string name="msg_content_description_log_in_using_twitter">Login using Twitter</string>
-    <string name="msg_content_description_log_in_using_gitlab">Login using Gitlab</string>
+    <string name="msg_content_description_log_in_using_gitlab">Login using GitLab</string>
     <string name="msg_content_description_log_in_using_wordpress">Login using WordPress</string>
     <string name="msg_content_description_send_message">Send message</string>
     <string name="msg_content_description_show_more_login_options">Show more login options</string>
@@ -170,13 +195,13 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_login_with_email">Login with <b>e-mail</b></string>
     <string name="msg_create_account">Create an account</string>
     <string name="msg_continue_with_facebook">Continue with <b>Facebook</b></string>
-    <string name="msg_continue_with_github">Continue with <b>Github</b></string>
+    <string name="msg_continue_with_github">Continue with <b>GitHub</b></string>
     <string name="msg_continue_with_google">Continue with <b>Google</b></string>
-    <string name="msg_continue_with_linkedin">Continue with <b>Linkedin</b></string>
+    <string name="msg_continue_with_linkedin">Continue with <b>LinkedIn</b></string>
     <string name="msg_continue_with_gitlab">Continue with <b>GitLab</b></string>
     <string name="msg_continue_with_wordpress">Continue with <b>WordPress</b></string>
     <string name="msg_two_factor_authentication">Two-factor Authentication</string>
-    <string name="msg__your_2fa_code">What’s your 2FA code?</string>
+    <string name="msg_your_2fa_code">What’s your 2FA code?</string>
     <string name="msg_permalink_copied">Permalink copied</string>
     <string name="msg_no_topic">No topic</string>
     <string name="msg_no_announcement">No announcement</string>
@@ -190,6 +215,11 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
         <item quantity="other">%1$s reacted with %2$s</item>
     </plurals>
     <string name="msg_credentials_saved_successfully">Credentials saved successfully</string>
+    <string name="msg_camera_permission_denied">Camera permission is needed to open camera.</string>
+    <string name="msg_storage_permission_denied">Storage permission is needed to open Drawing.</string>
+    <string name="msg_server">Server</string>
+    <string name="msg_add_new_server">Add New Server</string>
+    <string name="msg_directory">Directory</string>
 
     <!-- Create channel messages -->
     <string name="msg_private_channel">Private</string>
@@ -204,17 +234,11 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="msg_channel_created_successfully">Channel created successfully</string>
     <string name="msg_message_copied">Message copied</string>
     <string name="msg_delete_message">Delete Message</string>
-    <string name="msg_delete_description">Are you sure you want to delete this message</string>
+    <string name="msg_delete_description">Are you sure you want to delete this message?</string>
     <string name="msg_view_more">view more</string>
     <string name="msg_view_less">view less</string>
     <string name="msg_muted_on_this_channel">You are muted on this channel</string>
 
-    <!-- Preferences messages -->
-    <string name="msg_analytics_tracking">Analytics tracking</string>
-    <string name="msg_send_analytics_tracking">Send anonymous statics to help improving this app</string>
-    <string name="msg_do_not_send_analytics_tracking">Do not send anonymous statics to help improving this app</string>
-    <string name="msg_not_applicable_since_it_is_a_foss_version">Not applicable since it is a FOSS version</string>
-
     <!-- System messages -->
     <string name="message_room_name_changed">Room name changed to: %1$s by %2$s</string>
     <string name="message_user_added_by">User %1$s added by %2$s</string>
@@ -291,7 +315,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="status_disconnecting">Disconnecting</string>
     <string name="status_waiting">Connecting in %d seconds</string>
 
-    <!--Suggestions-->
+    <!-- Suggestions -->
     <string name="suggest_all_description">Notify all in this room</string>
     <string name="suggest_here_description">Notify active users in this room</string>
 
@@ -318,28 +342,31 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
     <string name="Guggy_Command_Description">Generates a gif based upon the provided text</string>
     <string name="Slash_Topic_Description">Set topic</string>
 
-    <!-- Emoji message-->
+    <!-- Emoji messages -->
     <string name="msg_no_recent_emoji">No recent emojis</string>
     <string name="alert_title_default_skin_tone">Default skin tone</string>
 
-    <!-- Sorting and grouping-->
-    <string name="msg_sort">Sort</string>
-    <string name="dialog_sort_title">Sort by</string>
-    <string name="dialog_sort_by_alphabet">Alphabetical</string>
-    <string name="dialog_sort_by_activity">Activity</string>
-    <string name="dialog_group_by_type">Group by type</string>
-    <string name="dialog_group_favourites">Group favourites</string>
-    <string name="chatroom_header">Header</string>
+    <!-- Sort and group -->
+    <string name="msg_sort_by_placeholder">Sort by %1$s</string>
+    <string name="msg_sort_by">Sort by</string>
+    <string name="msg_sort_by_activity">Activity</string>
+    <string name="msg_sort_by_name">Name</string>
+    <string name="msg_group_by_unread_on_top">Unread on top</string>
+    <string name="msg_group_by_type">Group by type</string>
+    <string name="msg_group_by_favorites">Group by favorites</string>
 
-    <!--ChatRooms Headers-->
+    <!-- ChatRooms Headers -->
     <string name="header_favorite">Favorites</string>
-    <string name="header_channel">Channels</string>
+    <string name="msg_channels">Channels</string>
+    <string name="msg_users">Users</string>
+    <string name="msg_search_for_global_users">Search for global users</string>
+    <string name="msg_search_for_global_users_description">If you turn on, you can search for any user from other companies or servers.</string>
     <string name="header_private_groups">Private Groups</string>
     <string name="header_direct_messages">Direct Messages</string>
     <string name="header_live_chats">Live Chats</string>
     <string name="header_unknown">Unknown</string>
 
-    <!--Notifications-->
+    <!-- Notifications -->
     <string name="share_label">Edit shared message</string>
     <string name="notif_action_reply_hint">REPLY</string>
     <string name="notif_error_sending">Reply has failed. Please try again.</string>
@@ -352,10 +379,11 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
 
     <!-- User Details -->
     <string name="timezone">Timezone</string>
-    <string name="status" translatable="false">Status</string>
+    <string name="status">Status: %1$s</string>
+    <string name="user_detail_status">Status</string>
 
     <!-- Report -->
     <string name="submit">Submit</string>
     <string name="required">*required</string>
     <string name="report_sent">Your report has been sent!</string>
-</resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 18a0298ab1..fb25218035 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -10,6 +10,7 @@
         <item name="searchViewStyle">@style/ChatRoom.SearchView</item>
         <item name="actionModeBackground">@color/colorPrimary</item>
         <item name="android:actionModeBackground">@color/colorPrimary</item>
+        <item name="android:textDirection">locale</item>
     </style>
 
     <!-- Widget styles. -->
@@ -261,7 +262,18 @@
 
     // REMARK: To be removed.
     <style name="Profile.EditText" parent="Authentication.EditText.Border">
-        <item name="android:background">@drawable/style_edit_text_profile</item>
+        <item name="android:layout_height">48dp</item>
+        <item name="android:layout_marginTop">8dp</item>
+    </style>
+
+    <style name="Profile.TextView" parent="TextAppearance.AppCompat.Title">
+        <item name="android:textSize">16sp</item>
+        <item name="android:fontFamily">sans-serif-medium</item>
+        <item name="android:textStyle">normal</item>
+        <item name="android:layout_marginTop">24dp</item>
+        <item name="android:layout_gravity">left</item>
+        <item name="android:textColor">@color/colorPrimary</item>
+        <item name="android:maxLines">1</item>
     </style>
 
     <style name="ActionModeStyle" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
diff --git a/app/src/main/res/xml/lint.xml b/app/src/main/res/xml/lint.xml
index fb9d9f4a74..3d14df788f 100644
--- a/app/src/main/res/xml/lint.xml
+++ b/app/src/main/res/xml/lint.xml
@@ -1,5 +1,5 @@
 <lint>
     <issue id="InvalidPackage">
-        <ignore path="**/dropbox*.jar"/> <!--For Jitsi -->
+        <ignore path="**/dropbox*.jar"/> <!-- For Jitsi -->
     </issue>
 </lint>
\ No newline at end of file
diff --git a/app/src/play/java/chat/rocket/android/analytics/AnswersAnalytics.kt b/app/src/play/java/chat/rocket/android/analytics/AnswersAnalytics.kt
index 0b6419eb74..8063c14603 100644
--- a/app/src/play/java/chat/rocket/android/analytics/AnswersAnalytics.kt
+++ b/app/src/play/java/chat/rocket/android/analytics/AnswersAnalytics.kt
@@ -35,7 +35,7 @@ class AnswersAnalytics : Analytics {
     override fun logMessageSent(event: SubscriptionTypeEvent, serverUrl: String) =
         Answers.getInstance()
             .logCustom(
-                CustomEvent("message_actionsent")
+                CustomEvent("message_sent")
                     .putCustomAttribute("subscription_type", event.subscriptionTypeName)
                     .putCustomAttribute("server", serverUrl)
             )
diff --git a/app/src/play/java/chat/rocket/android/push/worker/TokenRegistrationWorker.kt b/app/src/play/java/chat/rocket/android/push/worker/TokenRegistrationWorker.kt
index d7066a2a40..2248f05e55 100644
--- a/app/src/play/java/chat/rocket/android/push/worker/TokenRegistrationWorker.kt
+++ b/app/src/play/java/chat/rocket/android/push/worker/TokenRegistrationWorker.kt
@@ -5,7 +5,7 @@ import chat.rocket.android.dagger.injector.AndroidWorkerInjection
 import chat.rocket.android.extensions.await
 import chat.rocket.android.infrastructure.LocalRepository
 import chat.rocket.android.server.domain.GetAccountsInteractor
-import chat.rocket.android.server.infraestructure.RocketChatClientFactory
+import chat.rocket.android.server.infrastructure.RocketChatClientFactory
 import chat.rocket.android.util.extensions.registerPushToken
 import chat.rocket.common.util.ifNull
 import com.google.firebase.iid.FirebaseInstanceId
diff --git a/config/quality/checkstyle/checkstyle-config.xml b/config/quality/checkstyle/checkstyle-config.xml
index a72faa2be6..53e14849c5 100644
--- a/config/quality/checkstyle/checkstyle-config.xml
+++ b/config/quality/checkstyle/checkstyle-config.xml
@@ -95,11 +95,11 @@
             <property name="tokens" value="COMMA"/>
             <property name="option" value="EOL"/>
         </module>
-        <!-- TODO module name="PackageName">
+        <!-- TODO <module name="PackageName">
           <property name="format" value="^[a-z]+(\.[a-z][a-z0-9]*)*$"/>
           <message key="name.invalidPattern"
               value="Package name ''{0}'' must match pattern ''{1}''."/>
-        </module-->
+        </module>-->
         <module name="TypeName">
             <message key="name.invalidPattern"
                     value="Type name ''{0}'' must match pattern ''{1}''."/>
@@ -162,16 +162,16 @@
         </module>
         <module name="AbbreviationAsWordInName">
             <property name="ignoreFinal" value="false"/>
-            <!-- TODO property name="allowedAbbreviationLength" value="1"/-->
+            <!-- TODO <property name="allowedAbbreviationLength" value="1"/>-->
         </module>
         <module name="OverloadMethodsDeclarationOrder"/>
         <module name="VariableDeclarationUsageDistance"/>
-        <!-- TODO module name="CustomImportOrder">
+        <!-- TODO <module name="CustomImportOrder">
           <property name="specialImportsRegExp" value="com.google"/>
           <property name="sortImportsInGroupAlphabetically" value="true"/>
           <property name="customImportOrderRules"
               value="STATIC###SPECIAL_IMPORTS###THIRD_PARTY_PACKAGE###STANDARD_JAVA_PACKAGE"/>
-        </module-->
+        </module>-->
         <module name="MethodParamPad"/>
         <module name="OperatorWrap">
             <property name="option" value="NL"/>
diff --git a/config/quality/pmd/pmd-ruleset.xml b/config/quality/pmd/pmd-ruleset.xml
index 9df575ebff..bdb2ea26a9 100644
--- a/config/quality/pmd/pmd-ruleset.xml
+++ b/config/quality/pmd/pmd-ruleset.xml
@@ -20,7 +20,7 @@
     <rule ref="rulesets/java/naming.xml">
         <exclude name="AbstractNaming" />
         <exclude name="LongVariable" />
-        <!--exclude name="ShortMethodName" /-->
+        <!--<exclude name="ShortMethodName" />-->
         <exclude name="ShortVariable" />
         <exclude name="ShortClassName" />
         <!--<exclude name="VariableNamingConventions" />-->
diff --git a/dependencies.gradle b/dependencies.gradle
index b63df684fb..672cf34eb2 100644
--- a/dependencies.gradle
+++ b/dependencies.gradle
@@ -56,7 +56,7 @@ ext {
             glide                 : '4.8.0',
             glideTransformations  : '4.0.0',
 
-            jitsi                 : '1.21.0',
+            jitsi                 : '2.1.0',
 
             // For testing
             junit                 : '4.12',
diff --git a/draw/src/main/AndroidManifest.xml b/draw/src/main/AndroidManifest.xml
index a4af562493..c55f8d7916 100644
--- a/draw/src/main/AndroidManifest.xml
+++ b/draw/src/main/AndroidManifest.xml
@@ -5,7 +5,8 @@
     <application android:name=".DrawApplication">
         <activity
             android:name=".main.ui.DrawingActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:configChanges="orientation|screenSize|keyboardHidden"/>
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/draw/src/main/java/chat/rocket/android/draw/main/ui/DrawActivity.kt b/draw/src/main/java/chat/rocket/android/draw/main/ui/DrawActivity.kt
index 9d1ce09959..0588042a62 100644
--- a/draw/src/main/java/chat/rocket/android/draw/main/ui/DrawActivity.kt
+++ b/draw/src/main/java/chat/rocket/android/draw/main/ui/DrawActivity.kt
@@ -44,7 +44,16 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
             .show()
     }
 
+
     private fun setupListeners() {
+        custom_draw_view.setOnTouchListener { view, event ->
+            custom_draw_view.onTouch(
+                event,
+                draw_tools,
+                ::toggleCompleteDrawTools
+            )
+        }
+
         image_close_drawing.setOnClickListener { finish() }
 
         image_send_drawing.setOnClickListener {
@@ -53,7 +62,7 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
     }
 
     private fun setupDrawTools() {
-        image_draw_eraser.setOnLongClickListener{
+        image_draw_eraser.setOnLongClickListener {
             custom_draw_view.clearCanvas()
             return@setOnLongClickListener true
         }
@@ -117,10 +126,19 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
         }
     }
 
+    private fun toggleCompleteDrawTools(view: View, showView: Boolean = true) {
+        if (view.translationY == (112).toPx && showView) {
+            toggleDrawTools(draw_tools, false)
+        } else {
+            view.animate().translationY((112).toPx)
+        }
+    }
+
+
     private fun colorSelector() {
         image_color_black.setOnClickListener {
             custom_draw_view.setColor(
-                    ResourcesCompat.getColor(resources, R.color.color_black, null)
+                ResourcesCompat.getColor(resources, R.color.color_black, null)
             )
             scaleColorView(image_color_black)
         }
@@ -232,6 +250,7 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
         })
     }
 
+
     private val Int.toPx: Float
         get() = (this * Resources.getSystem().displayMetrics.density)
-}
\ No newline at end of file
+}
diff --git a/draw/src/main/java/chat/rocket/android/draw/widget/CustomDrawView.kt b/draw/src/main/java/chat/rocket/android/draw/widget/CustomDrawView.kt
index 278eca87a7..425418099c 100644
--- a/draw/src/main/java/chat/rocket/android/draw/widget/CustomDrawView.kt
+++ b/draw/src/main/java/chat/rocket/android/draw/widget/CustomDrawView.kt
@@ -79,7 +79,7 @@ class CustomDrawView(context: Context, attrs: AttributeSet) : View(context, attr
     }
 
     fun setAlpha(newAlpha: Int) {
-        val alpha = (newAlpha*255)/100
+        val alpha = (newAlpha * 255) / 100
         mPaintOptions.alpha = alpha
         setColor(mPaintOptions.color)
     }
@@ -154,25 +154,32 @@ class CustomDrawView(context: Context, attrs: AttributeSet) : View(context, attr
 
         mPaths.put(mPath, mPaintOptions)
         mPath = MyPath()
-        mPaintOptions = PaintOptions(mPaintOptions.color, mPaintOptions.strokeWidth, mPaintOptions.alpha)
+        mPaintOptions =
+            PaintOptions(mPaintOptions.color, mPaintOptions.strokeWidth, mPaintOptions.alpha)
     }
 
-    override fun onTouchEvent(event: MotionEvent): Boolean {
+    fun onTouch(
+        event: MotionEvent,
+        drawTools: View,
+        toggleDrawTools: (View, Boolean) -> Unit
+    ): Boolean {
         val x = event.x
         val y = event.y
-
         when (event.action) {
             MotionEvent.ACTION_DOWN -> {
+                toggleDrawTools(drawTools, false)
                 mStartX = x
                 mStartY = y
                 actionDown(x, y)
                 mUndonePaths.clear()
             }
             MotionEvent.ACTION_MOVE -> actionMove(x, y)
-            MotionEvent.ACTION_UP -> actionUp()
+            MotionEvent.ACTION_UP -> {
+                toggleDrawTools(drawTools, true)
+                actionUp()
+            }
         }
-
         invalidate()
         return true
     }
-}
\ No newline at end of file
+}
diff --git a/draw/src/main/res/drawable/circle_green.xml b/draw/src/main/res/drawable/circle_green.xml
index 4baa7635cd..fdf83ecce0 100644
--- a/draw/src/main/res/drawable/circle_green.xml
+++ b/draw/src/main/res/drawable/circle_green.xml
@@ -3,6 +3,6 @@
     android:shape="oval">
 
     <solid android:color="@color/color_green" />
-        <corners android:radius="50dp" />
+    <corners android:radius="50dp" />
 
 </shape>
\ No newline at end of file
diff --git a/draw/src/main/res/drawable/ic_send_black_24dp.xml b/draw/src/main/res/drawable/ic_send_black_24dp.xml
index e145ca83cc..15e71d2999 100644
--- a/draw/src/main/res/drawable/ic_send_black_24dp.xml
+++ b/draw/src/main/res/drawable/ic_send_black_24dp.xml
@@ -1,9 +1,10 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:autoMirrored="true"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
+        android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z" />
 </vector>
diff --git a/emoji/build.gradle b/emoji/build.gradle
index 5a8bcda109..99f954189f 100644
--- a/emoji/build.gradle
+++ b/emoji/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion versions.minSdk
         targetSdkVersion versions.targetSdk
         versionCode 1
-        versionName "0.1"
+        versionName "1.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -40,6 +40,9 @@ dependencies {
     implementation libraries.androidKtx
 
     implementation libraries.material
+    implementation libraries.glide
+
+    implementation libraries.timber
 
     implementation libraries.room
     kapt libraries.roomProcessor
diff --git a/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt b/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt
index 783e736bac..ab53930c9b 100644
--- a/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt
+++ b/emoji/src/main/java/chat/rocket/android/emoji/EmojiKeyboardPopup.kt
@@ -16,7 +16,6 @@ import androidx.appcompat.app.AppCompatActivity
 import androidx.core.content.ContextCompat
 import androidx.core.content.edit
 import androidx.core.graphics.drawable.DrawableCompat
-import androidx.viewpager.widget.ViewPager
 import chat.rocket.android.emoji.internal.EmojiCategory
 import chat.rocket.android.emoji.internal.EmojiPagerAdapter
 import chat.rocket.android.emoji.internal.PREF_EMOJI_SKIN_TONE
@@ -27,7 +26,7 @@ import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 
 class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow(context, view) {
-    private lateinit var viewPager: ViewPager
+    private lateinit var viewPager: EmojiViewPager
     private lateinit var tabLayout: TabLayout
     private lateinit var searchView: View
     private lateinit var backspaceView: View
@@ -155,7 +154,7 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
                     val fragments = (it as AppCompatActivity).supportFragmentManager.fragments
                     if (fragments.size == 0 || fragments[0] !is EmojiKeyboardListener) {
                         // Since the app can arrive in an inconsistent state at this point, do not throw
-//                        throw IllegalStateException("activity/fragment should implement Listener interface")
+                        // throw IllegalStateException("activity/fragment should implement Listener interface")
                         null
                     } else {
                         fragments[0] as EmojiKeyboardListener
@@ -177,8 +176,8 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
                 val tab = tabLayout.getTabAt(category.ordinal)
                 val tabView = LayoutInflater.from(context).inflate(R.layout.emoji_picker_tab, null)
                 tab?.customView = tabView
-                val textView = tabView.findViewById(R.id.image_category) as ImageView
-                textView.setImageResource(category.resourceIcon())
+                val imageView = tabView.findViewById(R.id.image_category) as ImageView
+                imageView.setImageResource(category.resourceIcon())
             }
 
             val currentTab = if (EmojiRepository.getRecents().isEmpty()) {
@@ -186,7 +185,6 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
             } else {
                 EmojiCategory.RECENTS.ordinal
             }
-
             viewPager.currentItem = currentTab
         }
     }
@@ -203,7 +201,7 @@ class EmojiKeyboardPopup(context: Context, view: View) : OverKeyboardPopupWindow
                 val start = message.getSpanStart(span)
                 val end = message.getSpanEnd(span)
 
-                // Remove the span
+                // Remove the span.
                 message.removeSpan(span)
 
                 // Remove the remaining emoticon text.
diff --git a/emoji/src/main/java/chat/rocket/android/emoji/EmojiParser.kt b/emoji/src/main/java/chat/rocket/android/emoji/EmojiParser.kt
index dad8d19e8c..b77dd4c9c6 100644
--- a/emoji/src/main/java/chat/rocket/android/emoji/EmojiParser.kt
+++ b/emoji/src/main/java/chat/rocket/android/emoji/EmojiParser.kt
@@ -7,15 +7,11 @@ import android.text.Spannable
 import android.text.SpannableString
 import android.text.Spanned
 import android.text.style.ImageSpan
-import android.util.Log
 import com.bumptech.glide.Glide
 import com.bumptech.glide.load.engine.DiskCacheStrategy
 import com.bumptech.glide.load.resource.gif.GifDrawable
 import com.bumptech.glide.request.RequestOptions
-import kotlinx.coroutines.Deferred
-import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.GlobalScope
-import kotlinx.coroutines.async
+import timber.log.Timber
 
 class EmojiParser {
 
@@ -31,7 +27,11 @@ class EmojiParser {
          * @param factory Optional. A [Spannable.Factory] instance to reuse when creating [Spannable].
          * @return A rendered Spannable containing any supported emoji.
          */
-        fun parse(context: Context, text: CharSequence, factory: Spannable.Factory? = null): CharSequence {
+        fun parse(
+            context: Context,
+            text: CharSequence,
+            factory: Spannable.Factory? = null
+        ): CharSequence {
             val unicodedText = EmojiRepository.shortnameToUnicode(text)
             val spannable = factory?.newSpannable(unicodedText)
                 ?: SpannableString.valueOf(unicodedText)
@@ -64,16 +64,20 @@ class EmojiParser {
                     inEmoji = true
                 } else {
                     if (inEmoji) {
-                        spannable.setSpan(EmojiTypefaceSpan("sans-serif", typeface),
-                            emojiStart, offset, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                        spannable.setSpan(
+                            EmojiTypefaceSpan("sans-serif", typeface),
+                            emojiStart, offset, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                        )
                     }
                     inEmoji = false
                 }
 
                 offset += count
                 if (offset >= length && inEmoji) {
-                    spannable.setSpan(EmojiTypefaceSpan("sans-serif", typeface),
-                        emojiStart, offset, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                    spannable.setSpan(
+                        EmojiTypefaceSpan("sans-serif", typeface),
+                        emojiStart, offset, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                    )
                 }
             }
 
@@ -83,7 +87,7 @@ class EmojiParser {
 
             return spannable.also { sp ->
                 regex.findAll(spannable).iterator().forEach { match ->
-                    customEmojis.find { it.shortname.toLowerCase() == match.value.toLowerCase() }?.let { emoji ->
+                    customEmojis.find { matchEmoji(it, match.value) }?.let { emoji ->
                         emoji.url?.let { url ->
                             try {
                                 val glideRequest = if (url.endsWith("gif", true)) {
@@ -100,16 +104,25 @@ class EmojiParser {
                                 val range = match.range
                                 futureTarget.get()?.let { image ->
                                     if (image is Bitmap) {
-                                        spannable.setSpan(ImageSpan(context, image), range.start,
-                                            range.endInclusive + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                                        spannable.setSpan(
+                                            ImageSpan(context, image), range.start,
+                                            range.endInclusive + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                                        )
                                     } else if (image is GifDrawable) {
-                                        image.setBounds(0, 0, image.intrinsicWidth, image.intrinsicHeight)
-                                        spannable.setSpan(ImageSpan(image), range.start,
-                                            range.endInclusive + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE)
+                                        image.setBounds(
+                                            0,
+                                            0,
+                                            image.intrinsicWidth,
+                                            image.intrinsicHeight
+                                        )
+                                        spannable.setSpan(
+                                            ImageSpan(image), range.start,
+                                            range.endInclusive + 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE
+                                        )
                                     }
                                 }
                             } catch (ex: Throwable) {
-                                Log.e("EmojiParser", "", ex)
+                                Timber.e(ex)
                             }
                         }
                     }
@@ -117,12 +130,17 @@ class EmojiParser {
             }
         }
 
-        fun parseAsync(
-            context: Context,
-            text: CharSequence,
-            factory: Spannable.Factory? = null
-        ): Deferred<CharSequence> {
-            return GlobalScope.async(Dispatchers.IO) { parse(context, text, factory) }
+        private fun matchEmoji(it: Emoji, text: String): Boolean {
+            if (it.shortname == text) {
+                return true
+            } else {
+                it.shortnameAlternates.forEach {
+                    if (":$it:" == text) {
+                        return true
+                    }
+                }
+                return false
+            }
         }
     }
 }
diff --git a/emoji/src/main/java/chat/rocket/android/emoji/EmojiPickerPopup.kt b/emoji/src/main/java/chat/rocket/android/emoji/EmojiPickerPopup.kt
index 9c44554cae..babf5758b3 100644
--- a/emoji/src/main/java/chat/rocket/android/emoji/EmojiPickerPopup.kt
+++ b/emoji/src/main/java/chat/rocket/android/emoji/EmojiPickerPopup.kt
@@ -7,9 +7,6 @@ import android.view.LayoutInflater
 import android.view.Window
 import android.view.WindowManager
 import android.widget.ImageView
-import androidx.annotation.ColorInt
-import androidx.core.content.ContextCompat
-import androidx.core.content.edit
 import chat.rocket.android.emoji.internal.EmojiCategory
 import chat.rocket.android.emoji.internal.EmojiPagerAdapter
 import chat.rocket.android.emoji.internal.PREF_EMOJI_SKIN_TONE
@@ -18,7 +15,6 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.launch
 
-
 class EmojiPickerPopup(context: Context) : Dialog(context) {
 
     var listener: EmojiKeyboardListener? = null
@@ -60,15 +56,15 @@ class EmojiPickerPopup(context: Context) : Dialog(context) {
             changeSkinTone(Fitzpatrick.valueOf(it))
         }
 
-        pager_categories.adapter = adapter
         pager_categories.offscreenPageLimit = EmojiCategory.values().size
+        pager_categories.adapter = adapter
 
         for (category in EmojiCategory.values()) {
             val tab = tabs.getTabAt(category.ordinal)
             val tabView = LayoutInflater.from(context).inflate(R.layout.emoji_picker_tab, null)
             tab?.customView = tabView
-            val textView = tabView.findViewById(R.id.image_category) as ImageView
-            textView.setImageResource(category.resourceIcon())
+            val imageView = tabView.findViewById(R.id.image_category) as ImageView
+            imageView.setImageResource(category.resourceIcon())
         }
 
         val currentTab = if (EmojiRepository.getRecents().isEmpty()) {
diff --git a/emoji/src/main/java/chat/rocket/android/emoji/EmojiViewPager.kt b/emoji/src/main/java/chat/rocket/android/emoji/EmojiViewPager.kt
new file mode 100644
index 0000000000..33c9b7066c
--- /dev/null
+++ b/emoji/src/main/java/chat/rocket/android/emoji/EmojiViewPager.kt
@@ -0,0 +1,289 @@
+package chat.rocket.android.emoji
+
+import android.content.Context
+import android.database.DataSetObserver
+import android.os.Parcelable
+import android.util.AttributeSet
+import android.view.View
+import android.view.ViewGroup
+import androidx.core.view.ViewCompat
+import androidx.viewpager.widget.PagerAdapter
+import androidx.viewpager.widget.ViewPager
+
+class EmojiViewPager : ViewPager {
+
+    private var mLayoutDirection = ViewCompat.LAYOUT_DIRECTION_LTR
+    private val mPageChangeListeners = hashMapOf<OnPageChangeListener, ReversingOnPageChangeListener>()
+
+    private val isRtl: Boolean
+        get() = mLayoutDirection == ViewCompat.LAYOUT_DIRECTION_RTL
+
+    constructor(context: Context) : super(context)
+
+    constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
+
+    override fun onRtlPropertiesChanged(layoutDirection: Int) {
+        super.onRtlPropertiesChanged(layoutDirection)
+        val viewCompatLayoutDirection = if (layoutDirection == View.LAYOUT_DIRECTION_RTL) {
+            ViewCompat.LAYOUT_DIRECTION_RTL
+        } else {
+            ViewCompat.LAYOUT_DIRECTION_LTR
+        }
+        if (viewCompatLayoutDirection != mLayoutDirection) {
+            val adapter = super.getAdapter()
+            var position = 0
+            if (adapter != null) {
+                position = currentItem
+            }
+            mLayoutDirection = viewCompatLayoutDirection
+            if (adapter != null) {
+                adapter.notifyDataSetChanged()
+                currentItem = position
+            }
+        }
+    }
+
+    override fun setAdapter(adapter: PagerAdapter?) {
+        val adapter = if (adapter != null) {
+            ReversingAdapter(adapter)
+        } else {
+            adapter
+        }
+        super.setAdapter(adapter)
+        currentItem = 0
+    }
+
+    override fun getAdapter(): PagerAdapter? {
+        return super.getAdapter() as ReversingAdapter?
+    }
+
+    override fun getCurrentItem(): Int {
+        var item = super.getCurrentItem()
+        val adapter = super.getAdapter()
+        if (adapter != null && isRtl) {
+            item = adapter.count - item - 1
+        }
+        return item
+    }
+
+    override fun setCurrentItem(position: Int, smoothScroll: Boolean) {
+        val adapter = super.getAdapter()
+        val position = if (adapter != null && isRtl) {
+            adapter.count - position - 1
+        } else {
+            position
+        }
+        super.setCurrentItem(position, smoothScroll)
+    }
+
+    override fun setCurrentItem(position: Int) {
+        val adapter = super.getAdapter()
+        val position = if (adapter != null && isRtl) {
+            adapter.count - position - 1
+        } else {
+            position
+        }
+        super.setCurrentItem(position)
+    }
+
+    override fun setOnPageChangeListener(listener: OnPageChangeListener) {
+        super.setOnPageChangeListener(ReversingOnPageChangeListener(listener))
+    }
+
+    override fun addOnPageChangeListener(listener: OnPageChangeListener) {
+        val reversingListener = ReversingOnPageChangeListener(listener)
+        mPageChangeListeners.put(listener, reversingListener)
+        super.addOnPageChangeListener(reversingListener)
+    }
+
+    override fun removeOnPageChangeListener(listener: OnPageChangeListener) {
+        val reverseListener = mPageChangeListeners.remove(listener)
+        if (reverseListener != null) {
+            super.removeOnPageChangeListener(reverseListener)
+        }
+    }
+
+    override fun clearOnPageChangeListeners() {
+        super.clearOnPageChangeListeners()
+        mPageChangeListeners.clear()
+    }
+
+    override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
+        val heightMeasureSpec = if (MeasureSpec.getMode(heightMeasureSpec) == MeasureSpec.UNSPECIFIED) {
+            var height = 0
+            for (i in 0 until childCount) {
+                val child = getChildAt(i)
+                child.measure(widthMeasureSpec, MeasureSpec.makeMeasureSpec(0, MeasureSpec.UNSPECIFIED))
+                val h = child.measuredHeight
+                if (h > height) {
+                    height = h
+                }
+            }
+            MeasureSpec.makeMeasureSpec(height, MeasureSpec.EXACTLY)
+        } else {
+            heightMeasureSpec
+        }
+        super.onMeasure(widthMeasureSpec, heightMeasureSpec)
+    }
+
+    private inner class ReversingOnPageChangeListener(
+        private val mListener: OnPageChangeListener
+    ) : OnPageChangeListener {
+
+        override fun onPageScrolled(position: Int, positionOffset: Float, positionOffsetPixels: Int) {
+            var position = position
+            var positionOffset = positionOffset
+            var positionOffsetPixels = positionOffsetPixels
+            val width = width
+            val adapter = super@EmojiViewPager.getAdapter()
+            if (adapter != null && isRtl) {
+                val count = adapter.count
+                var remainingWidth = (width * (1 - adapter.getPageWidth(position))).toInt() +
+                    positionOffsetPixels
+                while (position < count && remainingWidth > 0) {
+                    position += 1
+                    remainingWidth -= (width * adapter.getPageWidth(position)).toInt()
+                }
+                position = count - position - 1
+                positionOffsetPixels = -remainingWidth
+                positionOffset = positionOffsetPixels / (width * adapter.getPageWidth(position))
+            }
+            mListener.onPageScrolled(position, positionOffset, positionOffsetPixels)
+        }
+
+        override fun onPageSelected(position: Int) {
+            val adapter = super@EmojiViewPager.getAdapter()
+            val position = if (adapter != null && isRtl) {
+                adapter.count - position - 1
+            } else {
+                position
+            }
+            mListener.onPageSelected(position)
+        }
+
+        override fun onPageScrollStateChanged(state: Int) {
+            mListener.onPageScrollStateChanged(state)
+        }
+    }
+
+    private inner class ReversingAdapter(private val adapter: PagerAdapter) : PagerAdapter() {
+
+        override fun isViewFromObject(view: View, obj: Any): Boolean {
+            return adapter.isViewFromObject(view, obj)
+        }
+
+        override fun getCount(): Int {
+            return adapter.count
+        }
+
+        override fun getItemPosition(obj: Any): Int {
+            var position = adapter.getItemPosition(obj)
+            if (isRtl) {
+                if (position == POSITION_UNCHANGED || position == POSITION_NONE) {
+                    position = POSITION_NONE
+                } else {
+                    position = getCount() - position - 1
+                }
+            }
+            return position
+        }
+
+        override fun getPageTitle(position: Int): CharSequence? {
+            return adapter.getPageTitle(position)
+        }
+
+        override fun getPageWidth(position: Int): Float {
+            return adapter.getPageWidth(position)
+        }
+
+        override fun instantiateItem(container: ViewGroup, position: Int): Any {
+            val position = if (isRtl) {
+                count - position - 1
+            } else {
+                position
+            }
+            return adapter.instantiateItem(container, position)
+        }
+
+        override fun instantiateItem(container: View, position: Int): Any {
+            val position = if (isRtl) {
+                count - position - 1
+            } else {
+                position
+            }
+            return adapter.instantiateItem(container, position)
+        }
+
+        override fun destroyItem(container: ViewGroup, position: Int, obj: Any) {
+            val position = if (isRtl) {
+                count - position - 1
+            } else {
+                position
+            }
+            adapter.destroyItem(container, position, obj)
+        }
+
+        override fun destroyItem(container: View, position: Int, obj: Any) {
+            val position = if (isRtl) {
+                count - position - 1
+            } else {
+                position
+            }
+            adapter.destroyItem(container, position, obj)
+        }
+
+        override fun setPrimaryItem(container: ViewGroup, position: Int, obj: Any) {
+            val position = if (isRtl) {
+                count - position - 1
+            } else {
+                position
+            }
+            adapter.setPrimaryItem(container, position, obj)
+        }
+
+        override fun setPrimaryItem(container: View, position: Int, obj: Any) {
+            val position = if (isRtl) {
+                count - position - 1
+            } else {
+                position
+            }
+            adapter.setPrimaryItem(container, position, obj)
+        }
+
+        override fun startUpdate(container: ViewGroup) {
+            adapter.startUpdate(container)
+        }
+
+        override fun startUpdate(container: View) {
+            adapter.startUpdate(container)
+        }
+
+        override fun finishUpdate(container: ViewGroup) {
+            adapter.finishUpdate(container)
+        }
+
+        override fun finishUpdate(container: View) {
+            adapter.finishUpdate(container)
+        }
+
+        override fun saveState(): Parcelable? {
+            return adapter.saveState()
+        }
+
+        override fun restoreState(state: Parcelable?, loader: ClassLoader?) {
+            adapter.restoreState(state, loader)
+        }
+
+        override fun notifyDataSetChanged() {
+            adapter.notifyDataSetChanged()
+        }
+
+        override fun registerDataSetObserver(observer: DataSetObserver) {
+            adapter.registerDataSetObserver(observer)
+        }
+
+        override fun unregisterDataSetObserver(observer: DataSetObserver) {
+            adapter.unregisterDataSetObserver(observer)
+        }
+    }
+}
diff --git a/emoji/src/main/res/drawable/ic_backspace_gray_24dp.xml b/emoji/src/main/res/drawable/ic_backspace_gray_24dp.xml
index 4243f875ce..d76c148fe9 100644
--- a/emoji/src/main/res/drawable/ic_backspace_gray_24dp.xml
+++ b/emoji/src/main/res/drawable/ic_backspace_gray_24dp.xml
@@ -2,14 +2,12 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="24dp"
     android:height="24dp"
+    android:autoMirrored="true"
     android:viewportHeight="24"
     android:viewportWidth="24">
 
     <path android:pathData="M0,0 L24,0 L24,24 L0,24 Z" />
     <path
         android:fillColor="@color/colorEmojiIcon"
-        android:pathData="M22,3 L7,3 C6.31,3,5.77,3.35,5.41,3.88 L0,12 L5.41,20.11
-C5.77,20.64,6.31,21,7,21 L22,21 C23.1,21,24,20.1,24,19 L24,5 C24,3.9,23.1,3,22,3
-Z M19,15.59 L17.59,17 L14,13.41 L10.41,17 L9,15.59 L12.59,12 L9,8.41 L10.41,7
-L14,10.59 L17.59,7 L19,8.41 L15.41,12 L19,15.59 Z" />
+        android:pathData="M22,3 L7,3 C6.31,3,5.77,3.35,5.41,3.88 L0,12 L5.41,20.11 C5.77,20.64,6.31,21,7,21 L22,21 C23.1,21,24,20.1,24,19 L24,5 C24,3.9,23.1,3,22,3 Z M19,15.59 L17.59,17 L14,13.41 L10.41,17 L9,15.59 L12.59,12 L9,8.41 L10.41,7 L14,10.59 L17.59,7 L19,8.41 L15.41,12 L19,15.59 Z" />
 </vector>
\ No newline at end of file
diff --git a/emoji/src/main/res/layout-land/emoji_picker.xml b/emoji/src/main/res/layout-land/emoji_picker.xml
index 71f7654a04..0982b330cd 100644
--- a/emoji/src/main/res/layout-land/emoji_picker.xml
+++ b/emoji/src/main/res/layout-land/emoji_picker.xml
@@ -15,7 +15,7 @@
         app:tabGravity="fill"
         app:tabMode="scrollable" />
 
-    <androidx.viewpager.widget.ViewPager
+    <chat.rocket.android.emoji.EmojiViewPager
         android:id="@+id/pager_categories"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/emoji/src/main/res/layout/emoji_picker.xml b/emoji/src/main/res/layout/emoji_picker.xml
index f191d9e63b..b078f2c17d 100644
--- a/emoji/src/main/res/layout/emoji_picker.xml
+++ b/emoji/src/main/res/layout/emoji_picker.xml
@@ -16,7 +16,7 @@
         app:tabMaxWidth="48dp"
         app:tabMode="scrollable" />
 
-    <androidx.viewpager.widget.ViewPager
+    <chat.rocket.android.emoji.EmojiViewPager
         android:id="@+id/pager_categories"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index b4070ed108..cad5cceecd 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,4 +1,4 @@
-#Thu May 09 14:55:51 BRT 2019
+#Tue May 14 21:15:38 BRT 2019
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME